Commit: c019ae5ea3a8eb49010de76c14a359c4729bbcf0 Author: Sv. Lockal Date: Thu Apr 3 22:49:27 2014 +0400 https://developer.blender.org/rBc019ae5ea3a8eb49010de76c14a359c4729bbcf0
I18N: add missing lines Reviewed By: mont29 Differential Revision: https://developer.blender.org/D328 =================================================================== M source/blender/editors/interface/interface_handlers.c M source/blender/editors/interface/interface_regions.c M source/blender/editors/interface/interface_templates.c M source/blender/editors/space_buttons/buttons_context.c M source/blender/editors/space_image/image_buttons.c M source/blender/editors/space_logic/logic_window.c M source/blender/editors/space_node/drawnode.c =================================================================== diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 9f3eaf0..9568f90 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5598,7 +5598,9 @@ void ui_panel_menu(bContext *C, ARegion *ar, Panel *pa) pup = uiPupMenuBegin(C, IFACE_("Panel"), ICON_NONE); layout = uiPupMenuLayout(pup); if (UI_panel_category_is_visible(ar)) { - uiItemR(layout, &ptr, "use_pin", 0, "Pin" UI_SEP_CHAR_S "Shift+Left Mouse", ICON_NONE); + char tmpstr[80]; + BLI_snprintf(tmpstr, sizeof(tmpstr), "%s" UI_SEP_CHAR_S "%s", IFACE_("Pin"), IFACE_("Shift+Left Mouse")); + uiItemR(layout, &ptr, "use_pin", 0, tmpstr, ICON_NONE); } uiPupMenuEnd(C, pup); } diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index ec7fc59..37cfbbb 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1829,7 +1829,7 @@ static void circle_picker(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop) uiBut *bt; /* HS circle */ - bt = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, prop, -1, 0.0, 0.0, 0.0, 0, "Color"); + bt = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, prop, -1, 0.0, 0.0, 0.0, 0, TIP_("Color")); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); /* value */ @@ -1838,7 +1838,7 @@ static void circle_picker(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop) uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); } else { - bt = uiDefButR_prop(block, HSVCUBE, 0, "", PICKER_W + PICKER_SPACE, 0, PICKER_BAR, PICKER_H, ptr, prop, -1, 0.0, 0.0, UI_GRAD_V_ALT, 0, "Value"); + bt = uiDefButR_prop(block, HSVCUBE, 0, "", PICKER_W + PICKER_SPACE, 0, PICKER_BAR, PICKER_H, ptr, prop, -1, 0.0, 0.0, UI_GRAD_V_ALT, 0, TIP_("Value")); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); } } @@ -1850,11 +1850,11 @@ static void square_picker(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, in int bartype = type + 3; /* HS square */ - bt = uiDefButR_prop(block, HSVCUBE, 0, "", 0, PICKER_BAR + PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, prop, -1, 0.0, 0.0, type, 0, "Color"); + bt = uiDefButR_prop(block, HSVCUBE, 0, "", 0, PICKER_BAR + PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, prop, -1, 0.0, 0.0, type, 0, TIP_("Color")); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); /* value */ - bt = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, prop, -1, 0.0, 0.0, bartype, 0, "Value"); + bt = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, prop, -1, 0.0, 0.0, bartype, 0, TIP_("Value")); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0c39462..6284c1a 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2975,7 +2975,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co sub = uiLayoutRow(overlap, false); but = uiDefButR_prop(subblock, LISTROW, 0, "", 0, 0, UI_UNIT_X * 10, UI_UNIT_Y, - active_dataptr, activeprop, 0, 0, org_i, 0, 0, "Double click to rename"); + active_dataptr, activeprop, 0, 0, org_i, 0, 0, TIP_("Double click to rename")); sub = uiLayoutRow(overlap, false); diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index f1b3cb4..a14ed72 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -1008,7 +1008,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) block = uiLayoutGetBlock(row); uiBlockSetEmboss(block, UI_EMBOSSN); but = uiDefIconButBitC(block, ICONTOG, SB_PIN_CONTEXT, 0, ICON_UNPINNED, 0, 0, UI_UNIT_X, UI_UNIT_Y, &sbuts->flag, - 0, 0, 0, 0, IFACE_("Follow context or keep fixed datablock displayed")); + 0, 0, 0, 0, TIP_("Follow context or keep fixed datablock displayed")); uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */ uiButSetFunc(but, pin_cb, NULL, NULL); diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 97a8e9b..c7876bb 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -763,7 +763,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char if (has_alpha) { col = uiLayoutColumn(layout, false); uiItemR(col, &imaptr, "use_alpha", 0, NULL, ICON_NONE); - uiItemR(col, &imaptr, "alpha_mode", 0, "Alpha", ICON_NONE); + uiItemR(col, &imaptr, "alpha_mode", 0, IFACE_("Alpha"), ICON_NONE); } uiItemS(layout); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 746adb2..d1164c6 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -426,109 +426,109 @@ static const char *sensor_name(int type) { switch (type) { case SENS_ALWAYS: - return "Always"; + return N_("Always"); case SENS_NEAR: - return "Near"; + return N_("Near"); case SENS_KEYBOARD: - return "Keyboard"; + return N_("Keyboard"); case SENS_PROPERTY: - return "Property"; + return N_("Property"); case SENS_ARMATURE: - return "Armature"; + return N_("Armature"); case SENS_ACTUATOR: - return "Actuator"; + return N_("Actuator"); case SENS_DELAY: - return "Delay"; + return N_("Delay"); case SENS_MOUSE: - return "Mouse"; + return N_("Mouse"); case SENS_COLLISION: - return "Collision"; + return N_("Collision"); case SENS_RADAR: - return "Radar"; + return N_("Radar"); case SENS_RANDOM: - return "Random"; + return N_("Random"); case SENS_RAY: - return "Ray"; + return N_("Ray"); case SENS_MESSAGE: - return "Message"; + return N_("Message"); case SENS_JOYSTICK: - return "Joystick"; + return N_("Joystick"); } - return "unknown"; + return N_("unknown"); } static const char *controller_name(int type) { switch (type) { case CONT_LOGIC_AND: - return "And"; + return N_("And"); case CONT_LOGIC_OR: - return "Or"; + return N_("Or"); case CONT_LOGIC_NAND: - return "Nand"; + return N_("Nand"); case CONT_LOGIC_NOR: - return "Nor"; + return N_("Nor"); case CONT_LOGIC_XOR: - return "Xor"; + return N_("Xor"); case CONT_LOGIC_XNOR: - return "Xnor"; + return N_("Xnor"); case CONT_EXPRESSION: - return "Expression"; + return N_("Expression"); case CONT_PYTHON: - return "Python"; + return N_("Python"); } - return "unknown"; + return N_("unknown"); } static const char *actuator_name(int type) { switch (type) { case ACT_SHAPEACTION: - return "Shape Action"; + return N_("Shape Action"); case ACT_ACTION: - return "Action"; + return N_("Action"); case ACT_OBJECT: - return "Motion"; + return N_("Motion"); case ACT_IPO: - return "F-Curve"; + return N_("F-Curve"); case ACT_LAMP: - return "Lamp"; + return N_("Lamp"); case ACT_CAMERA: - return "Camera"; + return N_("Camera"); case ACT_MATERIAL: - return "Material"; + return N_("Material"); case ACT_SOUND: - return "Sound"; + return N_("Sound"); case ACT_PROPERTY: - return "Property"; + return N_("Property"); case ACT_EDIT_OBJECT: - return "Edit Object"; + return N_("Edit Object"); case ACT_CONSTRAINT: - return "Constraint"; + return N_("Constraint"); case ACT_SCENE: - return "Scene"; + return N_("Scene"); case ACT_GROUP: - return "Group"; + return N_("Group"); case ACT_RANDOM: - return "Random"; + return N_("Random"); case ACT_MESSAGE: - return "Message"; + return N_("Message"); case ACT_GAME: - return "Game"; + return N_("Game"); case ACT_VISIBILITY: - return "Visibility"; + return N_("Visibility"); case ACT_2DFILTER: - return "Filter 2D"; + return N_("Filter 2D"); case ACT_PARENT: - return "Parent"; + return N_("Parent"); case ACT_STATE: - return "State"; + return N_("State"); case ACT_ARMATURE: - return "Armature"; + return N_("Armature"); case ACT_STEERING: - return "Steering"; + return N_("Steering"); } - return "unknown"; + return N_("unknown"); } static void set_sca_ob(Object *ob) @@ -951,7 +951,7 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo uiItemR(row, ptr, "name", 0, "", ICON_NONE); } else { - uiItemL(row, sensor_name(sens->type), ICON_NONE); + uiItemL(row, IFACE_(sensor_name(sens->type)), ICON_NONE); uiItemL(row, sens->name, ICON_NONE); } @@ -1308,7 +1308,7 @@ static void draw_controller_header(uiLayout *layout, PointerRNA *ptr, int xco, i uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, IFACE_("Set controller state index (from 1 to 30)")); } else { - uiItemL(row, controller_name(cont->type), ICON_NONE); + uiItemL(row, IFACE_(controller_name(cont->type)), ICON_NONE); uiItemL(row, cont->name, ICON_NONE); uiItemL(row, state, ICON_NONE); } @@ -1397,7 +1397,7 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA * uiItemR(row, ptr, "name", 0, "", ICON_NONE); } else { - uiItemL(row, actuator_name(act->type), ICON_NONE); + uiItemL(row, IFACE_(actuator_name(act->type)), ICON_NONE); uiItemL(row, act->name, ICON_NONE); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index ae5737a..78dae08 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -2725,7 +2725,7 @@ static void node_template_properties_update(bNodeType *ntype) static void node_socket_undefined_draw(bContext *UNUSED(C), uiLayout *layout, Poi @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
