diff options
author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-08 08:32:45 +0400 |
---|---|---|
committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-08 08:32:45 +0400 |
commit | b4c02ee72218fd4c76f7659db2e994895f67dc22 (patch) | |
tree | 77a1475167cea20990181ae0aafcc82295b07cf9 /source/blender/editors | |
parent | 9b8538c69c14aaf9b991ae23e5faa6429c701c37 (diff) |
finish user preference dlg's input handles
Diffstat (limited to 'source/blender/editors')
27 files changed, 618 insertions, 602 deletions
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index b30db6680e5..a34ee3f33d2 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -42,6 +42,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_object_types.h" @@ -126,9 +128,9 @@ static int act_new_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_new (wmOperatorType *ot) { /* identifiers */ - ot->name= "New Action"; + ot->name= _("New Action"); ot->idname= "ACTION_OT_new"; - ot->description= "Create new action"; + ot->description= _("Create new action"); /* api callbacks */ ot->exec= act_new_exec; @@ -209,9 +211,9 @@ static int act_markers_make_local_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_markers_make_local (wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Markers Local"; + ot->name= _("Make Markers Local"); ot->idname= "ACTION_OT_markers_make_local"; - ot->description= "Move selected scene markers to the active Action as local 'pose' markers"; + ot->description= _("Move selected scene markers to the active Action as local 'pose' markers"); /* callbacks */ ot->exec = act_markers_make_local_exec; @@ -310,9 +312,9 @@ static int actkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Auto-Set Preview Range"; + ot->name= _("Auto-Set Preview Range"); ot->idname= "ACTION_OT_previewrange_set"; - ot->description= "Set Preview Range based on extents of selected Keyframes"; + ot->description= _("Set Preview Range based on extents of selected Keyframes"); /* api callbacks */ ot->exec= actkeys_previewrange_exec; @@ -372,9 +374,9 @@ static int actkeys_viewsel_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "ACTION_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= actkeys_viewall_exec; @@ -387,9 +389,9 @@ void ACTION_OT_view_all (wmOperatorType *ot) void ACTION_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; + ot->name= _("View Selected"); ot->idname= "ACTION_OT_view_selected"; - ot->description= "Reset viewable area to show selected keyframes range"; + ot->description= _("Reset viewable area to show selected keyframes range"); /* api callbacks */ ot->exec= actkeys_viewsel_exec; @@ -473,9 +475,9 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op) void ACTION_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Keyframes"; + ot->name= _("Copy Keyframes"); ot->idname= "ACTION_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->invoke= WM_operator_props_popup; // better wait for graph redo panel @@ -524,9 +526,9 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op) void ACTION_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Keyframes"; + ot->name= _("Paste Keyframes"); ot->idname= "ACTION_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->exec= actkeys_paste_exec; @@ -535,17 +537,17 @@ void ACTION_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")); } /* ******************** Insert Keyframes Operator ************************* */ /* defines for insert keyframes tool */ static EnumPropertyItem prop_actkeys_insertkey_types[] = { - {1, "ALL", 0, "All Channels", ""}, - {2, "SEL", 0, "Only Selected Channels", ""}, - {3, "GROUP", 0, "In Active Group", ""}, // xxx not in all cases + {1, "ALL", 0, N_("All Channels"), ""}, + {2, "SEL", 0, N_("Only Selected Channels"), ""}, + {3, "GROUP", 0, N_("In Active Group"), ""}, // xxx not in all cases {0, NULL, 0, NULL, NULL} }; @@ -623,9 +625,9 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframes"; + ot->name= _("Insert Keyframes"); ot->idname= "ACTION_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; @@ -636,7 +638,7 @@ void ACTION_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_insertkey_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_insertkey_types), 0, _("Type"), ""); } /* ******************** Duplicate Keyframes Operator ************************* */ @@ -698,9 +700,9 @@ static int actkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void ACTION_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Keyframes"; + ot->name= _("Duplicate Keyframes"); ot->idname= "ACTION_OT_duplicate"; - ot->description= "Make a copy of all selected keyframes"; + ot->description= _("Make a copy of all selected keyframes"); /* api callbacks */ ot->invoke= actkeys_duplicate_invoke; @@ -711,7 +713,7 @@ void ACTION_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 ************************* */ @@ -775,9 +777,9 @@ static int actkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframes"; + ot->name= _("Delete Keyframes"); ot->idname= "ACTION_OT_delete"; - ot->description= "Remove all selected keyframes"; + ot->description= _("Remove all selected keyframes"); /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -839,9 +841,9 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op) void ACTION_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean Keyframes"; + ot->name= _("Clean Keyframes"); ot->idname= "ACTION_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! @@ -852,7 +854,7 @@ void ACTION_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); } /* ******************** Sample Keyframes Operator *********************** */ @@ -903,9 +905,9 @@ static int actkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Keyframes"; + ot->name= _("Sample Keyframes"); ot->idname= "ACTION_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= actkeys_sample_exec; @@ -922,8 +924,8 @@ void ACTION_OT_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ static EnumPropertyItem prop_actkeys_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} }; @@ -979,9 +981,9 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op) void ACTION_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Extrapolation"; + ot->name= _("Set Keyframe Extrapolation"); ot->idname= "ACTION_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; @@ -992,7 +994,7 @@ void ACTION_OT_extrapolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_expo_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_expo_types, 0, _("Type"), ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1050,9 +1052,9 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op) void ACTION_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Interpolation"; + ot->name= _("Set Keyframe Interpolation"); ot->idname= "ACTION_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; @@ -1063,18 +1065,18 @@ void ACTION_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", RNA_enum_items_gettexted(beztriple_interpolation_mode_items), 0, _("Type"), ""); } /* ******************** Set Handle-Type Operator *********************** */ static EnumPropertyItem actkeys_handle_type_items[] = { - {HD_FREE, "FREE", 0, "Free", ""}, - {HD_VECT, "VECTOR", 0, "Vector", ""}, - {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, + {HD_FREE, "FREE", 0, N_("Free"), ""}, + {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, + {HD_ALIGN, "ALIGNED", 0, N_("Aligned"), ""}, {0, "", 0, "", ""}, - {HD_AUTO, "AUTO", 0, "Auto", "Handles that are automatically adjusted upon moving the keyframe"}, - {HD_AUTO_ANIM, "ANIM_CLAMPED", 0, "Auto Clamped", "Auto handles clamped to not overshoot"}, + {HD_AUTO, "AUTO", 0, N_("Auto"), N_("Handles that are automatically adjusted upon moving the keyframe")}, + {HD_AUTO_ANIM, "ANIM_CLAMPED", 0, N_("Auto Clamped"), N_("Auto handles clamped to not overshoot")}, {0, NULL, 0, NULL, NULL}}; /* ------------------- */ @@ -1147,9 +1149,9 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op) void ACTION_OT_handle_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Handle Type"; + ot->name= _("Set Keyframe Handle Type"); ot->idname= "ACTION_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; @@ -1160,7 +1162,7 @@ void ACTION_OT_handle_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", actkeys_handle_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(actkeys_handle_type_items), 0, _("Type"), ""); } /* ******************** Set Keyframe-Type Operator *********************** */ @@ -1218,9 +1220,9 @@ static int actkeys_keytype_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Type"; + ot->name= _("Set Keyframe Type"); ot->idname= "ACTION_OT_keyframe_type"; - ot->description= "Set type of keyframe for the selected keyframes"; + ot->description= _("Set type of keyframe for the selected keyframes"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1231,7 +1233,7 @@ void ACTION_OT_keyframe_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_keyframe_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(beztriple_keyframe_type_items), 0, _("Type"), ""); } /* ************************************************************************** */ @@ -1286,9 +1288,9 @@ static int actkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump to Frame"; + ot->name= _("Jump to Frame"); ot->idname= "ACTION_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= actkeys_framejump_exec; @@ -1302,10 +1304,10 @@ void ACTION_OT_frame_jump (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_actkeys_snap_types[] = { - {ACTKEYS_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, - {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {ACTKEYS_SNAP_CFRA, "CFRA", 0, N_("Current frame"), ""}, + {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1382,9 +1384,9 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op) void ACTION_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Keys"; + ot->name= _("Snap Keys"); ot->idname= "ACTION_OT_snap"; - ot->description= "Snap selected keyframes to the times specified"; + ot->description= _("Snap selected keyframes to the times specified"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1395,16 +1397,16 @@ void ACTION_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_snap_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_snap_types), 0, _("Type"), ""); } /* ******************** Mirror Keyframes Operator *********************** */ /* defines for mirror keyframes tool */ static EnumPropertyItem prop_actkeys_mirror_types[] = { - {ACTKEYS_MIRROR_CFRA, "CFRA", 0, "By Times over Current frame", ""}, - {ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, "By Values over Value=0", ""}, - {ACTKEYS_MIRROR_MARKER, "MARKER", 0, "By Times over First Selected Marker", ""}, + {ACTKEYS_MIRROR_CFRA, "CFRA", 0, N_("By Times over Current frame"), ""}, + {ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, N_("By Values over Value=0"), ""}, + {ACTKEYS_MIRROR_MARKER, "MARKER", 0, N_("By Times over First Selected Marker"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1492,9 +1494,9 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op) void ACTION_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Keys"; + ot->name= _("Mirror Keys"); ot->idname= "ACTION_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; @@ -1505,7 +1507,7 @@ void ACTION_OT_mirror (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_mirror_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_mirror_types), 0, _("Type"), ""); } /* ************************************************************************** */ diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 6c3f80cda41..bb1e5c1012a 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -39,6 +39,8 @@ #include "BLI_blenlib.h" +#include "BLF_api.h" + #include "ED_anim_api.h" #include "ED_transform.h" @@ -93,7 +95,7 @@ void ED_operatormacros_action(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { WM_operatortype_macro_define(ot, "ACTION_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index b10dffb0064..2a8af567be0 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -165,9 +165,9 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) void ACTION_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "ACTION_OT_select_all_toggle"; - ot->description= "Toggle selection of all keyframes"; + ot->description= _("Toggle selection of all keyframes"); /* api callbacks */ ot->exec= actkeys_deselectall_exec; @@ -326,9 +326,9 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "ACTION_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; @@ -357,10 +357,10 @@ void ACTION_OT_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, - {ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, - {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, - {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, + {ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, N_("On Selected Keyframes"), ""}, + {ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, N_("On Current Frame"), ""}, + {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, N_("On Selected Markers"), ""}, + {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, N_("Between Min/Max Selected Markers"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -532,9 +532,9 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "ACTION_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= actkeys_columnselect_exec; @@ -544,7 +544,7 @@ void ACTION_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 *********************** */ @@ -590,9 +590,9 @@ static int actkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_linked (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Linked"; + ot->name = _("Select Linked"); ot->idname= "ACTION_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= actkeys_select_linked_exec; @@ -667,9 +667,9 @@ static int actkeys_select_more_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_more (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select More"; + ot->name = _("Select More"); ot->idname= "ACTION_OT_select_more"; - ot->description = "Select keyframes beside already selected ones"; + ot->description = _("Select keyframes beside already selected ones"); /* api callbacks */ ot->exec= actkeys_select_more_exec; @@ -701,9 +701,9 @@ static int actkeys_select_less_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_less (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Less"; + ot->name = _("Select Less"); ot->idname= "ACTION_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= actkeys_select_less_exec; @@ -718,9 +718,9 @@ void ACTION_OT_select_less (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_actkeys_leftright_select_types[] = { - {ACTKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, - {ACTKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, - {ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {ACTKEYS_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, + {ACTKEYS_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, + {ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -867,9 +867,9 @@ static int actkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void ACTION_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; + ot->name= _("Select Left/Right"); ot->idname= "ACTION_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= actkeys_select_leftright_invoke; @@ -880,7 +880,7 @@ void ACTION_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_actkeys_leftright_select_types, ACTKEYS_LRSEL_TEST, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_actkeys_leftright_select_types), ACTKEYS_LRSEL_TEST, _("Mode"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); } @@ -1186,9 +1186,9 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void ACTION_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select Keys"; + ot->name= _("Mouse Select Keys"); ot->idname= "ACTION_OT_clickselect"; - ot->description= "Select keyframes by clicking on them"; + ot->description= _("Select keyframes by clicking on them"); /* api callbacks - absolutely no exec() this yet... */ ot->invoke= actkeys_clickselect_invoke; diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 91429b8c153..b837b58e83e 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -350,8 +350,8 @@ static int move_exec(bContext *C, wmOperator *op) void CONSOLE_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; - ot->description= "Move cursor position"; + ot->name= _("Move Cursor"); + ot->description= _("Move cursor position"); ot->idname= "CONSOLE_OT_move"; /* api callbacks */ @@ -359,7 +359,7 @@ void CONSOLE_OT_move(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to.")); } #define TAB_LENGTH 4 @@ -419,8 +419,8 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) void CONSOLE_OT_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert"; - ot->description= "Insert text at cursor position"; + ot->name= _("Insert"); + ot->description= _("Insert text at cursor position"); ot->idname= "CONSOLE_OT_insert"; /* api callbacks */ @@ -429,7 +429,7 @@ void CONSOLE_OT_insert(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); } @@ -488,8 +488,8 @@ static int delete_exec(bContext *C, wmOperator *op) void CONSOLE_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= "CONSOLE_OT_delete"; /* api callbacks */ @@ -497,7 +497,7 @@ void CONSOLE_OT_delete(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete."); + RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, _("Type"), _("Which part of the text to delete.")); } @@ -531,8 +531,8 @@ static int clear_exec(bContext *C, wmOperator *op) void CONSOLE_OT_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear"; - ot->description= "Clear text by type"; + ot->name= _("Clear"); + ot->description= _("Clear text by type"); ot->idname= "CONSOLE_OT_clear"; /* api callbacks */ @@ -597,8 +597,8 @@ static int history_cycle_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_cycle(wmOperatorType *ot) { /* identifiers */ - ot->name= "History Cycle"; - ot->description= "Cycle through history"; + ot->name= _("History Cycle"); + ot->description= _("Cycle through history"); ot->idname= "CONSOLE_OT_history_cycle"; /* api callbacks */ @@ -645,8 +645,8 @@ static int history_append_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_append(wmOperatorType *ot) { /* identifiers */ - ot->name= "History Append"; - ot->description= "Append history at cursor position"; + ot->name= _("History Append"); + ot->description= _("Append history at cursor position"); ot->idname= "CONSOLE_OT_history_append"; /* api callbacks */ @@ -654,7 +654,7 @@ void CONSOLE_OT_history_append(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); RNA_def_int(ot->srna, "current_character", 0, 0, INT_MAX, _("Cursor"), _("The index of the cursor."), 0, 10000); RNA_def_boolean(ot->srna, "remove_duplicates", 0, _("Remove Duplicates"), _("Remove duplicate items in the history")); } @@ -694,8 +694,8 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Scrollback Append"; - ot->description= "Append scrollback text by type"; + ot->name= _("Scrollback Append"); + ot->description= _("Append scrollback text by type"); ot->idname= "CONSOLE_OT_scrollback_append"; /* api callbacks */ @@ -703,8 +703,8 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); - RNA_def_enum(ot->srna, "type", console_line_type_items, CONSOLE_LINE_OUTPUT, "Type", "Console output type."); + RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); + RNA_def_enum(ot->srna, "type", console_line_type_items, CONSOLE_LINE_OUTPUT, _("Type"), _("Console output type.")); } @@ -777,8 +777,8 @@ static int copy_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy to Clipboard"; - ot->description= "Copy selected text to clipboard"; + ot->name= _("Copy to Clipboard"); + ot->description= _("Copy selected text to clipboard"); ot->idname= "CONSOLE_OT_copy"; /* api callbacks */ @@ -828,8 +828,8 @@ static int paste_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste from Clipboard"; - ot->description= "Paste text from clipboard"; + ot->name= _("Paste from Clipboard"); + ot->description= _("Paste text from clipboard"); ot->idname= "CONSOLE_OT_paste"; /* api callbacks */ @@ -952,9 +952,9 @@ static int console_modal_select_cancel(bContext *C, wmOperator *op) void CONSOLE_OT_select_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Selection"; + ot->name= _("Set Selection"); ot->idname= "CONSOLE_OT_select_set"; - ot->description= "Set the console selection"; + ot->description= _("Set the console selection"); /* api callbacks */ ot->invoke= console_modal_select_invoke; diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 41d87ac0e08..913e7486c63 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1064,7 +1064,7 @@ void FILE_OT_directory_new(struct wmOperatorType *ot) ot->exec= file_directory_new_exec; ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ - RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, "Directory", "Name of new directory"); + RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, _("Directory"), _("Name of new directory")); } diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 0210b0dd78d..dc0130ed7a7 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -47,6 +47,8 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -860,9 +862,9 @@ static int image_properties(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; + ot->name= _("Properties"); ot->idname= "IMAGE_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->description= _("Toggle display properties panel"); ot->exec= image_properties; ot->poll= ED_operator_image_active; @@ -884,9 +886,9 @@ static int image_scopes(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_scopes(wmOperatorType *ot) { - ot->name= "Scopes"; + ot->name= _("Scopes"); ot->idname= "IMAGE_OT_scopes"; - ot->description= "Toggle display scopes panel"; + ot->description= _("Toggle display scopes panel"); ot->exec= image_scopes; ot->poll= ED_operator_image_active; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b8a964033e8..be2f93f120a 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -290,7 +290,7 @@ static int view_pan_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Pan"; + ot->name= _("View Pan"); ot->idname= "IMAGE_OT_view_pan"; /* api callbacks */ @@ -305,7 +305,7 @@ void IMAGE_OT_view_pan(wmOperatorType *ot) /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, - "Offset", "Offset in floating point units, 1.0 is the width and height of the image.", -FLT_MAX, FLT_MAX); + _("Offset"), _("Offset in floating point units, 1.0 is the width and height of the image."), -FLT_MAX, FLT_MAX); } /********************** view zoom operator *********************/ @@ -421,7 +421,7 @@ static int view_zoom_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom"; + ot->name= _("View Zoom"); ot->idname= "IMAGE_OT_view_zoom"; /* api callbacks */ @@ -436,7 +436,7 @@ void IMAGE_OT_view_zoom(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, FLT_MAX, - "Factor", "Zoom factor, values higher than 1.0 zoom in, lower values zoom out.", -FLT_MAX, FLT_MAX); + _("Factor"), _("Zoom factor, values higher than 1.0 zoom in, lower values zoom out."), -FLT_MAX, FLT_MAX); } /********************** view all operator *********************/ @@ -485,7 +485,7 @@ static int view_all_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "IMAGE_OT_view_all"; /* api callbacks */ @@ -542,7 +542,7 @@ static int view_selected_poll(bContext *C) void IMAGE_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Center"; + ot->name= _("View Center"); ot->idname= "IMAGE_OT_view_selected"; /* api callbacks */ @@ -567,7 +567,7 @@ static int view_zoom_in_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom In"; + ot->name= _("View Zoom In"); ot->idname= "IMAGE_OT_view_zoom_in"; /* api callbacks */ @@ -590,7 +590,7 @@ static int view_zoom_out_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Out"; + ot->name= _("View Zoom Out"); ot->idname= "IMAGE_OT_view_zoom_out"; /* api callbacks */ @@ -628,7 +628,7 @@ static int view_zoom_ratio_exec(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Zoom Ratio"; + ot->name= _("View Zoom Ratio"); ot->idname= "IMAGE_OT_view_zoom_ratio"; /* api callbacks */ @@ -637,7 +637,7 @@ void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX, - "Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out.", -FLT_MAX, FLT_MAX); + _("Ratio"), _("Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out."), -FLT_MAX, FLT_MAX); } /**************** load/replace/save callbacks ******************/ @@ -803,8 +803,8 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Image"; - ot->description= "Open image"; + ot->name= _("Open Image"); + ot->description= _("Open image"); ot->idname= "IMAGE_OT_open"; /* api callbacks */ @@ -862,7 +862,7 @@ static int replace_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace Image"; + ot->name= _("Replace Image"); ot->idname= "IMAGE_OT_replace"; /* api callbacks */ @@ -1082,7 +1082,7 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_save_as(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save As Image"; + ot->name= _("Save As Image"); ot->idname= "IMAGE_OT_save_as"; /* api callbacks */ @@ -1095,7 +1095,7 @@ void IMAGE_OT_save_as(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "file_type", image_file_type_items, R_PNG, "File Type", "File type to save image as."); + RNA_def_enum(ot->srna, "file_type", image_file_type_items, R_PNG, _("File Type"), _("File type to save image as.")); WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH); RNA_def_boolean(ot->srna, "copy", 0, _("Copy"), _("Create a new image file without modifying the current image in blender")); @@ -1153,7 +1153,7 @@ static int save_exec(bContext *C, wmOperator *op) void IMAGE_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save Image"; + ot->name= _("Save Image"); ot->idname= "IMAGE_OT_save"; /* api callbacks */ @@ -1230,7 +1230,7 @@ static int save_sequence_exec(bContext *C, wmOperator *op) void IMAGE_OT_save_sequence(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save Sequence"; + ot->name= _("Save Sequence"); ot->idname= "IMAGE_OT_save_sequence"; /* api callbacks */ @@ -1265,7 +1265,7 @@ static int reload_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Image"; + ot->name= _("Reload Image"); ot->idname= "IMAGE_OT_reload"; /* api callbacks */ @@ -1347,7 +1347,7 @@ void IMAGE_OT_new(wmOperatorType *ot) static float default_color[4]= {0.0f, 0.0f, 0.0f, 1.0f}; /* identifiers */ - ot->name= "New Image"; + ot->name= _("New Image"); ot->description= "Create a new image"; ot->idname= "IMAGE_OT_new"; @@ -1437,7 +1437,7 @@ static int image_invert_exec(bContext *C, wmOperator *op) void IMAGE_OT_invert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Invert Channels"; + ot->name= _("Invert Channels"); ot->idname= "IMAGE_OT_invert"; /* api callbacks */ @@ -1524,8 +1524,8 @@ static int pack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_pack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack Image"; - ot->description= "Pack an image as embedded data into the .blend file"; + ot->name= _("Pack Image"); + ot->description= _("Pack an image as embedded data into the .blend file"); ot->idname= "IMAGE_OT_pack"; /* api callbacks */ @@ -1601,8 +1601,8 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even void IMAGE_OT_unpack(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unpack Image"; - ot->description= "Save an image packed in the .blend file to disk"; + ot->name= _("Unpack Image"); + ot->description= _("Save an image packed in the .blend file to disk"); ot->idname= "IMAGE_OT_unpack"; /* api callbacks */ @@ -1613,8 +1613,8 @@ void IMAGE_OT_unpack(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack."); - RNA_def_string(ot->srna, "id", "", MAX_ID_NAME-2, "Image Name", "Image datablock name to unpack."); /* XXX, weark!, will fail with library, name collisions */ + RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, _("Method"), _("How to unpack.")); + RNA_def_string(ot->srna, "id", "", MAX_ID_NAME-2, _("Image Name"), _("Image datablock name to unpack.")); /* XXX, weark!, will fail with library, name collisions */ } /******************** sample image operator ********************/ @@ -1811,7 +1811,7 @@ static int sample_cancel(bContext *C, wmOperator *op) void IMAGE_OT_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Color"; + ot->name= _("Sample Color"); ot->idname= "IMAGE_OT_sample"; /* api callbacks */ @@ -1919,7 +1919,7 @@ static int sample_line_invoke(bContext *C, wmOperator *op, wmEvent *event) void IMAGE_OT_sample_line(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Line"; + ot->name= _("Sample Line"); ot->idname= "IMAGE_OT_sample_line"; /* api callbacks */ @@ -1940,12 +1940,12 @@ void IMAGE_OT_sample_line(wmOperatorType *ot) void IMAGE_OT_curves_point_set(wmOperatorType *ot) { static EnumPropertyItem point_items[]= { - {0, "BLACK_POINT", 0, "Black Point", ""}, - {1, "WHITE_POINT", 0, "White Point", ""}, + {0, "BLACK_POINT", 0, N_("Black Point"), ""}, + {1, "WHITE_POINT", 0, N_("White Point"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Curves Point"; + ot->name= _("Set Curves Point"); ot->idname= "IMAGE_OT_curves_point_set"; /* flags */ @@ -1958,7 +1958,7 @@ void IMAGE_OT_curves_point_set(wmOperatorType *ot) ot->poll= space_image_main_area_poll; /* properties */ - RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves."); + RNA_def_enum(ot->srna, "point", RNA_enum_items_gettexted(point_items), 0, _("Point"), _("Set black point or white point for curves.")); } /******************** record composite operator *********************/ @@ -2099,7 +2099,7 @@ static int record_composite_cancel(bContext *C, wmOperator *op) void IMAGE_OT_record_composite(wmOperatorType *ot) { /* identifiers */ - ot->name= "Record Composite"; + ot->name= _("Record Composite"); ot->idname= "IMAGE_OT_record_composite"; /* api callbacks */ @@ -2154,7 +2154,7 @@ static int cycle_render_slot_exec(bContext *C, wmOperator *op) void IMAGE_OT_cycle_render_slot(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cycle Render Slot"; + ot->name= _("Cycle Render Slot"); ot->idname= "IMAGE_OT_cycle_render_slot"; /* api callbacks */ diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index 271acea72cb..dc2c5cb461a 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -120,8 +120,8 @@ static int logic_properties(bContext *C, wmOperator *UNUSED(op)) void LOGIC_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->description= "Toggle display properties panel"; + ot->name= _("Properties"); + ot->description= _("Toggle display properties panel"); ot->idname= "LOGIC_OT_properties"; ot->exec= logic_properties; @@ -201,9 +201,9 @@ void LOGIC_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Cut links"; + ot->name= _("Cut links"); ot->idname= "LOGIC_OT_links_cut"; - ot->description= "Remove logic brick connections"; + ot->description= _("Remove logic brick connections"); ot->invoke= WM_gesture_lines_invoke; ot->modal= WM_gesture_lines_modal; diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 94232699c30..c431f5455ed 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -47,6 +47,8 @@ #include "BLI_editVert.h" #include "BLI_rand.h" +#include "BLF_api.h" + #include "BKE_nla.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -498,9 +500,9 @@ static int nla_properties(bContext *C, wmOperator *UNUSED(op)) void NLA_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; + ot->name= _("Properties"); ot->idname= "NLA_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->description= _("Toggle display properties panel"); ot->exec= nla_properties; ot->poll= ED_operator_nla_active; diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 8ce64c6d553..f6aebd57149 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -344,9 +344,9 @@ static int nlachannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *e void NLA_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Click on NLA Channels"; + ot->name= _("Mouse Click on NLA Channels"); ot->idname= "NLA_OT_channels_click"; - ot->description= "Handle clicks to select NLA channels"; + ot->description= _("Handle clicks to select NLA channels"); /* api callbacks */ ot->invoke= nlachannels_mouseclick_invoke; @@ -418,9 +418,9 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Track(s)"; + ot->name= _("Add Track(s)"); ot->idname= "NLA_OT_tracks_add"; - ot->description= "Add NLA-Tracks above/after the selected tracks"; + ot->description= _("Add NLA-Tracks above/after the selected tracks"); /* api callbacks */ ot->exec= nlaedit_add_tracks_exec; @@ -482,9 +482,9 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete_tracks (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Tracks"; + ot->name= _("Delete Tracks"); ot->idname= "NLA_OT_delete_tracks"; - ot->description= "Delete selected NLA-Tracks and the strips they contain"; + ot->description= _("Delete selected NLA-Tracks and the strips they contain"); /* api callbacks */ ot->exec= nlaedit_delete_tracks_exec; diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 934cf8be247..15ab0406b95 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -160,9 +160,9 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_enter (wmOperatorType *ot) { /* identifiers */ - ot->name= "Enter Tweak Mode"; + ot->name= _("Enter Tweak Mode"); ot->idname= "NLA_OT_tweakmode_enter"; - ot->description= "Enter tweaking mode for the action referenced by the active strip"; + ot->description= _("Enter tweaking mode for the action referenced by the active strip"); /* api callbacks */ ot->exec= nlaedit_enable_tweakmode_exec; @@ -225,9 +225,9 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_exit (wmOperatorType *ot) { /* identifiers */ - ot->name= "Exit Tweak Mode"; + ot->name= _("Exit Tweak Mode"); ot->idname= "NLA_OT_tweakmode_exit"; - ot->description= "Exit tweaking mode for the action referenced by the active strip"; + ot->description= _("Exit tweaking mode for the action referenced by the active strip"); /* api callbacks */ ot->exec= nlaedit_disable_tweakmode_exec; @@ -344,9 +344,9 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Action Strip"; + ot->name= _("Add Action Strip"); ot->idname= "NLA_OT_actionclip_add"; - ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"; + ot->description= _("Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"); /* api callbacks */ ot->invoke= WM_enum_search_invoke; @@ -358,7 +358,7 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) /* props */ // TODO: this would be nicer as an ID-pointer... - prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); + prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, _("Action"), ""); RNA_def_enum_funcs(prop, RNA_action_itemf); ot->prop= prop; } @@ -466,9 +466,9 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Transition"; + ot->name= _("Add Transition"); ot->idname= "NLA_OT_transition_add"; - ot->description= "Add a transition strip between two adjacent selected strips"; + ot->description= _("Add a transition strip between two adjacent selected strips"); /* api callbacks */ ot->exec= nlaedit_add_transition_exec; @@ -528,9 +528,9 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Meta-Strips"; + ot->name= _("Add Meta-Strips"); ot->idname= "NLA_OT_meta_add"; - ot->description= "Add new meta-strips incorporating the selected strips"; + ot->description= _("Add new meta-strips incorporating the selected strips"); /* api callbacks */ ot->exec= nlaedit_add_meta_exec; @@ -580,9 +580,9 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Meta-Strips"; + ot->name= _("Remove Meta-Strips"); ot->idname= "NLA_OT_meta_remove"; - ot->description= "Separate out the strips held by the selected meta-strips"; + ot->description= _("Separate out the strips held by the selected meta-strips"); /* api callbacks */ ot->exec= nlaedit_remove_meta_exec; @@ -683,9 +683,9 @@ static int nlaedit_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void NLA_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Strips"; + ot->name= _("Duplicate Strips"); ot->idname= "NLA_OT_duplicate"; - ot->description= "Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"; + ot->description= _("Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"); /* api callbacks */ ot->invoke= nlaedit_duplicate_invoke; @@ -696,7 +696,7 @@ void NLA_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 Strips Operator ***************************** */ @@ -758,9 +758,9 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Strips"; + ot->name= _("Delete Strips"); ot->idname= "NLA_OT_delete"; - ot->description= "Delete selected strips"; + ot->description= _("Delete selected strips"); /* api callbacks */ ot->exec= nlaedit_delete_exec; @@ -903,9 +903,9 @@ static int nlaedit_split_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_split (wmOperatorType *ot) { /* identifiers */ - ot->name= "Split Strips"; + ot->name= _("Split Strips"); ot->idname= "NLA_OT_split"; - ot->description= "Split selected strips at their midpoints"; + ot->description= _("Split selected strips at their midpoints"); /* api callbacks */ ot->exec= nlaedit_split_exec; @@ -956,9 +956,9 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *UNUSED(op)) static void NLA_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Strips"; + ot->name= _("Bake Strips"); ot->idname= "NLA_OT_bake"; - ot->description= "Bake all strips of selected AnimData blocks"; + ot->description= _("Bake all strips of selected AnimData blocks"); /* api callbacks */ ot->exec= nlaedit_bake_exec; @@ -1018,9 +1018,9 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_mute_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Muting"; + ot->name= _("Toggle Muting"); ot->idname= "NLA_OT_mute_toggle"; - ot->description= "Mute or un-mute selected strips"; + ot->description= _("Mute or un-mute selected strips"); /* api callbacks */ ot->exec= nlaedit_toggle_mute_exec; @@ -1176,9 +1176,9 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op) void NLA_OT_swap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Strips"; + ot->name= _("Swap Strips"); ot->idname= "NLA_OT_swap"; - ot->description= "Swap order of selected strips within tracks"; + ot->description= _("Swap order of selected strips within tracks"); /* api callbacks */ ot->exec= nlaedit_swap_exec; @@ -1250,9 +1250,9 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Up"; + ot->name= _("Move Strips Up"); ot->idname= "NLA_OT_move_up"; - ot->description= "Move selected strips up a track if there's room"; + ot->description= _("Move selected strips up a track if there's room"); /* api callbacks */ ot->exec= nlaedit_move_up_exec; @@ -1324,9 +1324,9 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Strips Down"; + ot->name= _("Move Strips Down"); ot->idname= "NLA_OT_move_down"; - ot->description= "Move selected strips down a track if there's room"; + ot->description= _("Move selected strips down a track if there's room"); /* api callbacks */ ot->exec= nlaedit_move_down_exec; @@ -1400,9 +1400,9 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op) void NLA_OT_action_sync_length (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sync Action Length"; + ot->name= _("Sync Action Length"); ot->idname= "NLA_OT_action_sync_length"; - ot->description= "Synchronise the length of the referenced Action with the lengths used in the strip"; + ot->description= _("Synchronise the length of the referenced Action with the lengths used in the strip"); /* api callbacks */ ot->exec= nlaedit_sync_actlen_exec; @@ -1500,9 +1500,9 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_apply_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Scale"; + ot->name= _("Apply Scale"); ot->idname= "NLA_OT_apply_scale"; - ot->description= "Apply scaling of selected strips to their referenced Actions"; + ot->description= _("Apply scaling of selected strips to their referenced Actions"); /* api callbacks */ ot->exec= nlaedit_apply_scale_exec; @@ -1563,9 +1563,9 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_clear_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Scale"; + ot->name= _("Clear Scale"); ot->idname= "NLA_OT_clear_scale"; - ot->description= "Reset scaling of selected strips"; + ot->description= _("Reset scaling of selected strips"); /* api callbacks */ ot->exec= nlaedit_clear_scale_exec; @@ -1580,10 +1580,10 @@ void NLA_OT_clear_scale (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_nlaedit_snap_types[] = { - {NLAEDIT_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, - {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {NLAEDIT_SNAP_CFRA, "CFRA", 0, N_("Current frame"), ""}, + {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1704,9 +1704,9 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op) void NLA_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Strips"; + ot->name= _("Snap Strips"); ot->idname= "NLA_OT_snap"; - ot->description= "Move start of strips to specified time"; + ot->description= _("Move start of strips to specified time"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1717,7 +1717,7 @@ void NLA_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, _("Type"), ""); } /* *********************************************** */ @@ -1819,9 +1819,9 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add F-Modifier"; + ot->name= _("Add F-Modifier"); ot->idname= "NLA_OT_fmodifier_add"; - ot->description= "Add F-Modifier of the specified type to the selected NLA-Strips"; + ot->description= _("Add F-Modifier of the specified type to the selected NLA-Strips"); /* api callbacks */ ot->invoke= nla_fmodifier_add_invoke; @@ -1832,7 +1832,7 @@ void NLA_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", fmodifier_type_items, 0, _("Type"), ""); RNA_def_boolean(ot->srna, "only_active", 0, _("Only Active"), _("Only add F-Modifier of the specified type to the active strip.")); } @@ -1883,9 +1883,9 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy F-Modifiers"; + ot->name= _("Copy F-Modifiers"); ot->idname= "NLA_OT_fmodifier_copy"; - ot->description= "Copy the F-Modifier(s) of the active NLA-Strip"; + ot->description= _("Copy the F-Modifier(s) of the active NLA-Strip"); /* api callbacks */ ot->exec= nla_fmodifier_copy_exec; @@ -1945,9 +1945,9 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste F-Modifiers"; + ot->name= _("Paste F-Modifiers"); ot->idname= "NLA_OT_fmodifier_paste"; - ot->description= "Add copied F-Modifiers to the selected NLA-Strips"; + ot->description= _("Add copied F-Modifiers to the selected NLA-Strips"); /* api callbacks */ ot->exec= nla_fmodifier_paste_exec; diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 0bd96e510c1..d8f27c9399b 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -189,9 +189,9 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op) void NLA_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= _("Select or Deselect All"); ot->idname= "NLA_OT_select_all_toggle"; - ot->description= "(De)Select all NLA-Strips"; + ot->description= _("(De)Select all NLA-Strips"); /* api callbacks */ ot->exec= nlaedit_deselectall_exec; @@ -327,9 +327,9 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op) void NLA_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "NLA_OT_select_border"; - ot->description= "Use box selection to grab NLA-Strips"; + ot->description= _("Use box selection to grab NLA-Strips"); /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -353,9 +353,9 @@ void NLA_OT_select_border(wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_nlaedit_leftright_select_types[] = { - {NLAEDIT_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, - {NLAEDIT_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, - {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {NLAEDIT_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, + {NLAEDIT_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, + {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -479,9 +479,9 @@ static int nlaedit_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void NLA_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; + ot->name= _("Select Left/Right"); ot->idname= "NLA_OT_select_leftright"; - ot->description= "Select strips to the left or the right of the current frame "; + ot->description= _("Select strips to the left or the right of the current frame "); /* api callbacks */ ot->invoke= nlaedit_select_leftright_invoke; @@ -492,7 +492,7 @@ void NLA_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_nlaedit_leftright_select_types), NLAEDIT_LRSEL_TEST, _("Mode"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); } @@ -640,9 +640,9 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void NLA_OT_click_select (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select"; + ot->name= _("Mouse Select"); ot->idname= "NLA_OT_click_select"; - ot->description= "Handle clicks to select NLA Strips"; + ot->description= _("Handle clicks to select NLA Strips"); /* api callbacks - absolutely no exec() this yet... */ ot->invoke= nlaedit_clickselect_invoke; diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 684961f2606..76c67298e94 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -46,6 +46,8 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_node.h" #include "BKE_screen.h" @@ -162,8 +164,8 @@ static int node_properties_poll(bContext *C) void NODE_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; - ot->description= "Toggles the properties panel display"; + ot->name= _("Properties"); + ot->description= _("Toggles the properties panel display"); ot->idname= "NODE_OT_properties"; ot->exec= node_properties; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index a2d0b8b1c4f..9064d27ae7e 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -90,8 +90,8 @@ #include "node_intern.h" static EnumPropertyItem socket_in_out_items[] = { - { SOCK_IN, "IN", 0, "In", "" }, - { SOCK_OUT, "OUT", 0, "Out", "" }, + { SOCK_IN, "IN", 0, N_("In"), "" }, + { SOCK_OUT, "OUT", 0, N_("Out"), "" }, { 0, NULL, 0, NULL, NULL} }; @@ -638,8 +638,8 @@ static int node_group_edit_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void NODE_OT_group_edit(wmOperatorType *ot) { /* identifiers */ - ot->name = "Edit Group"; - ot->description = "Edit node group"; + ot->name = _("Edit Group"); + ot->description = _("Edit node group"); ot->idname = "NODE_OT_group_edit"; /* api callbacks */ @@ -687,8 +687,8 @@ static int node_group_socket_add_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Group Socket"; - ot->description = "Add node group socket"; + ot->name = _("Add Group Socket"); + ot->description = _("Add node group socket"); ot->idname = "NODE_OT_group_socket_add"; /* api callbacks */ @@ -698,9 +698,9 @@ void NODE_OT_group_socket_add(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output"); - RNA_def_string(ot->srna, "name", "", 32, "Name", "Group socket name"); - RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_VALUE, "Type", "Type of the group socket"); + RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, _("Socket Type"), _("Input or Output")); + RNA_def_string(ot->srna, "name", "", 32, _("Name"), _("Group socket name")); + RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_VALUE, _("Type"), _("Type of the group socket")); } /* ***************** Remove Group Socket operator ************* */ @@ -739,8 +739,8 @@ static int node_group_socket_remove_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Group Socket"; - ot->description = "Removed node group socket"; + ot->name = _("Remove Group Socket"); + ot->description = _("Removed node group socket"); ot->idname = "NODE_OT_group_socket_remove"; /* api callbacks */ @@ -805,8 +805,8 @@ static int node_group_socket_move_up_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_move_up(wmOperatorType *ot) { /* identifiers */ - ot->name = "Move Group Socket Up"; - ot->description = "Move up node group socket"; + ot->name = _("Move Group Socket Up"); + ot->description = _("Move up node group socket"); ot->idname = "NODE_OT_group_socket_move_up"; /* api callbacks */ @@ -871,8 +871,8 @@ static int node_group_socket_move_down_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_move_down(wmOperatorType *ot) { /* identifiers */ - ot->name = "Move Group Socket Down"; - ot->description = "Move down node group socket"; + ot->name = _("Move Group Socket Down"); + ot->description = _("Move down node group socket"); ot->idname = "NODE_OT_group_socket_move_down"; /* api callbacks */ @@ -922,8 +922,8 @@ static int node_group_ungroup_exec(bContext *C, wmOperator *op) void NODE_OT_group_ungroup(wmOperatorType *ot) { /* identifiers */ - ot->name = "Ungroup"; - ot->description = "Ungroup selected nodes"; + ot->name = _("Ungroup"); + ot->description = _("Ungroup selected nodes"); ot->idname = "NODE_OT_group_ungroup"; /* api callbacks */ @@ -1092,8 +1092,8 @@ static int snode_bg_viewmove_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_backimage_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Background Image Move"; - ot->description = "Move Node backdrop"; + ot->name= _("Background Image Move"); + ot->description = _("Move Node backdrop"); ot->idname= "NODE_OT_backimage_move"; /* api callbacks */ @@ -1123,7 +1123,7 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "Background Image Zoom"; + ot->name= _("Background Image Zoom"); ot->idname= "NODE_OT_backimage_zoom"; /* api callbacks */ @@ -1134,7 +1134,7 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* internal */ - RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, "Factor", "", 0.0f, 10.0f); + RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, _("Factor"), "", 0.0f, 10.0f); } /******************** sample backdrop operator ********************/ @@ -1286,7 +1286,7 @@ static int sample_cancel(bContext *C, wmOperator *op) void NODE_OT_backimage_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Backimage Sample"; + ot->name= _("Backimage Sample"); ot->idname= "NODE_OT_backimage_sample"; /* api callbacks */ @@ -1405,7 +1405,7 @@ static int node_resize_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_resize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Resize Node"; + ot->name= _("Resize Node"); ot->idname= "NODE_OT_resize"; /* api callbacks */ @@ -1612,8 +1612,8 @@ static int node_active_link_viewer(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_link_viewer(wmOperatorType *ot) { /* identifiers */ - ot->name= "Link to Viewer Node"; - ot->description = "Link to Viewer Node"; + ot->name= _("Link to Viewer Node"); + ot->description = _("Link to Viewer Node"); ot->idname= "NODE_OT_link_viewer"; /* api callbacks */ @@ -2045,8 +2045,8 @@ static int node_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Nodes"; - ot->description = "Duplicate the nodes"; + ot->name= _("Duplicate Nodes"); + ot->description = _("Duplicate the nodes"); ot->idname= "NODE_OT_duplicate"; /* api callbacks */ @@ -2313,7 +2313,7 @@ static int node_link_cancel(bContext *C, wmOperator *op) void NODE_OT_link(wmOperatorType *ot) { /* identifiers */ - ot->name= "Link Nodes"; + ot->name= _("Link Nodes"); ot->idname= "NODE_OT_link"; /* api callbacks */ @@ -2349,8 +2349,8 @@ static int node_make_link_exec(bContext *C, wmOperator *op) void NODE_OT_link_make(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Links"; - ot->description= "Makes a link between selected output in input sockets"; + ot->name= _("Make Links"); + ot->description= _("Makes a link between selected output in input sockets"); ot->idname= "NODE_OT_link_make"; /* callbacks */ @@ -2428,7 +2428,7 @@ void NODE_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Cut links"; + ot->name= _("Cut links"); ot->idname= "NODE_OT_links_cut"; ot->invoke= WM_gesture_lines_invoke; @@ -2485,7 +2485,7 @@ static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_renderlayers(wmOperatorType *ot) { - ot->name= "Read Render Layers"; + ot->name= _("Read Render Layers"); ot->idname= "NODE_OT_read_renderlayers"; ot->exec= node_read_renderlayers_exec; @@ -2517,7 +2517,7 @@ static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_fullsamplelayers(wmOperatorType *ot) { - ot->name= "Read Full Sample Layers"; + ot->name= _("Read Full Sample Layers"); ot->idname= "NODE_OT_read_fullsamplelayers"; ot->exec= node_read_fullsamplelayers_exec; @@ -2565,7 +2565,7 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_render_changed(wmOperatorType *ot) { - ot->name= "Render Changed Layer"; + ot->name= _("Render Changed Layer"); ot->idname= "NODE_OT_render_changed"; ot->exec= node_render_changed_exec; @@ -2624,8 +2624,8 @@ static int node_group_make_exec(bContext *C, wmOperator *op) void NODE_OT_group_make(wmOperatorType *ot) { /* identifiers */ - ot->name = "Group"; - ot->description = "Make group from selected nodes"; + ot->name = _("Group"); + ot->description = _("Make group from selected nodes"); ot->idname = "NODE_OT_group_make"; /* api callbacks */ @@ -2687,8 +2687,8 @@ static int node_hide_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide"; - ot->description= "Toggle hiding of selected nodes"; + ot->name= _("Hide"); + ot->description= _("Toggle hiding of selected nodes"); ot->idname= "NODE_OT_hide_toggle"; /* callbacks */ @@ -2719,8 +2719,8 @@ static int node_preview_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_preview_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Node Preview"; - ot->description= "Toggle preview display for selected nodes"; + ot->name= _("Toggle Node Preview"); + ot->description= _("Toggle preview display for selected nodes"); ot->idname= "NODE_OT_preview_toggle"; /* callbacks */ @@ -2768,8 +2768,8 @@ static int node_socket_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_socket_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Hidden Node Sockets"; - ot->description= "Toggle unused node socket display"; + ot->name= _("Toggle Hidden Node Sockets"); + ot->description= _("Toggle unused node socket display"); ot->idname= "NODE_OT_hide_socket_toggle"; /* callbacks */ @@ -2811,8 +2811,8 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_mute_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Node Mute"; - ot->description= "Toggle muting of the nodes"; + ot->name= _("Toggle Node Mute"); + ot->description= _("Toggle muting of the nodes"); ot->idname= "NODE_OT_mute_toggle"; /* callbacks */ @@ -2853,8 +2853,8 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description = "Delete selected nodes"; + ot->name= _("Delete"); + ot->description = _("Delete selected nodes"); ot->idname= "NODE_OT_delete"; /* api callbacks */ @@ -2881,8 +2881,8 @@ static int node_show_cycles_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_show_cyclic_dependencies(wmOperatorType *ot) { /* identifiers */ - ot->name= "Show Cyclic Dependencies"; - ot->description= "Sort the nodes and show the cyclic dependencies between the nodes"; + ot->name= _("Show Cyclic Dependencies"); + ot->description= _("Sort the nodes and show the cyclic dependencies between the nodes"); ot->idname= "NODE_OT_show_cyclic_dependencies"; /* callbacks */ @@ -2970,8 +2970,8 @@ static int node_add_file_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_add_file(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add File Node"; - ot->description= "Add a file node to the current node editor"; + ot->name= _("Add File Node"); + ot->description= _("Add a file node to the current node editor"); ot->idname= "NODE_OT_add_file"; /* callbacks */ @@ -2983,6 +2983,6 @@ void NODE_OT_add_file(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH); //XXX TODO, relative_path - RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Datablock name to assign."); + RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Datablock name to assign.")); } diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 11e7949791d..fd236c683a1 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -42,6 +42,8 @@ #include "RNA_access.h" +#include "BLF_api.h" + #include "WM_api.h" #include "WM_types.h" @@ -101,11 +103,11 @@ void ED_operatormacros_node(void) { wmOperatorType *ot; - ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); - ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", "Link Viewer", OPTYPE_UNDO); + ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", _("Link Viewer"), OPTYPE_UNDO); WM_operatortype_macro_define(ot, "NODE_OT_select"); WM_operatortype_macro_define(ot, "NODE_OT_link_viewer"); diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index d8dfa6c41b9..36525bc517c 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -136,9 +136,9 @@ static int node_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select"; + ot->name= _("Select"); ot->idname= "NODE_OT_select"; - ot->description= "Select node under cursor"; + ot->description= _("Select node under cursor"); /* api callbacks */ ot->invoke= node_select_invoke; @@ -209,9 +209,9 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, wmEvent *event void NODE_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "NODE_OT_select_border"; - ot->description= "Use box selection to select nodes"; + ot->description= _("Use box selection to select nodes"); /* api callbacks */ ot->invoke= node_border_select_invoke; @@ -258,8 +258,8 @@ static int node_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select or Deselect All"; - ot->description = "(De)select all nodes"; + ot->name = _("Select or Deselect All"); + ot->description = _("(De)select all nodes"); ot->idname = "NODE_OT_select_all"; /* api callbacks */ @@ -298,8 +298,8 @@ static int node_select_linked_to_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_linked_to(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Linked To"; - ot->description = "Select nodes linked to the selected ones"; + ot->name = _("Select Linked To"); + ot->description = _("Select nodes linked to the selected ones"); ot->idname = "NODE_OT_select_linked_to"; /* api callbacks */ @@ -338,8 +338,8 @@ static int node_select_linked_from_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_linked_from(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Linked From"; - ot->description = "Select nodes linked from the selected ones"; + ot->name = _("Select Linked From"); + ot->description = _("Select nodes linked from the selected ones"); ot->idname = "NODE_OT_select_linked_from"; /* api callbacks */ @@ -364,8 +364,8 @@ static int node_select_same_type_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Same Type"; - ot->description = "Select all the same type"; + ot->name = _("Select Same Type"); + ot->description = _("Select all the same type"); ot->idname = "NODE_OT_select_same_type"; /* api callbacks */ @@ -390,8 +390,8 @@ static int node_select_same_type_next_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type_next(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Same Type Next"; - ot->description = "Select the next node of the same type."; + ot->name = _("Select Same Type Next"); + ot->description = _("Select the next node of the same type."); ot->idname = "NODE_OT_select_same_type_next"; /* api callbacks */ @@ -414,8 +414,8 @@ static int node_select_same_type_prev_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type_prev(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Same Type Prev"; - ot->description = "Select the prev node of the same type."; + ot->name = _("Select Same Type Prev"); + ot->description = _("Select the prev node of the same type."); ot->idname = "NODE_OT_select_same_type_prev"; /* api callbacks */ diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index 1daa425e244..a422222ae26 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -212,9 +212,9 @@ static int node_toggle_visibility_invoke(bContext *C, wmOperator *op, wmEvent *e void NODE_OT_visibility_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Visibility"; + ot->name= _("Toggle Visibility"); ot->idname= "NODE_OT_visibility_toggle"; - ot->description= "Handle clicks on node header buttons"; + ot->description= _("Handle clicks on node header buttons"); /* api callbacks */ ot->invoke= node_toggle_visibility_invoke; @@ -295,9 +295,9 @@ static int node_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "NODE_OT_view_all"; - ot->description= "Resize view so you can see all nodes"; + ot->description= _("Resize view so you can see all nodes"); /* api callbacks */ ot->exec= node_view_all_exec; diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 1ec4d42d453..d70e9af1a0b 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -1649,9 +1649,9 @@ static int outliner_toggle_visibility_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_visibility_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Visibility"; + ot->name= _("Toggle Visibility"); ot->idname= "OUTLINER_OT_visibility_toggle"; - ot->description= "Toggle the visibility of selected items"; + ot->description= _("Toggle the visibility of selected items"); /* callbacks */ ot->exec= outliner_toggle_visibility_exec; @@ -1689,9 +1689,9 @@ static int outliner_toggle_selectability_exec(bContext *C, wmOperator *UNUSED(op void OUTLINER_OT_selectability_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Selectability"; + ot->name= _("Toggle Selectability"); ot->idname= "OUTLINER_OT_selectability_toggle"; - ot->description= "Toggle the selectability"; + ot->description= _("Toggle the selectability"); /* callbacks */ ot->exec= outliner_toggle_selectability_exec; @@ -1726,9 +1726,9 @@ static int outliner_toggle_renderability_exec(bContext *C, wmOperator *UNUSED(op void OUTLINER_OT_renderability_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Renderability"; + ot->name= _("Toggle Renderability"); ot->idname= "OUTLINER_OT_renderability_toggle"; - ot->description= "Toggle the renderability of selected items"; + ot->description= _("Toggle the renderability of selected items"); /* callbacks */ ot->exec= outliner_toggle_renderability_exec; @@ -1757,9 +1757,9 @@ static int outliner_toggle_expanded_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_expanded_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Expand/Collapse All"; + ot->name= _("Expand/Collapse All"); ot->idname= "OUTLINER_OT_expanded_toggle"; - ot->description= "Expand/Collapse all items"; + ot->description= _("Expand/Collapse all items"); /* callbacks */ ot->exec= outliner_toggle_expanded_exec; @@ -1792,9 +1792,9 @@ static int outliner_toggle_selected_exec(bContext *C, wmOperator *UNUSED(op)) void OUTLINER_OT_selected_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Selected"; + ot->name= _("Toggle Selected"); ot->idname= "OUTLINER_OT_selected_toggle"; - ot->description= "Toggle the Outliner selection of items"; + ot->description= _("Toggle the Outliner selection of items"); /* callbacks */ ot->exec= outliner_toggle_selected_exec; @@ -2747,9 +2747,9 @@ static int outliner_item_rename(bContext *C, wmOperator *UNUSED(op), wmEvent *ev void OUTLINER_OT_item_rename(wmOperatorType *ot) { - ot->name= "Rename Item"; + ot->name= _("Rename Item"); ot->idname= "OUTLINER_OT_item_rename"; - ot->description= "Rename item under cursor"; + ot->description= _("Rename item under cursor"); ot->invoke= outliner_item_rename; @@ -3438,12 +3438,12 @@ static void outliner_del(bContext *C, Scene *scene, ARegion *UNUSED(ar), SpaceOo /* **************************************** */ static EnumPropertyItem prop_object_op_types[] = { - {1, "SELECT", 0, "Select", ""}, - {2, "DESELECT", 0, "Deselect", ""}, - {4, "DELETE", 0, "Delete", ""}, - {6, "TOGVIS", 0, "Toggle Visible", ""}, - {7, "TOGSEL", 0, "Toggle Selectable", ""}, - {8, "TOGREN", 0, "Toggle Renderable", ""}, + {1, "SELECT", 0, N_("Select"), ""}, + {2, "DESELECT", 0, N_("Deselect"), ""}, + {4, "DELETE", 0, N_("Delete"), ""}, + {6, "TOGVIS", 0, N_("Toggle Visible"), ""}, + {7, "TOGSEL", 0, N_("Toggle Selectable"), ""}, + {8, "TOGREN", 0, N_("Toggle Renderable"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -3511,7 +3511,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_object_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Object Operation"; + ot->name= _("Outliner Object Operation"); ot->idname= "OUTLINER_OT_object_operation"; ot->description= ""; @@ -3522,18 +3522,18 @@ void OUTLINER_OT_object_operation(wmOperatorType *ot) ot->flag= 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_object_op_types, 0, "Object Operation", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_object_op_types), 0, _("Object Operation"), ""); } /* **************************************** */ static EnumPropertyItem prop_group_op_types[] = { - {1, "UNLINK", 0, "Unlink", ""}, - {2, "LOCAL", 0, "Make Local", ""}, - {3, "LINK", 0, "Link Group Objects to Scene", ""}, - {4, "TOGVIS", 0, "Toggle Visible", ""}, - {5, "TOGSEL", 0, "Toggle Selectable", ""}, - {6, "TOGREN", 0, "Toggle Renderable", ""}, + {1, "UNLINK", 0, N_("Unlink"), ""}, + {2, "LOCAL", 0, N_("Make Local"), ""}, + {3, "LINK", 0, N_("Link Group Objects to Scene"), ""}, + {4, "TOGVIS", 0, N_("Toggle Visible"), ""}, + {5, "TOGSEL", 0, N_("Toggle Selectable"), ""}, + {6, "TOGREN", 0, N_("Toggle Renderable"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -3572,7 +3572,7 @@ static int outliner_group_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_group_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Group Operation"; + ot->name= _("Outliner Group Operation"); ot->idname= "OUTLINER_OT_group_operation"; ot->description= ""; @@ -3583,14 +3583,14 @@ void OUTLINER_OT_group_operation(wmOperatorType *ot) ot->flag= 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_group_op_types, 0, "Group Operation", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_group_op_types), 0, _("Group Operation"), ""); } /* **************************************** */ static EnumPropertyItem prop_id_op_types[] = { - {1, "UNLINK", 0, "Unlink", ""}, - {2, "LOCAL", 0, "Make Local", ""}, + {1, "UNLINK", 0, N_("Unlink"), ""}, + {2, "LOCAL", 0, N_("Make Local"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -3638,7 +3638,7 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_id_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner ID data Operation"; + ot->name= _("Outliner ID data Operation"); ot->idname= "OUTLINER_OT_id_operation"; ot->description= ""; @@ -3649,16 +3649,16 @@ void OUTLINER_OT_id_operation(wmOperatorType *ot) ot->flag= 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_id_op_types, 0, "ID data Operation", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_id_op_types), 0, _("ID data Operation"), ""); } /* **************************************** */ static EnumPropertyItem prop_data_op_types[] = { - {1, "SELECT", 0, "Select", ""}, - {2, "DESELECT", 0, "Deselect", ""}, - {3, "HIDE", 0, "Hide", ""}, - {4, "UNHIDE", 0, "Unhide", ""}, + {1, "SELECT", 0, N_("Select"), ""}, + {2, "DESELECT", 0, N_("Deselect"), ""}, + {3, "HIDE", 0, N_("Hide"), ""}, + {4, "UNHIDE", 0, N_("Unhide"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -3709,7 +3709,7 @@ static int outliner_data_operation_exec(bContext *C, wmOperator *op) void OUTLINER_OT_data_operation(wmOperatorType *ot) { /* identifiers */ - ot->name= "Outliner Data Operation"; + ot->name= _("Outliner Data Operation"); ot->idname= "OUTLINER_OT_data_operation"; ot->description= ""; @@ -3720,7 +3720,7 @@ void OUTLINER_OT_data_operation(wmOperatorType *ot) ot->flag= 0; - ot->prop= RNA_def_enum(ot->srna, "type", prop_data_op_types, 0, "Data Operation", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_data_op_types), 0, _("Data Operation"), ""); } @@ -3802,9 +3802,9 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), wmEvent *even /* Menu only! Calls other operators */ void OUTLINER_OT_operation(wmOperatorType *ot) { - ot->name= "Execute Operation"; + ot->name= _("Execute Operation"); ot->idname= "OUTLINER_OT_operation"; - ot->description= "Context menu for item operations"; + ot->description= _("Context menu for item operations"); ot->invoke= outliner_operation; @@ -4071,8 +4071,8 @@ void OUTLINER_OT_drivers_add_selected(wmOperatorType *ot) { /* api callbacks */ ot->idname= "OUTLINER_OT_drivers_add_selected"; - ot->name= "Add Drivers for Selected"; - ot->description= "Add drivers to selected items"; + ot->name= _("Add Drivers for Selected"); + ot->description= _("Add drivers to selected items"); /* api callbacks */ ot->exec= outliner_drivers_addsel_exec; @@ -4106,8 +4106,8 @@ void OUTLINER_OT_drivers_delete_selected(wmOperatorType *ot) { /* identifiers */ ot->idname= "OUTLINER_OT_drivers_delete_selected"; - ot->name= "Delete Drivers for Selected"; - ot->description= "Delete drivers assigned to selected items"; + ot->name= _("Delete Drivers for Selected"); + ot->description= _("Delete drivers assigned to selected items"); /* api callbacks */ ot->exec= outliner_drivers_deletesel_exec; @@ -4244,8 +4244,8 @@ void OUTLINER_OT_keyingset_add_selected(wmOperatorType *ot) { /* identifiers */ ot->idname= "OUTLINER_OT_keyingset_add_selected"; - ot->name= "Keying Set Add Selected"; - ot->description= "Add selected items (blue-grey rows) to active Keying Set"; + ot->name= _("Keying Set Add Selected"); + ot->description= _("Add selected items (blue-grey rows) to active Keying Set"); /* api callbacks */ ot->exec= outliner_keyingset_additems_exec; @@ -4281,8 +4281,8 @@ void OUTLINER_OT_keyingset_remove_selected(wmOperatorType *ot) { /* identifiers */ ot->idname= "OUTLINER_OT_keyingset_remove_selected"; - ot->name= "Keying Set Remove Selected"; - ot->description = "Remove selected items (blue-grey rows) from active Keying Set"; + ot->name= _("Keying Set Remove Selected"); + ot->description = _("Remove selected items (blue-grey rows) from active Keying Set"); /* api callbacks */ ot->exec= outliner_keyingset_removeitems_exec; diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 89b71db8b47..e4cddada224 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -84,7 +84,7 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot) ot->exec= run_pyfile_exec; ot->poll= ED_operator_areaactive; - RNA_def_string_file_path(ot->srna, "filepath", "", 512, "Path", ""); + RNA_def_string_file_path(ot->srna, "filepath", "", 512, _("Path"), ""); } diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index 01a43fd7fe1..a2f4e66fe67 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -38,6 +38,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_screen.h" @@ -109,9 +111,9 @@ static int sequencer_properties(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; + ot->name= _("Properties"); ot->idname= "SEQUENCER_OT_properties"; - ot->description= "Open sequencer properties panel"; + ot->description= _("Open sequencer properties panel"); ot->exec= sequencer_properties; ot->poll= ED_operator_sequencer_active; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 53303212274..48ff4832593 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -87,37 +87,37 @@ static int okee(const char *UNUSED(dummy)) {return 0;} /* XXX */ /* RNA Enums, used in multiple files */ EnumPropertyItem sequencer_prop_effect_types[] = { - {SEQ_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"}, - {SEQ_ADD, "ADD", 0, "Add", "Add effect strip type"}, - {SEQ_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"}, - {SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"}, - {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"}, - {SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"}, - {SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"}, - {SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"}, - {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", "Plugin effect strip type"}, - {SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"}, - {SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"}, - {SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"}, - {SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"}, - {SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"}, - {SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""}, - {SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""}, + {SEQ_CROSS, "CROSS", 0, N_("Crossfade"), N_("Crossfade effect strip type")}, + {SEQ_ADD, "ADD", 0, N_("Add"), N_("Add effect strip type")}, + {SEQ_SUB, "SUBTRACT", 0, N_("Subtract"), N_("Subtract effect strip type")}, + {SEQ_ALPHAOVER, "ALPHA_OVER", 0, N_("Alpha Over"), N_("Alpha Over effect strip type")}, + {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, N_("Alpha Under"), N_("Alpha Under effect strip type")}, + {SEQ_GAMCROSS, "GAMMA_CROSS", 0, N_("Gamma Cross"), N_("Gamma Cross effect strip type")}, + {SEQ_MUL, "MULTIPLY", 0, N_("Multiply"), N_("Multiply effect strip type")}, + {SEQ_OVERDROP, "OVER_DROP", 0, N_("Alpha Over Drop"), N_("Alpha Over Drop effect strip type")}, + {SEQ_PLUGIN, "PLUGIN", 0, N_("Plugin"), N_("Plugin effect strip type")}, + {SEQ_WIPE, "WIPE", 0, N_("Wipe"), N_("Wipe effect strip type")}, + {SEQ_GLOW, "GLOW", 0, N_("Glow"), N_("Glow effect strip type")}, + {SEQ_TRANSFORM, "TRANSFORM", 0, N_("Transform"), N_("Transform effect strip type")}, + {SEQ_COLOR, "COLOR", 0, N_("Color"), N_("Color effect strip type")}, + {SEQ_SPEED, "SPEED", 0, N_("Speed"), N_("Color effect strip type")}, + {SEQ_MULTICAM, "MULTICAM", 0, N_("Multicam Selector"), ""}, + {SEQ_ADJUSTMENT, "ADJUSTMENT", 0, N_("Adjustment Layer"), ""}, {0, NULL, 0, NULL, NULL} }; /* mute operator */ EnumPropertyItem prop_side_types[] = { - {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""}, - {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""}, - {SEQ_SIDE_BOTH, "BOTH", 0, "Both", ""}, + {SEQ_SIDE_LEFT, "LEFT", 0, N_("Left"), ""}, + {SEQ_SIDE_RIGHT, "RIGHT", 0, N_("Right"), ""}, + {SEQ_SIDE_BOTH, "BOTH", 0, N_("Both"), ""}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem prop_side_lr_types[] = { - {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""}, - {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""}, + {SEQ_SIDE_LEFT, "LEFT", 0, N_("Left"), ""}, + {SEQ_SIDE_RIGHT, "RIGHT", 0, N_("Right"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1183,9 +1183,9 @@ static int sequencer_snap_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev void SEQUENCER_OT_snap(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap strips"; + ot->name= _("Snap strips"); ot->idname= "SEQUENCER_OT_snap"; - ot->description="Frame where selected strips will be snapped"; + ot->description=_("Frame where selected strips will be snapped"); /* api callbacks */ ot->invoke= sequencer_snap_invoke; @@ -1313,9 +1313,9 @@ static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_lock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Lock Strips"; + ot->name= _("Lock Strips"); ot->idname= "SEQUENCER_OT_lock"; - ot->description="Lock the active strip so that it can't be transformed"; + ot->description=_("Lock the active strip so that it can't be transformed"); /* api callbacks */ ot->exec= sequencer_lock_exec; @@ -1346,9 +1346,9 @@ static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_unlock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "UnLock Strips"; + ot->name= _("UnLock Strips"); ot->idname= "SEQUENCER_OT_unlock"; - ot->description="Unlock the active strip so that it can't be transformed"; + ot->description=_("Unlock the active strip so that it can't be transformed"); /* api callbacks */ ot->exec= sequencer_unlock_exec; @@ -1379,9 +1379,9 @@ static int sequencer_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_reload(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Strips"; + ot->name= _("Reload Strips"); ot->idname= "SEQUENCER_OT_reload"; - ot->description="Reload strips in the sequencer"; + ot->description=_("Reload strips in the sequencer"); /* api callbacks */ ot->exec= sequencer_reload_exec; @@ -1407,9 +1407,9 @@ static int sequencer_refresh_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Refresh Sequencer"; + ot->name= _("Refresh Sequencer"); ot->idname= "SEQUENCER_OT_refresh_all"; - ot->description="Refresh the sequencer editor"; + ot->description=_("Refresh the sequencer editor"); /* api callbacks */ ot->exec= sequencer_refresh_all_exec; @@ -1467,9 +1467,9 @@ static int sequencer_effect_poll(bContext *C) void SEQUENCER_OT_reassign_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Reassign Inputs"; + ot->name= _("Reassign Inputs"); ot->idname= "SEQUENCER_OT_reassign_inputs"; - ot->description="Reassign the inputs for the effects strip"; + ot->description=_("Reassign the inputs for the effects strip"); /* api callbacks */ ot->exec= sequencer_reassign_inputs_exec; @@ -1503,9 +1503,9 @@ static int sequencer_swap_inputs_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Inputs"; + ot->name= _("Swap Inputs"); ot->idname= "SEQUENCER_OT_swap_inputs"; - ot->description="Swap the first two inputs for the effects strip"; + ot->description=_("Swap the first two inputs for the effects strip"); /* api callbacks */ ot->exec= sequencer_swap_inputs_exec; @@ -1518,8 +1518,8 @@ void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot) /* cut operator */ static EnumPropertyItem prop_cut_types[] = { - {SEQ_CUT_SOFT, "SOFT", 0, "Soft", ""}, - {SEQ_CUT_HARD, "HARD", 0, "Hard", ""}, + {SEQ_CUT_SOFT, "SOFT", 0, N_("Soft"), ""}, + {SEQ_CUT_HARD, "HARD", 0, N_("Hard"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1594,9 +1594,9 @@ static int sequencer_cut_invoke(bContext *C, wmOperator *op, wmEvent *event) void SEQUENCER_OT_cut(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut Strips"; + ot->name= _("Cut Strips"); ot->idname= "SEQUENCER_OT_cut"; - ot->description="Cut the selected strips"; + ot->description=_("Cut the selected strips"); /* api callbacks */ ot->invoke= sequencer_cut_invoke; @@ -1607,8 +1607,8 @@ void SEQUENCER_OT_cut(struct wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, _("Frame"), _("Frame where selected strips will be cut"), INT_MIN, INT_MAX); - RNA_def_enum(ot->srna, "type", prop_cut_types, SEQ_CUT_SOFT, _("Type"), _("The type of cut operation to perform on strips")); - RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, _("Side"), _("The side that remains selected after cutting")); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_cut_types), SEQ_CUT_SOFT, _("Type"), _("The type of cut operation to perform on strips")); + RNA_def_enum(ot->srna, "side", RNA_enum_items_gettexted(prop_side_types), SEQ_SIDE_BOTH, _("Side"), _("The side that remains selected after cutting")); } /* duplicate operator */ @@ -1664,9 +1664,9 @@ static int sequencer_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent * void SEQUENCER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Strips"; + ot->name= _("Duplicate Strips"); ot->idname= "SEQUENCER_OT_duplicate"; - ot->description="Duplicate the selected strips"; + ot->description=_("Duplicate the selected strips"); /* api callbacks */ ot->invoke= sequencer_add_duplicate_invoke; @@ -1677,7 +1677,7 @@ void SEQUENCER_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 */ @@ -1737,9 +1737,9 @@ void SEQUENCER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Erase Strips"; + ot->name= _("Erase Strips"); ot->idname= "SEQUENCER_OT_delete"; - ot->description="Erase selected strips from the sequencer"; + ot->description=_("Erase selected strips from the sequencer"); /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -1830,9 +1830,9 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_images_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate Images"; + ot->name= _("Separate Images"); ot->idname= "SEQUENCER_OT_images_separate"; - ot->description="On image sequences strips, it return a strip for each image"; + ot->description=_("On image sequences strips, it return a strip for each image"); /* api callbacks */ ot->invoke= WM_operator_props_popup; @@ -1903,9 +1903,9 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Meta Strip"; + ot->name= _("Toggle Meta Strip"); ot->idname= "SEQUENCER_OT_meta_toggle"; - ot->description="Toggle a metastrip (to edit enclosed strips)"; + ot->description=_("Toggle a metastrip (to edit enclosed strips)"); /* api callbacks */ ot->exec= sequencer_meta_toggle_exec; @@ -1970,9 +1970,9 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_meta_make(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Meta Strip"; + ot->name= _("Make Meta Strip"); ot->idname= "SEQUENCER_OT_meta_make"; - ot->description="Group selected strips into a metastrip"; + ot->description=_("Group selected strips into a metastrip"); /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -2041,9 +2041,9 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "UnMeta Strip"; + ot->name= _("UnMeta Strip"); ot->idname= "SEQUENCER_OT_meta_separate"; - ot->description="Put the contents of a metastrip back in the sequencer"; + ot->description=_("Put the contents of a metastrip back in the sequencer"); /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -2074,9 +2074,9 @@ static int sequencer_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "SEQUENCER_OT_view_all"; - ot->description="View all the strips in the sequencer"; + ot->description=_("View all the strips in the sequencer"); /* api callbacks */ ot->exec= sequencer_view_all_exec; @@ -2140,9 +2140,9 @@ static int sequencer_view_all_preview_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all_preview(wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "SEQUENCER_OT_view_all_preview"; - ot->description="Zoom preview to fit in the area"; + ot->description=_("Zoom preview to fit in the area"); /* api callbacks */ ot->exec= sequencer_view_all_preview_exec; @@ -2176,9 +2176,9 @@ static int sequencer_view_zoom_ratio_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sequencer View Zoom Ratio"; + ot->name= _("Sequencer View Zoom Ratio"); ot->idname= "SEQUENCER_OT_view_zoom_ratio"; - ot->description = "Change zoom ratio of sequencer preview"; + ot->description = _("Change zoom ratio of sequencer preview"); /* api callbacks */ ot->exec= sequencer_view_zoom_ratio_exec; @@ -2186,15 +2186,15 @@ void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "ratio", 1.0f, 0.0f, FLT_MAX, - "Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out.", -FLT_MAX, FLT_MAX); + _("Ratio"), _("Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out."), -FLT_MAX, FLT_MAX); } #if 0 static EnumPropertyItem view_type_items[] = { - {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, "Sequencer", ""}, - {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, "Image Preview", ""}, - {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SEQUENCER, "Sequencer and Image Preview", ""}, + {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, N_("Sequencer"), ""}, + {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, N_("Image Preview"), ""}, + {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SEQUENCER, N_("Sequencer and Image Preview"), ""}, {0, NULL, 0, NULL, NULL}}; #endif @@ -2214,9 +2214,9 @@ static int sequencer_view_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Toggle"; + ot->name= _("View Toggle"); ot->idname= "SEQUENCER_OT_view_toggle"; - ot->description="Toggle between sequencer views (sequence, preview, both)"; + ot->description=_("Toggle between sequencer views (sequence, preview, both)"); /* api callbacks */ ot->exec= sequencer_view_toggle_exec; @@ -2294,9 +2294,9 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; + ot->name= _("View Selected"); ot->idname= "SEQUENCER_OT_view_selected"; - ot->description="Zoom the sequencer on the selected strips"; + ot->description=_("Zoom the sequencer on the selected strips"); /* api callbacks */ ot->exec= sequencer_view_selected_exec; @@ -2379,9 +2379,9 @@ static int sequencer_next_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_next_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Next Edit"; + ot->name= _("Next Edit"); ot->idname= "SEQUENCER_OT_next_edit"; - ot->description="Move frame to next edit point"; + ot->description=_("Move frame to next edit point"); /* api callbacks */ ot->exec= sequencer_next_edit_exec; @@ -2409,9 +2409,9 @@ static int sequencer_previous_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_previous_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Previous Edit"; + ot->name= _("Previous Edit"); ot->idname= "SEQUENCER_OT_previous_edit"; - ot->description="Move frame to previous edit point"; + ot->description=_("Move frame to previous edit point"); /* api callbacks */ ot->exec= sequencer_previous_edit_exec; @@ -2513,9 +2513,9 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap(wmOperatorType *ot) { /* identifiers */ - ot->name= "Swap Strip"; + ot->name= _("Swap Strip"); ot->idname= "SEQUENCER_OT_swap"; - ot->description="Swap active strip with strip to the left"; + ot->description=_("Swap active strip with strip to the left"); /* api callbacks */ ot->exec= sequencer_swap_exec; @@ -2525,7 +2525,7 @@ void SEQUENCER_OT_swap(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", prop_side_lr_types, SEQ_SIDE_RIGHT, "Side", "Side of the strip to swap"); + RNA_def_enum(ot->srna, "side", prop_side_lr_types, SEQ_SIDE_RIGHT, _("Side"), _("Side of the strip to swap")); } static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2572,9 +2572,9 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_rendersize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Render Size"; + ot->name= _("Set Render Size"); ot->idname= "SEQUENCER_OT_rendersize"; - ot->description="Set render size and aspect from active sequence"; + ot->description=_("Set render size and aspect from active sequence"); /* api callbacks */ ot->exec= sequencer_rendersize_exec; @@ -2651,7 +2651,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy"; + ot->name= _("Copy"); ot->idname= "SEQUENCER_OT_copy"; ot->description=""; @@ -2702,7 +2702,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste"; + ot->name= _("Paste"); ot->idname= "SEQUENCER_OT_paste"; ot->description=""; @@ -2753,9 +2753,9 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_data(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sequencer Swap Data"; + ot->name= _("Sequencer Swap Data"); ot->idname= "SEQUENCER_OT_swap_data"; - ot->description="Swap 2 sequencer strips"; + ot->description=_("Swap 2 sequencer strips"); /* api callbacks */ ot->exec= sequencer_swap_data_exec; @@ -2810,9 +2810,9 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Offset View"; + ot->name= _("Border Offset View"); ot->idname= "SEQUENCER_OT_view_ghost_border"; - ot->description="Enable border select mode"; + ot->description=_("Enable border select mode"); /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index c48814f7302..fa2d65443b0 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -248,9 +248,9 @@ static int sequencer_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_all_toggle(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= _("Select or Deselect All"); ot->idname= "SEQUENCER_OT_select_all_toggle"; - ot->description="Select or deselect all strips"; + ot->description=_("Select or deselect all strips"); /* api callbacks */ ot->exec= sequencer_deselect_exec; @@ -286,9 +286,9 @@ static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; + ot->name= _("Select Inverse"); ot->idname= "SEQUENCER_OT_select_inverse"; - ot->description="Select unselected strips"; + ot->description=_("Select unselected strips"); /* api callbacks */ ot->exec= sequencer_select_inverse_exec; @@ -598,9 +598,9 @@ static int sequencer_select_more_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; + ot->name= _("Select More"); ot->idname= "SEQUENCER_OT_select_more"; - ot->description="Select more strips adjacent to the current selection"; + ot->description=_("Select more strips adjacent to the current selection"); /* api callbacks */ ot->exec= sequencer_select_more_exec; @@ -629,9 +629,9 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select less"; + ot->name= _("Select less"); ot->idname= "SEQUENCER_OT_select_less"; - ot->description="Shrink the current selection of adjacent selected strips"; + ot->description=_("Shrink the current selection of adjacent selected strips"); /* api callbacks */ ot->exec= sequencer_select_less_exec; @@ -714,9 +714,9 @@ static int sequencer_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select linked"; + ot->name= _("Select linked"); ot->idname= "SEQUENCER_OT_select_linked"; - ot->description="Select all strips adjacent to the current selection"; + ot->description=_("Select all strips adjacent to the current selection"); /* api callbacks */ ot->exec= sequencer_select_linked_exec; @@ -764,9 +764,9 @@ static int sequencer_select_handles_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_handles(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Handles"; + ot->name= _("Select Handles"); ot->idname= "SEQUENCER_OT_select_handles"; - ot->description="Select manipulator handles on the sides of the selected strip"; + ot->description=_("Select manipulator handles on the sides of the selected strip"); /* api callbacks */ ot->exec= sequencer_select_handles_exec; @@ -776,7 +776,7 @@ void SEQUENCER_OT_select_handles(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); + RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, _("Side"), _("The side of the handle that is selected")); } /* select side operator */ @@ -801,9 +801,9 @@ static int sequencer_select_active_side_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_active_side(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Active Side"; + ot->name= _("Select Active Side"); ot->idname= "SEQUENCER_OT_select_active_side"; - ot->description="Select strips on the nominated side of the active strip"; + ot->description=_("Select strips on the nominated side of the active strip"); /* api callbacks */ ot->exec= sequencer_select_active_side_exec; @@ -813,7 +813,7 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); + RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, _("Side"), _("The side of the handle that is selected")); } @@ -865,9 +865,9 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "SEQUENCER_OT_select_border"; - ot->description="Enable border select mode"; + ot->description=_("Enable border select mode"); /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 165cec238c0..e82448e1277 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -54,6 +54,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_screen.h" @@ -119,8 +121,8 @@ static int properties_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_properties(wmOperatorType *ot) { /* identifiers */ - ot->name= "Properties"; - ot->description= "Toggle text properties panel"; + ot->name= _("Properties"); + ot->description= _("Toggle text properties panel"); ot->idname= "TEXT_OT_properties"; /* api callbacks */ diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 12f910d2011..2e8cc6bfe9c 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -193,9 +193,9 @@ static int new_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New"; + ot->name= _("New"); ot->idname= "TEXT_OT_new"; - ot->description= "Create a new text data block"; + ot->description= _("Create a new text data block"); /* api callbacks */ ot->exec= new_exec; @@ -337,9 +337,9 @@ static int reload_exec(bContext *C, wmOperator *op) void TEXT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload"; + ot->name= _("Reload"); ot->idname= "TEXT_OT_reload"; - ot->description= "Reload active text data block from its file"; + ot->description= _("Reload active text data block from its file"); /* api callbacks */ ot->exec= reload_exec; @@ -387,9 +387,9 @@ static int unlink_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink"; + ot->name= _("Unlink"); ot->idname= "TEXT_OT_unlink"; - ot->description= "Unlink active text data block"; + ot->description= _("Unlink active text data block"); /* api callbacks */ ot->exec= unlink_exec; @@ -422,9 +422,9 @@ static int make_internal_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_make_internal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Internal"; + ot->name= _("Make Internal"); ot->idname= "TEXT_OT_make_internal"; - ot->description= "Make active text file internal"; + ot->description= _("Make active text file internal"); /* api callbacks */ ot->exec= make_internal_exec; @@ -495,9 +495,9 @@ static int save_exec(bContext *C, wmOperator *op) void TEXT_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save"; + ot->name= _("Save"); ot->idname= "TEXT_OT_save"; - ot->description= "Save active text data block"; + ot->description= _("Save active text data block"); /* api callbacks */ ot->exec= save_exec; @@ -552,9 +552,9 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_save_as(wmOperatorType *ot) { /* identifiers */ - ot->name= "Save As"; + ot->name= _("Save As"); ot->idname= "TEXT_OT_save_as"; - ot->description= "Save active text file with options"; + ot->description= _("Save active text file with options"); /* api callbacks */ ot->exec= save_as_exec; @@ -622,9 +622,9 @@ static int run_script_exec(bContext *C, wmOperator *op) void TEXT_OT_run_script(wmOperatorType *ot) { /* identifiers */ - ot->name= "Run Script"; + ot->name= _("Run Script"); ot->idname= "TEXT_OT_run_script"; - ot->description= "Run active script"; + ot->description= _("Run active script"); /* api callbacks */ ot->poll= run_script_poll; @@ -682,9 +682,9 @@ static int refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUSED(op void TEXT_OT_refresh_pyconstraints(wmOperatorType *ot) { /* identifiers */ - ot->name= "Refresh PyConstraints"; + ot->name= _("Refresh PyConstraints"); ot->idname= "TEXT_OT_refresh_pyconstraints"; - ot->description= "Refresh all pyconstraints"; + ot->description= _("Refresh all pyconstraints"); /* api callbacks */ ot->exec= refresh_pyconstraints_exec; @@ -844,9 +844,9 @@ static int copy_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy"; + ot->name= _("Copy"); ot->idname= "TEXT_OT_copy"; - ot->description= "Copy selected text to clipboard"; + ot->description= _("Copy selected text to clipboard"); /* api callbacks */ ot->exec= copy_exec; @@ -877,9 +877,9 @@ static int cut_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut"; + ot->name= _("Cut"); ot->idname= "TEXT_OT_cut"; - ot->description= "Cut selected text to clipboard"; + ot->description= _("Cut selected text to clipboard"); /* api callbacks */ ot->exec= cut_exec; @@ -912,9 +912,9 @@ static int indent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_indent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Indent"; + ot->name= _("Indent"); ot->idname= "TEXT_OT_indent"; - ot->description= "Indent selected text"; + ot->description= _("Indent selected text"); /* api callbacks */ ot->exec= indent_exec; @@ -947,9 +947,9 @@ static int unindent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unindent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unindent"; + ot->name= _("Unindent"); ot->idname= "TEXT_OT_unindent"; - ot->description= "Unindent selected text"; + ot->description= _("Unindent selected text"); /* api callbacks */ ot->exec= unindent_exec; @@ -994,9 +994,9 @@ static int line_break_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Break"; + ot->name= _("Line Break"); ot->idname= "TEXT_OT_line_break"; - ot->description= "Insert line break at cursor position"; + ot->description= _("Insert line break at cursor position"); /* api callbacks */ ot->exec= line_break_exec; @@ -1027,9 +1027,9 @@ static int comment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_comment(wmOperatorType *ot) { /* identifiers */ - ot->name= "Comment"; + ot->name= _("Comment"); ot->idname= "TEXT_OT_comment"; - ot->description= "Convert selected text to comment"; + ot->description= _("Convert selected text to comment"); /* api callbacks */ ot->exec= comment_exec; @@ -1061,9 +1061,9 @@ static int uncomment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_uncomment(wmOperatorType *ot) { /* identifiers */ - ot->name= "Uncomment"; + ot->name= _("Uncomment"); ot->idname= "TEXT_OT_uncomment"; - ot->description= "Convert selected comment to text"; + ot->description= _("Convert selected comment to text"); /* api callbacks */ ot->exec= uncomment_exec; @@ -1201,16 +1201,16 @@ static int convert_whitespace_exec(bContext *C, wmOperator *op) void TEXT_OT_convert_whitespace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Convert Whitespace"; + ot->name= _("Convert Whitespace"); ot->idname= "TEXT_OT_convert_whitespace"; - ot->description= "Convert whitespaces by type"; + ot->description= _("Convert whitespaces by type"); /* api callbacks */ ot->exec= convert_whitespace_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", whitespace_type_items, TO_SPACES, "type", "Type of whitespace to convert to."); + RNA_def_enum(ot->srna, "type", whitespace_type_items, TO_SPACES, _("type"), _("Type of whitespace to convert to.")); } /******************* select all operator *********************/ @@ -1230,9 +1230,9 @@ static int select_all_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "TEXT_OT_select_all"; - ot->description= "Select all text"; + ot->description= _("Select all text"); /* api callbacks */ ot->exec= select_all_exec; @@ -1256,9 +1256,9 @@ static int select_line_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_line(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Line"; + ot->name= _("Select Line"); ot->idname= "TEXT_OT_select_line"; - ot->description= "Select text by line"; + ot->description= _("Select text by line"); /* api callbacks */ ot->exec= select_line_exec; @@ -1283,9 +1283,9 @@ static int select_word_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_word(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Word"; + ot->name= _("Select Word"); ot->idname= "TEXT_OT_select_word"; - ot->description= "Select word under cursor"; + ot->description= _("Select word under cursor"); /* api callbacks */ ot->exec= select_word_exec; @@ -1319,9 +1319,9 @@ static int previous_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_previous_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Previous Marker"; + ot->name= _("Previous Marker"); ot->idname= "TEXT_OT_previous_marker"; - ot->description= "Move to previous marker"; + ot->description= _("Move to previous marker"); /* api callbacks */ ot->exec= previous_marker_exec; @@ -1355,9 +1355,9 @@ static int next_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_next_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= "Next Marker"; + ot->name= _("Next Marker"); ot->idname= "TEXT_OT_next_marker"; - ot->description= "Move to next marker"; + ot->description= _("Move to next marker"); /* api callbacks */ ot->exec= next_marker_exec; @@ -1381,9 +1381,9 @@ static int clear_all_markers_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_markers_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear All Markers"; + ot->name= _("Clear All Markers"); ot->idname= "TEXT_OT_markers_clear"; - ot->description= "Clear all markers"; + ot->description= _("Clear all markers"); /* api callbacks */ ot->exec= clear_all_markers_exec; @@ -1894,16 +1894,16 @@ static int move_exec(bContext *C, wmOperator *op) void TEXT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; + ot->name= _("Move Cursor"); ot->idname= "TEXT_OT_move"; - ot->description= "Move cursor to position type"; + ot->description= _("Move cursor to position type"); /* api callbacks */ ot->exec= move_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to.")); } /******************* move select operator ********************/ @@ -1918,16 +1918,16 @@ static int move_select_exec(bContext *C, wmOperator *op) void TEXT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Select"; + ot->name= _("Move Select"); ot->idname= "TEXT_OT_move_select"; - ot->description= "Make selection from current cursor position to new cursor position type"; + ot->description= _("Make selection from current cursor position to new cursor position type"); /* api callbacks */ ot->exec= move_select_exec; ot->poll= text_space_edit_poll; /* 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", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to, to make a selection.")); } /******************* jump operator *********************/ @@ -1960,9 +1960,9 @@ static int jump_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_jump(wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump"; + ot->name= _("Jump"); ot->idname= "TEXT_OT_jump"; - ot->description= "Jump cursor to line"; + ot->description= _("Jump cursor to line"); /* api callbacks */ ot->invoke= jump_invoke; @@ -2013,16 +2013,16 @@ static int delete_exec(bContext *C, wmOperator *op) void TEXT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; + ot->name= _("Delete"); ot->idname= "TEXT_OT_delete"; - ot->description= "Delete text by cursor position"; + ot->description= _("Delete text by cursor position"); /* api callbacks */ ot->exec= delete_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete."); + RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, _("Type"), _("Which part of the text to delete.")); } /******************* toggle overwrite operator **********************/ @@ -2041,9 +2041,9 @@ static int toggle_overwrite_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_overwrite_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Overwrite"; + ot->name= _("Toggle Overwrite"); ot->idname= "TEXT_OT_overwrite_toggle"; - ot->description= "Toggle overwrite while typing"; + ot->description= _("Toggle overwrite while typing"); /* api callbacks */ ot->exec= toggle_overwrite_exec; @@ -2241,12 +2241,12 @@ static int scroll_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll"; + ot->name= _("Scroll"); /*don't really see the difference between this and scroll_bar. Both do basically the same thing (aside from keymaps).*/ ot->idname= "TEXT_OT_scroll"; - ot->description= "Scroll text screen"; + ot->description= _("Scroll text screen"); /* api callbacks */ ot->exec= scroll_exec; @@ -2324,12 +2324,12 @@ static int scroll_bar_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll_bar(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scrollbar"; + ot->name= _("Scrollbar"); /*don't really see the difference between this and scroll. Both do basically the same thing (aside from keymaps).*/ ot->idname= "TEXT_OT_scroll_bar"; - ot->description= "Scroll text screen"; + ot->description= _("Scroll text screen"); /* api callbacks */ ot->invoke= scroll_bar_invoke; @@ -2675,9 +2675,9 @@ static int set_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Cursor"; + ot->name= _("Set Cursor"); ot->idname= "TEXT_OT_cursor_set"; - ot->description= "Set cursor position"; + ot->description= _("Set cursor position"); /* api callbacks */ ot->invoke= set_cursor_invoke; @@ -2731,9 +2731,9 @@ static int line_number_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *even void TEXT_OT_line_number(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Number"; + ot->name= _("Line Number"); ot->idname= "TEXT_OT_line_number"; - ot->description= "The current line number"; + ot->description= _("The current line number"); /* api callbacks */ ot->invoke= line_number_invoke; @@ -2806,9 +2806,9 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert"; + ot->name= _("Insert"); ot->idname= "TEXT_OT_insert"; - ot->description= "Insert text at cursor position"; + ot->description= _("Insert text at cursor position"); /* api callbacks */ ot->exec= insert_exec; @@ -2816,7 +2816,7 @@ void TEXT_OT_insert(wmOperatorType *ot) ot->poll= text_edit_poll; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); } /******************* find operator *********************/ @@ -2925,9 +2925,9 @@ static int find_exec(bContext *C, wmOperator *op) void TEXT_OT_find(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find"; + ot->name= _("Find"); ot->idname= "TEXT_OT_find"; - ot->description= "Find specified text"; + ot->description= _("Find specified text"); /* api callbacks */ ot->exec= find_exec; @@ -2944,9 +2944,9 @@ static int replace_exec(bContext *C, wmOperator *op) void TEXT_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace"; + ot->name= _("Replace"); ot->idname= "TEXT_OT_replace"; - ot->description= "Replace text with the specified text"; + ot->description= _("Replace text with the specified text"); /* api callbacks */ ot->exec= replace_exec; @@ -2963,9 +2963,9 @@ static int mark_all_exec(bContext *C, wmOperator *op) void TEXT_OT_mark_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mark All"; + ot->name= _("Mark All"); ot->idname= "TEXT_OT_mark_all"; - ot->description= "Mark all specified text"; + ot->description= _("Mark all specified text"); /* api callbacks */ ot->exec= mark_all_exec; @@ -2993,9 +2993,9 @@ static int find_set_selected_exec(bContext *C, wmOperator *op) void TEXT_OT_find_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find Set Selected"; + ot->name= _("Find Set Selected"); ot->idname= "TEXT_OT_find_set_selected"; - ot->description= "Find specified text and set as selected"; + ot->description= _("Find specified text and set as selected"); /* api callbacks */ ot->exec= find_set_selected_exec; @@ -3020,9 +3020,9 @@ static int replace_set_selected_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_replace_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Replace Set Selected"; + ot->name= _("Replace Set Selected"); ot->idname= "TEXT_OT_replace_set_selected"; - ot->description= "Replace text with specified text and set as selected"; + ot->description= _("Replace text with specified text and set as selected"); /* api callbacks */ ot->exec= replace_set_selected_exec; @@ -3155,9 +3155,9 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void TEXT_OT_resolve_conflict(wmOperatorType *ot) { /* identifiers */ - ot->name= "Resolve Conflict"; + ot->name= _("Resolve Conflict"); ot->idname= "TEXT_OT_resolve_conflict"; - ot->description= "When external text is out of sync, resolve the conflict"; + ot->description= _("When external text is out of sync, resolve the conflict"); /* api callbacks */ ot->exec= resolve_conflict_exec; @@ -3165,7 +3165,7 @@ void TEXT_OT_resolve_conflict(wmOperatorType *ot) ot->poll= save_poll; /* properties */ - RNA_def_enum(ot->srna, "resolution", resolution_items, RESOLVE_IGNORE, "Resolution", "How to solve conflict due to different in internal and external text."); + RNA_def_enum(ot->srna, "resolution", resolution_items, RESOLVE_IGNORE, _("Resolution"), _("How to solve conflict due to different in internal and external text.")); } /********************** to 3d object operator *****************/ diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index b6a3afb23ca..e86ae1849dd 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -79,9 +79,9 @@ static int time_set_sfra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_start_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Start Frame"; + ot->name= _("Set Start Frame"); ot->idname= "TIME_OT_start_frame_set"; - ot->description="Set the start frame"; + ot->description=_("Set the start frame"); /* api callbacks */ ot->exec= time_set_sfra_exec; @@ -121,9 +121,9 @@ static int time_set_efra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_end_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set End Frame"; + ot->name= _("Set End Frame"); ot->idname= "TIME_OT_end_frame_set"; - ot->description="Set the end frame"; + ot->description=_("Set the end frame"); /* api callbacks */ ot->exec= time_set_efra_exec; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 8172a74f861..eab35ba29c0 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1076,14 +1076,14 @@ static int align_exec(bContext *C, wmOperator *op) static void UV_OT_align(wmOperatorType *ot) { static EnumPropertyItem axis_items[] = { - {'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already"}, - {'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis"}, - {'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis"}, + {'a', "ALIGN_AUTO", 0, N_("Align Auto"), N_("Automatically choose the axis on which there is most alignment already")}, + {'x', "ALIGN_X", 0, N_("Align X"), N_("Align UVs on X axis")}, + {'y', "ALIGN_Y", 0, N_("Align Y"), N_("Align UVs on Y axis")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Align"; - ot->description= "Align selected UV vertices to an axis"; + ot->name= _("Align"); + ot->description= _("Align selected UV vertices to an axis"); ot->idname= "UV_OT_align"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1092,7 +1092,7 @@ static void UV_OT_align(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "axis", axis_items, 'a', "Axis", "Axis to align UV locations on."); + RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items), 'a', _("Axis"), _("Axis to align UV locations on.")); } /* ******************** weld operator **************** */ @@ -1107,8 +1107,8 @@ static int weld_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_weld(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weld"; - ot->description= "Weld selected UV vertices together"; + ot->name= _("Weld"); + ot->description= _("Weld selected UV vertices together"); ot->idname= "UV_OT_weld"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1390,8 +1390,8 @@ static int select_all_exec(bContext *C, wmOperator *op) static void UV_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; - ot->description= "Change selection of all UV vertices"; + ot->name= _("Select or Deselect All"); + ot->description= _("Change selection of all UV vertices"); ot->idname= "UV_OT_select_all"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1933,8 +1933,8 @@ static int unlink_selection_exec(bContext *C, wmOperator *op) static void UV_OT_unlink_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink Selection"; - ot->description= "Unlink selected UV vertices from active UV map"; + ot->name= _("Unlink Selection"); + ot->description= _("Unlink selected UV vertices from active UV map"); ot->idname= "UV_OT_unlink_selected"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2304,8 +2304,8 @@ static int circle_select_exec(bContext *C, wmOperator *op) static void UV_OT_circle_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Circle Select"; - ot->description= "Select UV vertices using circle selection"; + ot->name= _("Circle Select"); + ot->description= _("Select UV vertices using circle selection"); ot->idname= "UV_OT_circle_select"; /* api callbacks */ @@ -2375,13 +2375,13 @@ static int snap_cursor_exec(bContext *C, wmOperator *op) static void UV_OT_snap_cursor(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", 0, "Pixels", ""}, - {1, "SELECTED", 0, "Selected", ""}, + {0, "PIXELS", 0, N_("Pixels"), ""}, + {1, "SELECTED", 0, N_("Selected"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Snap Cursor"; - ot->description= "Snap cursor to target type"; + ot->name= _("Snap Cursor"); + ot->description= _("Snap cursor to target type"); ot->idname= "UV_OT_snap_cursor"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2390,7 +2390,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to."); + RNA_def_enum(ot->srna, "target", target_items, 0, _("Target"), _("Target to snap the selected UV's to.")); } /* ******************** snap selection operator **************** */ @@ -2616,14 +2616,14 @@ static int snap_selection_exec(bContext *C, wmOperator *op) static void UV_OT_snap_selected(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", 0, "Pixels", ""}, - {1, "CURSOR", 0, "Cursor", ""}, - {2, "ADJACENT_UNSELECTED", 0, "Adjacent Unselected", ""}, + {0, "PIXELS", 0, N_("Pixels"), ""}, + {1, "CURSOR", 0, N_("Cursor"), ""}, + {2, "ADJACENT_UNSELECTED", 0, N_("Adjacent Unselected"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Snap Selection"; - ot->description= "Snap selected UV vertices to target type"; + ot->name= _("Snap Selection"); + ot->description= _("Snap selected UV vertices to target type"); ot->idname= "UV_OT_snap_selected"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2632,7 +2632,7 @@ static void UV_OT_snap_selected(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to."); + RNA_def_enum(ot->srna, "target", RNA_enum_items_gettexted(target_items), 0, _("Target"), _("Target to snap the selected UV's to.")); } /* ******************** pin operator **************** */ @@ -2723,8 +2723,8 @@ static int select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_select_pinned(wmOperatorType *ot) { /* identifiers */ - ot->name= "Selected Pinned"; - ot->description= "Select all pinned UV vertices"; + ot->name= _("Selected Pinned"); + ot->description= _("Select all pinned UV vertices"); ot->idname= "UV_OT_select_pinned"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2996,8 +2996,8 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Hidden"; - ot->description= "Reveal all hidden UV vertices"; + ot->name= _("Reveal Hidden"); + ot->description= _("Reveal all hidden UV vertices"); ot->idname= "UV_OT_reveal"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -3039,8 +3039,8 @@ static int set_2d_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set 2D Cursor"; - ot->description= "Set 2D cursor location"; + ot->name= _("Set 2D Cursor"); + ot->description= _("Set 2D cursor location"); ot->idname= "UV_OT_cursor_set"; /* api callbacks */ @@ -3052,7 +3052,7 @@ static void UV_OT_cursor_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in 0.0-1.0 coordinates.", -10.0f, 10.0f); + RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Cursor location in 0.0-1.0 coordinates."), -10.0f, 10.0f); } /********************** set tile operator **********************/ @@ -3105,8 +3105,8 @@ static int set_tile_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_tile_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Tile"; - ot->description= "Set UV image tile coordinates"; + ot->name= _("Set Tile"); + ot->description= _("Set UV image tile coordinates"); ot->idname= "UV_OT_tile_set"; /* api callbacks */ @@ -3118,7 +3118,7 @@ static void UV_OT_tile_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, "Tile", "Tile coordinate.", 0, 10); + RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, _("Tile"), _("Tile coordinate."), 0, 10); } /* ************************** registration **********************************/ diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 4ebcf1c75d1..efec9051d51 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -467,10 +467,10 @@ static int minimize_stretch_cancel(bContext *C, wmOperator *op) void UV_OT_minimize_stretch(wmOperatorType *ot) { /* identifiers */ - ot->name= "Minimize Stretch"; + ot->name= _("Minimize Stretch"); ot->idname= "UV_OT_minimize_stretch"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->description="Reduce UV stretching by relaxing angles"; + ot->description=_("Reduce UV stretching by relaxing angles"); /* api callbacks */ ot->exec= minimize_stretch_exec; @@ -522,7 +522,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op) void UV_OT_pack_islands(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pack Islands"; + ot->name= _("Pack Islands"); ot->idname= "UV_OT_pack_islands"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -531,7 +531,7 @@ void UV_OT_pack_islands(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* properties */ - RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, "Margin", "Space between islands", 0.0f, 1.0f); + RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, _("Margin"), _("Space between islands"), 0.0f, 1.0f); } /* ******************** Average Islands Scale operator **************** */ @@ -564,7 +564,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_average_islands_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Average Islands Scale"; + ot->name= _("Average Islands Scale"); ot->idname= "UV_OT_average_islands_scale"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -747,21 +747,21 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float static void uv_transform_properties(wmOperatorType *ot, int radius) { static EnumPropertyItem direction_items[]= { - {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", 0, "View on Equator", "3D view is on the equator"}, - {VIEW_ON_POLES, "VIEW_ON_POLES", 0, "View on Poles", "3D view is on the poles"}, - {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", 0, "Align to Object", "Align according to object transform"}, + {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", 0, N_("View on Equator"), N_("3D view is on the equator")}, + {VIEW_ON_POLES, "VIEW_ON_POLES", 0, N_("View on Poles"), N_("3D view is on the poles")}, + {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", 0, N_("Align to Object"), N_("Align according to object transform")}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem align_items[]= { - {POLAR_ZX, "POLAR_ZX", 0, "Polar ZX", "Polar 0 is X"}, - {POLAR_ZY, "POLAR_ZY", 0, "Polar ZY", "Polar 0 is Y"}, + {POLAR_ZX, "POLAR_ZX", 0, N_("Polar ZX"), N_("Polar 0 is X")}, + {POLAR_ZY, "POLAR_ZY", 0, N_("Polar ZY"), N_("Polar 0 is Y")}, {0, NULL, 0, NULL, NULL} }; - RNA_def_enum(ot->srna, "direction", direction_items, VIEW_ON_EQUATOR, "Direction", "Direction of the sphere or cylinder."); - RNA_def_enum(ot->srna, "align", align_items, VIEW_ON_EQUATOR, "Align", "How to determine rotation around the pole."); + RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), VIEW_ON_EQUATOR, _("Direction"), _("Direction of the sphere or cylinder.")); + RNA_def_enum(ot->srna, "align", RNA_enum_items_gettexted(align_items), VIEW_ON_EQUATOR, _("Align"), _("How to determine rotation around the pole.")); if(radius) - RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "Radius of the sphere or cylinder.", 0.0001f, 100.0f); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, _("Radius"), _("Radius of the sphere or cylinder."), 0.0001f, 100.0f); } static void correct_uv_aspect(EditMesh *em) @@ -958,8 +958,8 @@ static int unwrap_exec(bContext *C, wmOperator *op) void UV_OT_unwrap(wmOperatorType *ot) { static EnumPropertyItem method_items[] = { - {0, "ANGLE_BASED", 0, "Angle Based", ""}, - {1, "CONFORMAL", 0, "Conformal", ""}, + {0, "ANGLE_BASED", 0, N_("Angle Based"), ""}, + {1, "CONFORMAL", 0, N_("Conformal"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ @@ -973,7 +973,7 @@ void UV_OT_unwrap(wmOperatorType *ot) ot->poll= ED_operator_uvmap; /* properties */ - RNA_def_enum(ot->srna, "method", method_items, 0, "Method", "Unwrapping method. Angle Based usually gives better results than Conformal, while being somewhat slower."); + RNA_def_enum(ot->srna, "method", RNA_enum_items_gettexted(method_items), 0, _("Method"), _("Unwrapping method. Angle Based usually gives better results than Conformal, while being somewhat slower.")); RNA_def_boolean(ot->srna, "fill_holes", 1, _("Fill Holes"), _("Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry.")); RNA_def_boolean(ot->srna, "correct_aspect", 1, _("Correct Aspect"), _("Map UV's taking image aspect ratio into account.")); } @@ -1132,7 +1132,7 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset"; + ot->name= _("Reset"); ot->idname= "UV_OT_reset"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1220,7 +1220,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op) void UV_OT_sphere_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sphere Projection"; + ot->name= _("Sphere Projection"); ot->idname= "UV_OT_sphere_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1292,7 +1292,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) void UV_OT_cylinder_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cylinder Projection"; + ot->name= _("Cylinder Projection"); ot->idname= "UV_OT_cylinder_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1379,7 +1379,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) void UV_OT_cube_project(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cube Projection"; + ot->name= _("Cube Projection"); ot->idname= "UV_OT_cube_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1388,6 +1388,6 @@ void UV_OT_cube_project(wmOperatorType *ot) ot->poll= ED_operator_uvmap; /* properties */ - RNA_def_float(ot->srna, "cube_size", 1.0f, 0.0f, FLT_MAX, "Cube Size", "Size of the cube to project on.", 0.001f, 100.0f); + RNA_def_float(ot->srna, "cube_size", 1.0f, 0.0f, FLT_MAX, _("Cube Size"), _("Size of the cube to project on."), 0.001f, 100.0f); uv_map_clip_correct_properties(ot); } |