Cycles: svn merge -r41157:41182 ^/trunk/blender
[blender.git] / source / blender / editors / screen / area.c
index 304f167a61f8e8b709947f9a509d382c48f9a407..2db00ac83c1736326aae66c76e862d5b3fe44a4d 100644 (file)
@@ -1282,7 +1282,7 @@ static const char *editortype_pup(void)
                   "|Python Console %x18"
                   );
 
-       return UI_translate_do_iface(types);
+       return IFACE_(types);
 }
 
 static void spacefunc(struct bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
@@ -1304,7 +1304,7 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco)
        but= uiDefIconTextButC(block, ICONTEXTROW, 0, ICON_VIEW3D, 
                                                   editortype_pup(), xco, yco, UI_UNIT_X+10, UI_UNIT_Y, 
                                                   &(sa->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
-                                                  UI_translate_do_tooltip(N_("Displays current editor type. Click for menu of available types")));
+                                                  TIP_("Displays current editor type. Click for menu of available types"));
        uiButSetFunc(but, spacefunc, NULL, NULL);
        uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */