i18n: code cleanup and fixing unneeded translation (when partial translation is used...
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:10:38 +0000 (15:10 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:10:38 +0000 (15:10 +0000)
101 files changed:
intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp [changed mode: 0755->0644]
intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h [changed mode: 0755->0644]
intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp [changed mode: 0755->0644]
intern/audaspace/FX/AUD_DynamicIIRFilterReader.h [changed mode: 0755->0644]
intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp [changed mode: 0755->0644]
intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_AnimateableProperty.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_AnimateableProperty.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_FileWriter.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_FileWriter.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_I3DHandle.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_IHandle.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_IWriter.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_JOSResampleFactory.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_JOSResampleFactory.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_JOSResampleReader.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_JOSResampleReader.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_ReferenceHandler.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_ResampleReader.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_ResampleReader.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_SequencerEntry.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_SequencerEntry.h [changed mode: 0755->0644]
intern/audaspace/intern/AUD_SequencerHandle.cpp [changed mode: 0755->0644]
intern/audaspace/intern/AUD_SequencerHandle.h [changed mode: 0755->0644]
intern/audaspace/sndfile/AUD_SndFileWriter.cpp [changed mode: 0755->0644]
intern/audaspace/sndfile/AUD_SndFileWriter.h [changed mode: 0755->0644]
intern/ffmpeg/ffmpeg_compat.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_DisplayManagerNULL.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_DisplayManagerSDL.cpp [changed mode: 0755->0644]
intern/ghost/intern/GHOST_DisplayManagerSDL.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_SystemNULL.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_SystemSDL.cpp [changed mode: 0755->0644]
intern/ghost/intern/GHOST_SystemSDL.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_WindowNULL.h [changed mode: 0755->0644]
intern/ghost/intern/GHOST_WindowSDL.cpp [changed mode: 0755->0644]
intern/ghost/intern/GHOST_WindowSDL.h [changed mode: 0755->0644]
source/blender/blenkernel/BKE_speaker.h [changed mode: 0755->0644]
source/blender/blenkernel/intern/speaker.c
source/blender/blenlib/BLI_callbacks.h
source/blender/blenlib/intern/callbacks.c
source/blender/collada/AnimationExporter.h [changed mode: 0755->0644]
source/blender/editors/armature/poselib.c
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/gpencil/SConscript
source/blender/editors/include/ED_datafiles.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/screen/area.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_logic/SConscript
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_outliner/SConscript
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform_orientations.c
source/blender/imbuf/intern/IMB_indexer.h
source/blender/imbuf/intern/indexer.c
source/blender/imbuf/intern/indexer_dv.c
source/blender/makesdna/DNA_speaker_types.h [changed mode: 0755->0644]
source/blender/makesrna/intern/rna_speaker.c
source/blender/makesrna/intern/rna_texture_api.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/intern/bpy_app_handlers.h [changed mode: 0755->0644]
source/blender/python/intern/bpy_intern_string.c [changed mode: 0755->0644]
source/blender/python/intern/bpy_intern_string.h [changed mode: 0755->0644]
source/blender/python/mathutils/CMakeLists.txt [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Color.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Color.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Euler.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Euler.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Matrix.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Matrix.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Quaternion.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Quaternion.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Vector.c [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_Vector.h [changed mode: 0755->0644]
source/blender/python/mathutils/mathutils_geometry.c
source/blender/python/mathutils/mathutils_geometry.h [changed mode: 0755->0644]
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/creator/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/BL_Action.cpp [changed mode: 0755->0644]
source/gameengine/Ketsji/BL_Action.h [changed mode: 0755->0644]
source/gameengine/Ketsji/BL_ActionManager.cpp [changed mode: 0755->0644]
source/gameengine/Ketsji/BL_ActionManager.h [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index 40582da..3018a2d
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_DynamicIIRFilterFactory.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 2237306..56d56a9
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_DynamicIIRFilterFactory.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 9dd86f2..ed9b2d3
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_DynamicIIRFilterReader.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index e8ec8ad..4278972
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_DynamicIIRFilterReader.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index ceccee1..197671e
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGWriter.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index c9a75ef..92460ee
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FFMPEGWriter.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 71419d9..98d5b4c
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_AnimateableProperty.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index a35815b..dd6b585
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_AnimateableProperty.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index f0357ad..a5ef592
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FileWriter.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index b2f8837..341728f
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_FileWriter.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 3873c64..8ef08b1
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_I3DHandle.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 272e8c2..5b86951
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_IHandle.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 17f50b5..944bce9
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_IWriter.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index fa84628..a69b4ed
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_JOSResampleFactory.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index b92686f..90a5df5
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_JOSResampleFactory.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 359ed9c..82b784a
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_JOSResampleReader.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4ab6050..19620f2
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_JOSResampleReader.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4bcf484..59c6930
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_JOSResampleReaderCoeff.cpp 39809 2011-08-30 19:38:32Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 987ade7..de440de
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_ReferenceHandler.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index c120ed6..e74d21e
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_ResampleReader.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4cc556a..0792753
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_ResampleReader.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4b9e260..c5112f9
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SequencerEntry.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index f727f00..53e3513
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SequencerEntry.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index c10697d..87f5eb2
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SequencerHandle.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index c73a939..ab86bf4
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SequencerHandle.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 44ed40a..ba59cd3
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SndFileWriter.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4f8b7a3..110b7f8
@@ -1,5 +1,5 @@
 /*
- * $Id: AUD_SndFileWriter.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 9c46841..d817290
@@ -2,7 +2,7 @@
 #define __ffmpeg_compat_h_included__ 1
 
 /*
- * $Id: ffmpeg_compat.h 36982 2011-05-28 14:16:56Z schlaile $
+ * $Id$
  *
  * compatibility macros to make every ffmpeg installation appear
  * like the most current installation (wrapping some functionality sometimes)
old mode 100755 (executable)
new mode 100644 (file)
index e0bd224..ba4a36e
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_DisplayManagerNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 107725a..2e55957
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_DisplayManagerSDL.cpp 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index ba6060c..2a815b1
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_DisplayManagerSDL.h 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index de2cd97..3bc68b4
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_SystemNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 12669ed..f2cc457
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_SystemSDL.cpp 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 42907c0..87d2881
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_SystemSDL.h 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index d3e0c89..f979313
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_WindowNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 45ddd99..1675c1f
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_WindowSDL.cpp 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 4be8962..6b016b8
@@ -1,5 +1,5 @@
 /*
- * $Id: GHOST_WindowSDL.h 38349 2011-07-13 00:49:22Z gsrb3d $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index 747d8f3..111bd86
@@ -1,5 +1,5 @@
 /*
- * $Id: BKE_speaker.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 6395979dd6a4b8f97188d91a241102608ab39c9a..200dbd41899f07aff1c4c74dedc696aa672a3e55 100644 (file)
@@ -1,7 +1,7 @@
 /* speaker.c
  *
  * 
- * $Id: speaker.c 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 5c3180ba9c5e28ce7e042e523e67ca91b5f8a0c7..f20cef9c3ea0a8d3989fe0cd0886ba8373045062 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: BLI_callbacks.h 37799 2011-06-24 23:14:26Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 923c8dfa797ab2afc8f0d11e13332741c42096d6..d28f794440f30eacfb869df7b050c103ed21f217 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c 37799 2011-06-24 23:14:26Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index d8251d0..d277dad
@@ -1,5 +1,5 @@
 /*
- * $Id: AnimationExporter.h 39809 2011-08-30 19:38:32Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 00d945741464ab93766770304ed0bf307a572670..5acd63f836d9e4929d90616e3880ef9f465f4f43 100644 (file)
@@ -409,15 +409,15 @@ static int poselib_add_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED
        uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
        
        /* add new (adds to the first unoccupied frame) */
-       uiItemIntO(layout, _("Add New"), ICON_NONE, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib));
+       uiItemIntO(layout, UI_translate_do_iface(N_("Add New")), ICON_NONE, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib));
        
        /* check if we have any choices to add a new pose in any other way */
        if ((ob->poselib) && (ob->poselib->markers.first)) {
                /* add new (on current frame) */
-               uiItemIntO(layout, _("Add New (Current Frame)"), ICON_NONE, "POSELIB_OT_pose_add", "frame", CFRA);
+               uiItemIntO(layout, UI_translate_do_iface(N_("Add New (Current Frame)")), ICON_NONE, "POSELIB_OT_pose_add", "frame", CFRA);
                
                /* replace existing - submenu */
-               uiItemMenuF(layout, _("Replace Existing..."), 0, poselib_add_menu_invoke__replacemenu, NULL);
+               uiItemMenuF(layout, UI_translate_do_iface(N_("Replace Existing...")), 0, poselib_add_menu_invoke__replacemenu, NULL);
        }
        
        uiPupMenuEnd(C, pup);
index a31b3c3b2bde4fab4456e89c0cb2c065395d8049..17e3a868a8cc89da62b7e9d5a7a14551ec01b54f 100644 (file)
@@ -20,8 +20,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ../../blenlib
-       ../../../../intern/guardedalloc
+
 )
 
 set(INC_SYS
index db4e00dd907ba2258dd5bfd9f59b8c524b895617..b312f39793936dfbd0ca93a8595ecf614d41001e 100644 (file)
@@ -21,7 +21,6 @@
 
 set(INC
        ../include
-       ../../blenfont
        ../../blenkernel
        ../../blenlib
        ../../blenloader
index 7847744a6f171d16c83b4eab07aa64666ad06a24..d2fd9e5fe9d03769669e2119b14238a7d052446a 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../gpu ../../blenloader'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
index b6792635f30fe00201ab2dd3beb04262ac6a28fb..ee29df3fffb31456ea5e67d1a3ac179757f06e5b 100644 (file)
@@ -56,9 +56,6 @@ extern char datatoc_bfont_ttf[];
 extern int datatoc_bmonofont_ttf_size;
 extern char datatoc_bmonofont_ttf[];
 
-extern int datatoc_bunifont_ttf_size;
-extern char* get_datatoc_bunifont_ttf(void);
-
 /* Brush icon datafiles */
 /* TODO: this could be simplified by putting all
    the brush icons in one file */
index 48ec75d08531dfa4c546494e6287b31a422e3938..06b44e36b691ebc3f6190d64e919a2f1b1a54250 100644 (file)
@@ -803,5 +803,11 @@ uiStyle* UI_GetStyle(void);
 /* linker workaround ack! */
 void UI_template_fix_linking(void);
 
+/* translation */
+int UI_translate_iface(void);
+int UI_translate_tooltips(void);
+const char *UI_translate_do_iface(const char *msgid);
+const char *UI_translate_do_tooltip(const char *msgid);
+
 #endif /*  UI_INTERFACE_H */
 
index f076a63cb06d70ea05956b20202bc7eb418ef5ec..a49de18002ab43fe6fc62a36f441b8a5c168c628 100644 (file)
 
 static void ui_free_but(const bContext *C, uiBut *but);
 
+/* ************* translation ************** */
+
+int UI_translate_iface(void)
+{
+       return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE);
+}
+
+int UI_translate_tooltips(void)
+{
+       return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_TOOLTIPS);
+}
+
+const char *UI_translate_do_iface(const char *msgid)
+{
+#ifdef INTERNATIONAL
+       if(UI_translate_iface())
+               return BLF_gettext(msgid);
+       else
+               return msgid;
+#else
+       return msgid;
+#endif
+}
+
+const char *UI_translate_do_tooltip(const char *msgid)
+{
+#ifdef INTERNATIONAL
+       if(UI_translate_tooltips())
+               return BLF_gettext(msgid);
+       else
+               return msgid;
+#else
+       return msgid;
+#endif
+}
+
 /* ************* window matrix ************** */
 
 void ui_block_to_window_fl(const ARegion *ar, uiBlock *block, float *x, float *y)
@@ -2689,7 +2725,7 @@ static uiBut *ui_def_but_operator(uiBlock *block, int type, const char *opname,
                tip= ot->description;
 
 #ifdef INTERNATIONAL
-               if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS))
+               if(UI_translate_tooltips())
                        tip= BLF_gettext(tip);
 #endif
        }
index 161bb11dcef2a88ba772880fe6b8e2237c1ad188..9266d904657f3a717619c2e44fb0c6969c4cc90f 100644 (file)
@@ -640,8 +640,7 @@ PointerRNA uiItemFullO(uiLayout *layout, const char *opname, const char *name, i
                name= ot->name;
 
 #ifdef INTERNATIONAL
-               if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE))
-                       name= BLF_gettext(name);
+               name= UI_translate_do_iface(name);
 #endif
        }
 
@@ -1434,8 +1433,7 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const
                name= mt->label;
 
 #ifdef INTERNATIONAL
-               if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE))
-                       name= BLF_gettext(name);
+               name= UI_translate_do_iface(name);
 #endif
        }
 
index 8fc4904eed46eede7e9eb501f90fbc3a2822a443..d6ea5c926dbd7d492ad7084154b5693a2770bfbd 100644 (file)
@@ -447,8 +447,7 @@ static void ui_draw_aligned_panel_header(uiStyle *style, uiBlock *block, rcti *r
        const char *activename= panel->drawname[0]?panel->drawname:panel->panelname;
 
 #ifdef INTERNATIONAL
-       if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE))
-               activename= BLF_gettext(activename);
+       activename= UI_translate_do_iface(activename);
 #endif
 
        /* + 0.001f to avoid flirting with float inaccuracy */
index fec441f698a842fdeff184a4d811142ada123d01..fb63af5823f04fdfb6d5e76d0afb619222e00cc7 100644 (file)
@@ -343,7 +343,7 @@ static void ui_tooltip_region_free_cb(ARegion *ar)
        ar->regiondata= NULL;
 }
 
-#define U_(msgid) (((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS))?BLF_gettext(msgid):(msgid))
+#define TIP_(msgid) UI_translate_do_tooltip(msgid)
 ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 {
        uiStyle *style= UI_GetStyle();
@@ -404,7 +404,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                prop= (but->opptr)? but->opptr->data: NULL;
 
                if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, buf, sizeof(buf))) {
-                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Shortcut: %s")), buf);
+                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Shortcut: %s")), buf);
                        data->color[data->totline]= 0x888888;
                        data->totline++;
                }
@@ -414,7 +414,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                /* full string */
                ui_get_but_string(but, buf, sizeof(buf));
                if(buf[0]) {
-                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Value: %s")), buf);
+                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Value: %s")), buf);
                        data->color[data->totline]= 0x888888;
                        data->totline++;
                }
@@ -426,7 +426,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                if (unit_type == PROP_UNIT_ROTATION) {
                        if (RNA_property_type(but->rnaprop) == PROP_FLOAT) {
                                float value= RNA_property_array_check(but->rnaprop) ? RNA_property_float_get_index(&but->rnapoin, but->rnaprop, but->rnaindex) : RNA_property_float_get(&but->rnapoin, but->rnaprop);
-                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Radians: %f")), value);
+                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Radians: %f")), value);
                                data->color[data->totline]= 0x888888;
                                data->totline++;
                        }
@@ -435,7 +435,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                if(but->flag & UI_BUT_DRIVEN) {
                        if(ui_but_anim_expression_get(but, buf, sizeof(buf))) {
                                /* expression */
-                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Expression: %s")), buf);
+                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Expression: %s")), buf);
                                data->color[data->totline]= 0x888888;
                                data->totline++;
                        }
@@ -443,7 +443,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 
                /* rna info */
                if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
-                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Python: %s.%s")), RNA_struct_identifier(but->rnapoin.type), RNA_property_identifier(but->rnaprop));
+                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Python: %s.%s")), RNA_struct_identifier(but->rnapoin.type), RNA_property_identifier(but->rnaprop));
                        data->color[data->totline]= 0x888888;
                        data->totline++;
                }
@@ -451,7 +451,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                if(but->rnapoin.id.data) {
                        ID *id= but->rnapoin.id.data;
                        if(id->lib && id->lib->name) {
-                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Library: %s")), id->lib->name);
+                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Library: %s")), id->lib->name);
                                data->color[data->totline]= 0x888888;
                                data->totline++;
                        }
@@ -466,7 +466,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 
                /* operator info */
                if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
-                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Python: %s")), str);
+                       BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Python: %s")), str);
                        data->color[data->totline]= 0x888888;
                        data->totline++;
                }
@@ -480,7 +480,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                        WM_operator_poll_context(C, but->optype, but->opcontext);
                        poll_msg= CTX_wm_operator_poll_msg_get(C);
                        if(poll_msg) {
-                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Disabled: %s")), poll_msg);
+                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Disabled: %s")), poll_msg);
                                data->color[data->totline]= 0x6666ff; /* alert */
                                data->totline++;                        
                        }
@@ -490,7 +490,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
                        if(but->menu_create_func && WM_menutype_contains((MenuType *)but->poin)) {
                                MenuType *mt= (MenuType *)but->poin;
-                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), U_(N_("Python: %s")), mt->idname);
+                               BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_(N_("Python: %s")), mt->idname);
                                data->color[data->totline]= 0x888888;
                                data->totline++;
                        }
@@ -609,7 +609,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 
        return ar;
 }
-#undef U_
+#undef TIP_
 
 void ui_tooltip_free(bContext *C, ARegion *ar)
 {
index ec3173a42b2e643a8e2136c9aec36fc30b02bed9..13536c897795de19d80acaab59f8a2163a9e62af 100644 (file)
@@ -306,31 +306,31 @@ static const char *template_id_browse_tip(StructRNA *type)
 {
        if(type) {
                switch(RNA_type_to_ID_code(type)) {
-                       case ID_SCE: return _("Browse Scene to be linked");
-                       case ID_OB: return _("Browse Object to be linked");
-                       case ID_ME: return _("Browse Mesh Data to be linked");
-                       case ID_CU: return _("Browse Curve Data to be linked");
-                       case ID_MB: return _("Browse MetaBall Data to be linked");
-                       case ID_MA: return _("Browse Material to be linked");
-                       case ID_TE: return _("Browse Texture to be linked");
-                       case ID_IM: return _("Browse Image to be linked");
-                       case ID_LT: return _("Browse Lattice Data to be linked");
-                       case ID_LA: return _("Browse Lamp Data to be linked");
-                       case ID_CA: return _("Browse Camera Data to be linked");
-                       case ID_WO: return _("Browse World Settings to be linked");
-                       case ID_SCR: return _("Choose Screen lay-out");
-                       case ID_TXT: return _("Browse Text to be linked");
-                       case ID_SPK: return _("Browse Speaker Data to be linked");
-                       case ID_SO: return _("Browse Sound to be linked");
-                       case ID_AR: return _("Browse Armature data to be linked");
-                       case ID_AC: return _("Browse Action to be linked");
-                       case ID_NT: return _("Browse Node Tree to be linked");
-                       case ID_BR: return _("Browse Brush to be linked");
-                       case ID_PA: return _("Browse Particle System to be linked");
-                       case ID_GD: return _("Browse Grease Pencil Data to be linked");
+                       case ID_SCE: return N_("Browse Scene to be linked");
+                       case ID_OB: return N_("Browse Object to be linked");
+                       case ID_ME: return N_("Browse Mesh Data to be linked");
+                       case ID_CU: return N_("Browse Curve Data to be linked");
+                       case ID_MB: return N_("Browse MetaBall Data to be linked");
+                       case ID_MA: return N_("Browse Material to be linked");
+                       case ID_TE: return N_("Browse Texture to be linked");
+                       case ID_IM: return N_("Browse Image to be linked");
+                       case ID_LT: return N_("Browse Lattice Data to be linked");
+                       case ID_LA: return N_("Browse Lamp Data to be linked");
+                       case ID_CA: return N_("Browse Camera Data to be linked");
+                       case ID_WO: return N_("Browse World Settings to be linked");
+                       case ID_SCR: return N_("Choose Screen lay-out");
+                       case ID_TXT: return N_("Browse Text to be linked");
+                       case ID_SPK: return N_("Browse Speaker Data to be linked");
+                       case ID_SO: return N_("Browse Sound to be linked");
+                       case ID_AR: return N_("Browse Armature data to be linked");
+                       case ID_AC: return N_("Browse Action to be linked");
+                       case ID_NT: return N_("Browse Node Tree to be linked");
+                       case ID_BR: return N_("Browse Brush to be linked");
+                       case ID_PA: return N_("Browse Particle System to be linked");
+                       case ID_GD: return N_("Browse Grease Pencil Data to be linked");
                }
        }
-       return _("Browse ID data to be linked");
+       return N_("Browse ID data to be linked");
 }
 
 static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, StructRNA *type, int flag, const char *newop, const char *openop, const char *unlinkop)
@@ -355,7 +355,8 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
 
        if(flag & UI_ID_PREVIEWS) {
 
-               but= uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*6, UI_UNIT_Y*6, template_id_browse_tip(type));
+               but= uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*6, UI_UNIT_Y*6,
+                               UI_translate_do_tooltip(template_id_browse_tip(type)));
                if(type) {
                        but->icon= RNA_struct_ui_icon(type);
                        if (id) but->icon = ui_id_icon_get(C, id, 1);
@@ -367,7 +368,8 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                uiLayoutRow(layout, 1);
        }
        else if(flag & UI_ID_BROWSE) {
-               but= uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y, template_id_browse_tip(type));
+               but= uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y,
+                               UI_translate_do_tooltip(template_id_browse_tip(type)));
                if(type) {
                        but->icon= RNA_struct_ui_icon(type);
                        /* default dragging of icon for id browse buttons */
@@ -393,12 +395,12 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                if(id->lib) {
                        if(id->flag & LIB_INDIRECT) {
                                but= uiDefIconBut(block, BUT, 0, ICON_LIBRARY_DATA_INDIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, NULL, 0, 0, 0, 0,
-                                       _("Indirect library datablock, cannot change."));
+                                       UI_translate_do_tooltip(N_("Indirect library datablock, cannot change.")));
                                uiButSetFlag(but, UI_BUT_DISABLED);
                        }
                        else {
                                but= uiDefIconBut(block, BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, NULL, 0, 0, 0, 0,
-                                       _("Direct linked library datablock, click to make local."));
+                                       UI_translate_do_tooltip(N_("Direct linked library datablock, click to make local.")));
                                if(!id_make_local(id, 1 /* test */) || (idfrom && idfrom->lib))
                                        uiButSetFlag(but, UI_BUT_DISABLED);
                        }
@@ -411,7 +413,8 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
 
                        sprintf(str, "%d", id->us);
 
-                       but= uiDefBut(block, BUT, 0, str, 0,0,UI_UNIT_X + ((id->us < 10) ? 0:10), UI_UNIT_Y, NULL, 0, 0, 0, 0, _("Displays number of users of this data. Click to make a single-user copy."));
+                       but= uiDefBut(block, BUT, 0, str, 0,0,UI_UNIT_X + ((id->us < 10) ? 0:10), UI_UNIT_Y, NULL, 0, 0, 0, 0,
+                                               UI_translate_do_tooltip(_("Displays number of users of this data. Click to make a single-user copy.")));
 
                        uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ALONE));
                        if(!id_copy(id, NULL, 1 /* test only */) || (idfrom && idfrom->lib) || !editable)
@@ -429,7 +432,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                int w= id?UI_UNIT_X: (flag & UI_ID_OPEN)? UI_UNIT_X*3: UI_UNIT_X*6;
                
                if(newop) {
-                       but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, (id)? "": _("New"), 0, 0, w, UI_UNIT_Y, NULL);
+                       but= uiDefIconTextButO(block, BUT, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, (id)? "": UI_translate_do_iface(N_("New")), 0, 0, w, UI_UNIT_Y, NULL);
                        uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
                }
                else {
@@ -445,11 +448,11 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                int w= id?UI_UNIT_X: (flag & UI_ID_ADD_NEW)? UI_UNIT_X*3: UI_UNIT_X*6;
                
                if(openop) {
-                       but= uiDefIconTextButO(block, BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id)? "": _("Open"), 0, 0, w, UI_UNIT_Y, NULL);
+                       but= uiDefIconTextButO(block, BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id)? "": UI_translate_do_iface(N_("Open")), 0, 0, w, UI_UNIT_Y, NULL);
                        uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_OPEN));
                }
                else {
-                       but= uiDefIconTextBut(block, BUT, 0, ICON_FILESEL, (id)? "": _("Open"), 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+                       but= uiDefIconTextBut(block, BUT, 0, ICON_FILESEL, (id)? "": UI_translate_do_iface(N_("Open")), 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
                        uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_OPEN));
                }
 
@@ -465,7 +468,8 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                        uiButSetNFunc(but, NULL, MEM_dupallocN(template), NULL);
                }
                else {
-                       but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, _("Unlink datablock. Shift + Click to set users to zero, data will then not be saved"));
+                       but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
+                                       UI_translate_do_tooltip(N_("Unlink datablock. Shift + Click to set users to zero, data will then not be saved")));
                        uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_DELETE));
 
                        if(RNA_property_flag(template->prop) & PROP_NEVER_NULL)
@@ -722,7 +726,8 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                sprintf(str, "%s parent deform", md->name);
                uiDefBut(block, LABEL, 0, str, 0, 0, 185, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, "Modifier name"); 
                
-               but = uiDefBut(block, BUT, 0, _("Make Real"), 0, 0, 80, 16, NULL, 0.0, 0.0, 0.0, 0.0, _("Convert virtual modifier to a real modifier"));
+               but = uiDefBut(block, BUT, 0, UI_translate_do_iface(N_("Make Real")), 0, 0, 80, 16, NULL, 0.0, 0.0, 0.0, 0.0,
+                                       UI_translate_do_tooltip(N_("Convert virtual modifier to a real modifier")));
                uiButSetFunc(but, modifiers_convertToReal, ob, md);
        }
        else {
@@ -756,7 +761,8 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                if ((ob->type==OB_MESH) && modifier_couldBeCage(scene, md) && (index <= lastCageIndex)) 
                {
                        /* -- convert to rna ? */
-                       but = uiDefIconButBitI(block, TOG, eModifierMode_OnCage, 0, ICON_MESH_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0, _("Apply modifier to editing cage during Editmode"));
+                       but = uiDefIconButBitI(block, TOG, eModifierMode_OnCage, 0, ICON_MESH_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0,
+                                       UI_translate_do_tooltip(N_("Apply modifier to editing cage during Editmode")));
                        if (index < cageIndex)
                                uiButSetFlag(but, UI_BUT_DISABLED);
                        uiButSetFunc(but, modifiers_setOnCage, ob, md);
@@ -768,7 +774,8 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                        if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
                                /* add disabled pre-tesselated button, so users could have
                                   message for this modifiers */
-                               but = uiDefIconButBitI(block, TOG, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0, _("This modifier could be applied on splines' points only"));
+                               but = uiDefIconButBitI(block, TOG, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0, UI_UNIT_X-2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0,
+                                               UI_translate_do_tooltip(N_("This modifier could be applied on splines' points only")));
                                uiButSetFlag(but, UI_BUT_DISABLED);
                        } else if (mti->type != eModifierTypeType_Constructive) {
                                /* constructive modifiers tesselates curve before applying */
@@ -818,17 +825,17 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                        }
                        else {
                                uiLayoutSetOperatorContext(row, WM_OP_INVOKE_DEFAULT);
-                               uiItemEnumO(row, "OBJECT_OT_modifier_apply", _("Apply"), 0, "apply_as", MODIFIER_APPLY_DATA);
+                               uiItemEnumO(row, "OBJECT_OT_modifier_apply", UI_translate_do_iface(N_("Apply")), 0, "apply_as", MODIFIER_APPLY_DATA);
                                
                                if (modifier_sameTopology(md))
-                                       uiItemEnumO(row, "OBJECT_OT_modifier_apply", _("Apply as Shape"), 0, "apply_as", MODIFIER_APPLY_SHAPE);
+                                       uiItemEnumO(row, "OBJECT_OT_modifier_apply", UI_translate_do_iface(N_("Apply as Shape")), 0, "apply_as", MODIFIER_APPLY_SHAPE);
                        }
                        
                        uiBlockClearButLock(block);
                        uiBlockSetButLock(block, ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
                        
                        if (!ELEM5(md->type, eModifierType_Fluidsim, eModifierType_Softbody, eModifierType_ParticleSystem, eModifierType_Cloth, eModifierType_Smoke))
-                               uiItemO(row, _("Copy"), ICON_NONE, "OBJECT_OT_modifier_copy");
+                               uiItemO(row, UI_translate_do_tooltip(N_("Copy")), ICON_NONE, "OBJECT_OT_modifier_copy");
                }
                
                /* result is the layout block inside the box, that we return so that modifier settings can be drawn */
@@ -1005,8 +1012,8 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
                uiBlockSetEmboss(block, UI_EMBOSSN);
                
                /* draw a ghost icon (for proxy) and also a lock beside it, to show that constraint is "proxy locked" */
-               uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, ICON_GHOST, xco+244, yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, _("Proxy Protected"));
-               uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, ICON_LOCKED, xco+262, yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, _("Proxy Protected"));
+               uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, ICON_GHOST, xco+244, yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, UI_translate_do_tooltip(N_("Proxy Protected")));
+               uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, ICON_LOCKED, xco+262, yco, 19, 19, NULL, 0.0, 0.0, 0.0, 0.0, UI_translate_do_tooltip(N_("Proxy Protected")));
                
                uiBlockSetEmboss(block, UI_EMBOSS);
        }
@@ -1192,14 +1199,14 @@ void uiTemplatePreview(uiLayout *layout, ID *id, int show_buttons, ID *parent, M
                        RNA_pointer_create(id, &RNA_Texture, tex, &texture_ptr);
                        
                        uiLayoutRow(layout, 1);
-                       uiDefButS(block, ROW, B_MATPRV, _("Texture"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_TEXTURE, 0, 0, "");
+                       uiDefButS(block, ROW, B_MATPRV, UI_translate_do_iface(N_("Texture")),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_TEXTURE, 0, 0, "");
                        if(GS(parent->name) == ID_MA)
-                               uiDefButS(block, ROW, B_MATPRV, _("Material"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
+                               uiDefButS(block, ROW, B_MATPRV, UI_translate_do_iface(N_("Material")),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
                        else if(GS(parent->name) == ID_LA)
-                               uiDefButS(block, ROW, B_MATPRV, _("Lamp"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
+                               uiDefButS(block, ROW, B_MATPRV, UI_translate_do_iface(N_("Lamp")),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
                        else if(GS(parent->name) == ID_WO)
-                               uiDefButS(block, ROW, B_MATPRV, _("World"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
-                       uiDefButS(block, ROW, B_MATPRV, _("Both"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_BOTH, 0, 0, "");
+                               uiDefButS(block, ROW, B_MATPRV, UI_translate_do_iface(N_("World")),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
+                       uiDefButS(block, ROW, B_MATPRV, UI_translate_do_iface(N_("Both")),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_BOTH, 0, 0, "");
                        
                        /* Alpha buton for texture preview */
                        if(*pr_texture!=TEX_PR_OTHER) {
@@ -1290,21 +1297,23 @@ static void colorband_buttons_large(uiLayout *layout, uiBlock *block, ColorBand
 
        if(coba==NULL) return;
 
-       bt= uiDefBut(block, BUT, 0,     _("Add"),                       0+xoffs,line1_y,40,UI_UNIT_Y, NULL, 0, 0, 0, 0, _("Add a new color stop to the colorband"));
+       bt= uiDefBut(block, BUT, 0,     UI_translate_do_iface(N_("Add")), 0+xoffs,line1_y,40,UI_UNIT_Y, NULL, 0, 0, 0, 0,
+                       UI_translate_do_tooltip(N_("Add a new color stop to the colorband")));
        uiButSetNFunc(bt, colorband_add_cb, MEM_dupallocN(cb), coba);
 
-       bt= uiDefBut(block, BUT, 0,     _("Delete"),            45+xoffs,line1_y,45,UI_UNIT_Y, NULL, 0, 0, 0, 0, _("Delete the active position"));
+       bt= uiDefBut(block, BUT, 0,     UI_translate_do_iface(N_("Delete")), 45+xoffs,line1_y,45,UI_UNIT_Y, NULL, 0, 0, 0, 0,
+                       UI_translate_do_tooltip(N_("Delete the active position")));
        uiButSetNFunc(bt, colorband_del_cb, MEM_dupallocN(cb), coba);
 
 
        /* XXX, todo for later - convert to operator - campbell */
-       bt= uiDefBut(block, BUT, 0,     "F",            95+xoffs,line1_y,20,UI_UNIT_Y, NULL, 0, 0, 0, 0, _("Flip colorband"));
+       bt= uiDefBut(block, BUT, 0,     "F",            95+xoffs,line1_y,20,UI_UNIT_Y, NULL, 0, 0, 0, 0, UI_translate_do_tooltip(N_("Flip colorband")));
        uiButSetNFunc(bt, colorband_flip_cb, MEM_dupallocN(cb), coba);
 
-       uiDefButS(block, NUM, 0,                "",                             120+xoffs,line1_y,80, UI_UNIT_Y, &coba->cur, 0.0, (float)(MAX2(0, coba->tot-1)), 0, 0, "Choose active color stop");
+       uiDefButS(block, NUM, 0,                "",                             120+xoffs,line1_y,80, UI_UNIT_Y, &coba->cur, 0.0, (float)(MAX2(0, coba->tot-1)), 0, 0, UI_translate_do_tooltip(N_("Choose active color stop")));
 
-       bt= uiDefButS(block, MENU, 0,           _("Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4"),
-                       210+xoffs, line1_y, 90, UI_UNIT_Y,              &coba->ipotype, 0.0, 0.0, 0, 0, _("Set interpolation between color stops"));
+       bt= uiDefButS(block, MENU, 0,           UI_translate_do_iface(N_("Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4")),
+                       210+xoffs, line1_y, 90, UI_UNIT_Y,              &coba->ipotype, 0.0, 0.0, 0, 0, UI_translate_do_tooltip(N_("Set interpolation between color stops")));
        uiButSetNFunc(bt, rna_update_cb, MEM_dupallocN(cb), NULL);
        uiBlockEndAlign(block);
 
@@ -1333,11 +1342,13 @@ static void colorband_buttons_small(uiLayout *layout, uiBlock *block, ColorBand
        float xs= butr->xmin;
 
        uiBlockBeginAlign(block);
-       bt= uiDefBut(block, BUT, 0,     _("Add"),                       xs,butr->ymin+UI_UNIT_Y,2.0f*unit,UI_UNIT_Y,    NULL, 0, 0, 0, 0, _("Add a new color stop to the colorband"));
+       bt= uiDefBut(block, BUT, 0,     UI_translate_do_iface(N_("Add")), xs,butr->ymin+UI_UNIT_Y,2.0f*unit,UI_UNIT_Y,  NULL, 0, 0, 0, 0,
+                       UI_translate_do_tooltip(N_("Add a new color stop to the colorband")));
        uiButSetNFunc(bt, colorband_add_cb, MEM_dupallocN(cb), coba);
-       bt= uiDefBut(block, BUT, 0,     _("Delete"),            xs+2.0f*unit,butr->ymin+UI_UNIT_Y,1.5f*unit,UI_UNIT_Y,  NULL, 0, 0, 0, 0, _("Delete the active position"));
+       bt= uiDefBut(block, BUT, 0,     UI_translate_do_iface(N_("Delete")), xs+2.0f*unit,butr->ymin+UI_UNIT_Y,1.5f*unit,UI_UNIT_Y,     NULL, 0, 0, 0, 0,
+                    UI_translate_do_tooltip(N_("Delete the active position")));
        uiButSetNFunc(bt, colorband_del_cb, MEM_dupallocN(cb), coba);
-       bt= uiDefBut(block, BUT, 0,     "F",            xs+3.5f*unit,butr->ymin+UI_UNIT_Y,0.5f*unit,UI_UNIT_Y,  NULL, 0, 0, 0, 0, "Flip the color ramp");
+       bt= uiDefBut(block, BUT, 0,     "F",            xs+3.5f*unit,butr->ymin+UI_UNIT_Y,0.5f*unit,UI_UNIT_Y,  NULL, 0, 0, 0, 0, UI_translate_do_tooltip(N_("Flip the color ramp")));
        uiButSetNFunc(bt, colorband_flip_cb, MEM_dupallocN(cb), coba);
        uiBlockEndAlign(block);
 
@@ -1348,8 +1359,9 @@ static void colorband_buttons_small(uiLayout *layout, uiBlock *block, ColorBand
                uiItemR(layout, &ptr, "color", 0, "", ICON_NONE);
        }
 
-       bt= uiDefButS(block, MENU, 0,           "Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4",
-                       xs+10.0f*unit, butr->ymin+UI_UNIT_Y, unit*4, UI_UNIT_Y,         &coba->ipotype, 0.0, 0.0, 0, 0, "Set interpolation between color stops");
+       bt= uiDefButS(block, MENU, 0, UI_translate_do_tooltip(N_("Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4")),
+                       xs+10.0f*unit, butr->ymin+UI_UNIT_Y, unit*4, UI_UNIT_Y,         &coba->ipotype, 0.0, 0.0, 0, 0,
+                       UI_translate_do_tooltip(N_("Set interpolation between color stops")));
        uiButSetNFunc(bt, rna_update_cb, MEM_dupallocN(cb), NULL);
 
        bt= uiDefBut(block, BUT_COLORBAND, 0, "",               xs,butr->ymin,butr->xmax-butr->xmin,UI_UNIT_Y, coba, 0, 0, 0, 0, "");
@@ -1600,10 +1612,10 @@ static uiBlock *curvemap_clipping_func(bContext *C, struct ARegion *ar, void *cu
        uiButSetFunc(bt, curvemap_buttons_setclip, cumap, NULL);
 
        uiBlockBeginAlign(block);
-       uiDefButF(block, NUM, 0, _("Min X "),    0,4*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.xmin, -100.0, cumap->clipr.xmax, 10, 0, "");
-       uiDefButF(block, NUM, 0, _("Min Y "),    0,3*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.ymin, -100.0, cumap->clipr.ymax, 10, 0, "");
-       uiDefButF(block, NUM, 0, _("Max X "),    0,2*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.xmax, cumap->clipr.xmin, 100.0, 10, 0, "");
-       uiDefButF(block, NUM, 0, _("Max Y "),    0,UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.ymax, cumap->clipr.ymin, 100.0, 10, 0, "");
+       uiDefButF(block, NUM, 0, UI_translate_do_iface(N_("Min X ")),    0,4*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.xmin, -100.0, cumap->clipr.xmax, 10, 0, "");
+       uiDefButF(block, NUM, 0, UI_translate_do_iface(N_("Min Y ")),    0,3*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.ymin, -100.0, cumap->clipr.ymax, 10, 0, "");
+       uiDefButF(block, NUM, 0, UI_translate_do_iface(N_("Max X ")),    0,2*UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.xmax, cumap->clipr.xmin, 100.0, 10, 0, "");
+       uiDefButF(block, NUM, 0, UI_translate_do_iface(N_("Max Y ")),    0,UI_UNIT_Y,width,UI_UNIT_Y, &cumap->clipr.ymax, cumap->clipr.ymin, 100.0, 10, 0, "");
 
        uiBlockSetDirection(block, UI_RIGHT);
 
@@ -1652,12 +1664,12 @@ static uiBlock *curvemap_tools_func(bContext *C, struct ARegion *ar, void *cumap
        block= uiBeginBlock(C, ar, "curvemap_tools_func", UI_EMBOSS);
        uiBlockSetButmFunc(block, curvemap_tools_dofunc, cumap_v);
 
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Reset View"),                          0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 1, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Vector Handle"),                       0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 2, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Auto Handle"),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 3, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Extend Horizontal"),           0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 4, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Extend Extrapolated"), 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 5, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Reset Curve"),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Reset View")),                  0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 1, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Vector Handle")),               0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 2, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Auto Handle")),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 3, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Extend Horizontal")),   0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 4, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Extend Extrapolated")), 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 5, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Reset Curve")),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 
        uiBlockSetDirection(block, UI_RIGHT);
        uiTextBoundsBlock(block, 50);
@@ -1674,10 +1686,10 @@ static uiBlock *curvemap_brush_tools_func(bContext *C, struct ARegion *ar, void
        block= uiBeginBlock(C, ar, "curvemap_tools_func", UI_EMBOSS);
        uiBlockSetButmFunc(block, curvemap_tools_dofunc, cumap_v);
 
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Reset View"),                          0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 1, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Vector Handle"),                       0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 2, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Auto Handle"),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 3, "");
-       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, _("Reset Curve"),                 0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Reset View")),          0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 1, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Vector Handle")),       0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 2, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Auto Handle")),         0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 3, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, UI_translate_do_iface(N_("Reset Curve")),         0, yco-=UI_UNIT_Y, menuwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 
        uiBlockSetDirection(block, UI_RIGHT);
        uiTextBoundsBlock(block, 50);
@@ -1794,24 +1806,24 @@ static void curvemap_buttons_layout(uiLayout *layout, PointerRNA *ptr, char labe
 
        uiBlockSetEmboss(block, UI_EMBOSSN);
 
-       bt= uiDefIconBut(block, BUT, 0, ICON_ZOOMIN, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, _("Zoom in"));
+       bt= uiDefIconBut(block, BUT, 0, ICON_ZOOMIN, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, UI_translate_do_tooltip(N_("Zoom in")));
        uiButSetFunc(bt, curvemap_buttons_zoom_in, cumap, NULL);
 
-       bt= uiDefIconBut(block, BUT, 0, ICON_ZOOMOUT, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, _("Zoom out"));
+       bt= uiDefIconBut(block, BUT, 0, ICON_ZOOMOUT, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, UI_translate_do_tooltip(N_("Zoom out")));
        uiButSetFunc(bt, curvemap_buttons_zoom_out, cumap, NULL);
 
        if(brush)
-               bt= uiDefIconBlockBut(block, curvemap_brush_tools_func, cumap, 0, ICON_MODIFIER, 0, 0, dx, dx, _("Tools"));
+               bt= uiDefIconBlockBut(block, curvemap_brush_tools_func, cumap, 0, ICON_MODIFIER, 0, 0, dx, dx, UI_translate_do_tooltip(N_("Tools")));
        else
-               bt= uiDefIconBlockBut(block, curvemap_tools_func, cumap, 0, ICON_MODIFIER, 0, 0, dx, dx, _("Tools"));
+               bt= uiDefIconBlockBut(block, curvemap_tools_func, cumap, 0, ICON_MODIFIER, 0, 0, dx, dx, UI_translate_do_tooltip(N_("Tools")));
 
        uiButSetNFunc(bt, rna_update_cb, MEM_dupallocN(cb), NULL);
 
        if(cumap->flag & CUMA_DO_CLIP) icon= ICON_CLIPUV_HLT; else icon= ICON_CLIPUV_DEHLT;
-       bt= uiDefIconBlockBut(block, curvemap_clipping_func, cumap, 0, icon, 0, 0, dx, dx, _("Clipping Options"));
+       bt= uiDefIconBlockBut(block, curvemap_clipping_func, cumap, 0, icon, 0, 0, dx, dx, UI_translate_do_tooltip(N_("Clipping Options")));
        uiButSetNFunc(bt, rna_update_cb, MEM_dupallocN(cb), NULL);
 
-       bt= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, _("Delete points"));
+       bt= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0, dx, dx, NULL, 0.0, 0.0, 0.0, 0.0, UI_translate_do_tooltip(N_("Delete points")));
        uiButSetNFunc(bt, curvemap_buttons_delete, MEM_dupallocN(cb), cumap);
 
        uiBlockSetEmboss(block, UI_EMBOSS);
@@ -1830,7 +1842,8 @@ static void curvemap_buttons_layout(uiLayout *layout, PointerRNA *ptr, char labe
                uiItemR(uiLayoutColumn(split, 0), ptr, "white_level", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
                uiLayoutRow(layout, 0);
-               bt=uiDefBut(block, BUT, 0, "Reset",     0, 0, UI_UNIT_X*10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, _("Reset Black/White point and curves"));
+               bt=uiDefBut(block, BUT, 0, UI_translate_do_iface(N_("Reset")),  0, 0, UI_UNIT_X*10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0,
+                               UI_translate_do_tooltip(N_("Reset Black/White point and curves")));
                uiButSetNFunc(bt, curvemap_buttons_reset, MEM_dupallocN(cb), cumap);
        }
 
@@ -2437,16 +2450,18 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
                (void)ui_abs; // UNUSED
                
                uiDefIconBut(block, BUT, handle_event, ICON_PANEL_CLOSE, 
-                               0, UI_UNIT_Y*0.1, UI_UNIT_X*0.8, UI_UNIT_Y*0.8, NULL, 0.0f, 0.0f, 0, 0, _("Stop this job"));
+                               0, UI_UNIT_Y*0.1, UI_UNIT_X*0.8, UI_UNIT_Y*0.8, NULL, 0.0f, 0.0f, 0, 0, UI_translate_do_tooltip(N_("Stop this job")));
                uiDefBut(block, PROGRESSBAR, 0, WM_jobs_name(wm, owner), 
-                               UI_UNIT_X, 0, 100, UI_UNIT_Y, NULL, 0.0f, 0.0f, WM_jobs_progress(wm, owner), 0, _("Progress"));
+                               UI_UNIT_X, 0, 100, UI_UNIT_Y, NULL, 0.0f, 0.0f, WM_jobs_progress(wm, owner), 0, UI_translate_do_tooltip(N_("Progress")));
                
                uiLayoutRow(layout, 0);
        }
        if(WM_jobs_test(wm, screen))
-               uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, _("Capture"), 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, _("Stop screencast"));
+               uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, UI_translate_do_iface(N_("Capture")), 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0,
+                               UI_translate_do_tooltip(N_("Stop screencast")));
        if(screen->animtimer)
-               uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_CANCEL, _("Anim Player"), 0,0,100,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, _("Stop animation playback"));
+               uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_CANCEL, UI_translate_do_tooltip(N_("Anim Player")), 0,0,100,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0,
+                               UI_translate_do_tooltip(N_("Stop animation playback")));
 }
 
 /************************* Reports for Last Operator Template **************************/
@@ -2508,7 +2523,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
        uiBlockSetEmboss(block, UI_EMBOSSN);
 
        if (reports->list.first != reports->list.last)
-               uiDefIconButO(block, BUT, "UI_OT_reports_to_textblock", WM_OP_INVOKE_REGION_WIN, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, _("Click to see rest of reports in textblock: 'Recent Reports'"));
+               uiDefIconButO(block, BUT, "UI_OT_reports_to_textblock", WM_OP_INVOKE_REGION_WIN, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, UI_translate_do_tooltip(N_("Click to see rest of reports in textblock: 'Recent Reports'")));
        else
                uiDefIconBut(block, LABEL, 0, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");
 
index 26f2c50fffdcc37b34af4ce170df170cffe7c57c..54aef0729a80bb8de61dc77f7ecb2163973ba910 100644 (file)
@@ -116,7 +116,7 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
                }
                case PROP_COLLECTION: {
                        char text[256];
-                       sprintf(text, _("%d items"), RNA_property_collection_length(ptr, prop));
+                       sprintf(text, UI_translate_do_iface(N_("%d items")), RNA_property_collection_length(ptr, prop));
                        but= uiDefBut(block, LABEL, 0, text, x1, y1, x2, y2, NULL, 0, 0, 0, 0, NULL);
                        uiButSetFlag(but, UI_BUT_DISABLED);
                        break;
index bfd299f955124878af06c33bb354b2dbabe476b0..c7e7cc35c8e7e804baf93bb8387d2c6a8ca2e32e 100644 (file)
@@ -1349,7 +1349,43 @@ void ED_area_prevspace(bContext *C, ScrArea *sa)
 
 static const char *editortype_pup(void)
 {
-       return _("Editor type:%t|3D View %x1|%l|Timeline %x15|Graph Editor %x2|DopeSheet %x12|NLA Editor %x13|%l|UV/Image Editor %x6|Video Sequence Editor %x8|Text Editor %x9|Node Editor %x16|Logic Editor %x17|%l|Properties %x4|Outliner %x3|User Preferences %x19|Info%x7|%l|File Browser %x5|%l|Python Console %x18");
+       const char *types= N_(
+                  "Editor type:%t"
+                  "|3D View %x1"
+
+                  "|%l"
+                  
+                  "|Timeline %x15"
+                  "|Graph Editor %x2"
+                  "|DopeSheet %x12"
+                  "|NLA Editor %x13"
+                  
+                  "|%l"
+                  
+                  "|UV/Image Editor %x6"
+                  
+                  "|Video Sequence Editor %x8"
+                  "|Text Editor %x9" 
+                  "|Node Editor %x16"
+                  "|Logic Editor %x17"
+                  
+                  "|%l"
+                  
+                  "|Properties %x4"
+                  "|Outliner %x3"
+                  "|User Preferences %x19"
+                  "|Info%x7"
+                                  
+                  "|%l"
+                  
+                  "|File Browser %x5"
+                  
+                  "|%l"
+                  
+                  "|Python Console %x18"
+                  );
+
+       return UI_translate_do_iface(types);
 }
 
 static void spacefunc(struct bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
@@ -1371,7 +1407,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, 
-                                                  _("Displays current editor type. Click for menu of available types"));
+                                                  UI_translate_do_tooltip(N_("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 */
        
index 4c137c6d88640d3e4a72ec5ba45161cf09a8d63d..0f4467975d1bf0a12a66d91a3c41b3bffc1d1d69 100644 (file)
@@ -125,8 +125,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
 
 #define BUTTON_HEADER_CTX(_ctx, _icon, _tip) \
        if(sbuts->pathflag & (1<<_ctx)) { \
-               but= uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, \
-                       ((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS)) ? BLF_gettext(_tip) : _tip); \
+               but= uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, UI_translate_do_tooltip(_tip)); \
                uiButClearFlag(but, UI_BUT_UNDO); \
        } \
 
index a09f59fb27c6daa8efe1cefc4d40f741912f75cb..b6ad4165b77f875dd4842076e35705ed515bb822 100644 (file)
@@ -181,7 +181,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
                but = uiDefButTextO(block, TEX, "FILE_OT_directory", 0, "",
                                 min_x, line1_y, line1_w-chan_offs, btn_h, 
                                 params->dir, 0.0, (float)FILE_MAX-1, 0, 0, 
-                                _("File path."));
+                                UI_translate_do_tooltip(N_("File path.")));
                uiButSetCompleteFunc(but, autocomplete_directory, NULL);
                uiButSetFlag(but, UI_BUT_NO_UTF8);
 
@@ -189,7 +189,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
                        but = uiDefBut(block, TEX, B_FS_FILENAME, "",
                                         min_x, line2_y, line2_w-chan_offs, btn_h,
                                         params->file, 0.0, (float)FILE_MAXFILE-1, 0, 0,
-                                        overwrite_alert ?_("File name, overwrite existing.") : _("File name."));
+                                        UI_translate_do_tooltip(overwrite_alert ?N_("File name, overwrite existing.") : N_("File name.")));
                        uiButSetCompleteFunc(but, autocomplete_file, NULL);
                        uiButSetFlag(but, UI_BUT_NO_UTF8);
 
@@ -209,13 +209,13 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
                but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT,
                                min_x + line2_w + separator - chan_offs, line2_y, 
                                btn_fn_w, btn_h, 
-                               _("Decrement the filename number"));    
+                               UI_translate_do_tooltip(N_("Decrement the filename number")));    
                RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1); 
        
                but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN, 
                                min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y, 
                                btn_fn_w, btn_h, 
-                               _("Increment the filename number"));    
+                               UI_translate_do_tooltip(N_("Increment the filename number")));    
                RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1); 
                uiBlockEndAlign(block);
        }
@@ -226,9 +226,9 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
                uiDefButO(block, BUT, "FILE_OT_execute", WM_OP_EXEC_REGION_WIN, params->title,
                        max_x - loadbutton, line1_y, loadbutton, btn_h, 
                        params->title);
-               uiDefButO(block, BUT, "FILE_OT_cancel", WM_OP_EXEC_REGION_WIN, _("Cancel"),
+               uiDefButO(block, BUT, "FILE_OT_cancel", WM_OP_EXEC_REGION_WIN, UI_translate_do_iface(N_("Cancel")),
                        max_x - loadbutton, line2_y, loadbutton, btn_h, 
-                       _("Cancel"));
+                       UI_translate_do_tooltip(N_("Cancel")));
        }
        
        uiEndBlock(C, block);
index 09b90ac4d08727de2ed7aa25855146618c2f04c3..0741152f0ab023ad6e571b0cdeb29ba047e2003c 100644 (file)
@@ -146,7 +146,7 @@ static void file_panel_bookmarks(const bContext *C, Panel *pa)
 
        if(sfile) {
                row= uiLayoutRow(pa->layout, 0);
-               uiItemO(row, _("Add"), ICON_ZOOMIN, "file.bookmark_add");
+               uiItemO(row, UI_translate_do_iface(N_("Add")), ICON_ZOOMIN, "file.bookmark_add");
                uiItemL(row, NULL, ICON_NONE);
 
                file_panel_category(C, pa, FS_CATEGORY_BOOKMARKS, &sfile->bookmarknr, ICON_BOOKMARKS, 1, 0);
index c7459e8c6b43ebc794001ad76e48c16c3d1bd512..3ce5371d4a86e40a655e4abd2dab2607dd06c3a7 100644 (file)
@@ -752,7 +752,8 @@ static void graph_panel_modifiers(const bContext *C, Panel *pa)
                block= uiLayoutGetBlock(row);
                
                // XXX for now, this will be a operator button which calls a 'add modifier' operator
-               uiDefButO(block, BUT, "GRAPH_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Curve Modifier for the active F-Curve"));
+               uiDefButO(block, BUT, "GRAPH_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, UI_translate_do_iface(N_("Add Modifier")), 10, 0, 150, 20,
+                               UI_translate_do_tooltip(N_("Adds a new F-Curve Modifier for the active F-Curve")));
                
                /* copy/paste (as sub-row)*/
                row= uiLayoutRow(row, 1);
index 1e8a90d0904a616967a0e73b665781219bf0910e..404d7d241f1f8193e8f3d54187cdce6a92d77774 100644 (file)
@@ -280,7 +280,7 @@ static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
                        uiItemStringO(layout, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
                }
        } else {
-               uiItemL(layout, _("No Recent Files"), ICON_NONE);
+               uiItemL(layout, UI_translate_do_iface(N_("No Recent Files")), ICON_NONE);
        }
 }
 
index fb2504ab97423741b30ba0a344695dc3c872767e..6beb3ecb48fc7d317cce61e9f0ccaef6f46ce80b 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna ../interface ../../blenloader'
 
index d10e47962f924c530f0c1ce07449ebe315320f50..55eff4defe39352e1f4979acb2f9777be197b1e5 100644 (file)
@@ -448,7 +448,8 @@ static void nla_panel_modifiers(const bContext *C, Panel *pa)
                
                // XXX for now, this will be a operator button which calls a temporary 'add modifier' operator
                // FIXME: we need to set the only-active property so that this will only add modifiers for the active strip (not all selected)
-               uiDefButO(block, BUT, "NLA_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Modifier for the active NLA Strip"));
+               uiDefButO(block, BUT, "NLA_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, UI_translate_do_iface(N_("Add Modifier")), 10, 0, 150, 20,
+                               UI_translate_do_tooltip(N_("Adds a new F-Modifier for the active NLA Strip")));
                
                /* copy/paste (as sub-row)*/
                row= uiLayoutRow(row, 1);
index 6eccaa2e274f0db57a23bd67930ccb594b98bbc0..f4713ecaf13549e0b172120870d06c8520393211 100644 (file)
@@ -218,6 +218,7 @@ static void node_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclass)
        }
 }
 
+#define IFACE_(msgid) UI_translate_do_iface(msgid)
 static void node_menu_add(const bContext *C, Menu *menu)
 {
        SpaceNode *snode= CTX_wm_space_node(C);
@@ -227,39 +228,40 @@ static void node_menu_add(const bContext *C, Menu *menu)
                uiLayoutSetActive(layout, 0);
 
        if(snode->treetype==NTREE_SHADER) {
-               uiItemMenuF(layout, _("Input"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
-               uiItemMenuF(layout, _("Output"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
-               uiItemMenuF(layout, _("Color"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
-               uiItemMenuF(layout, _("Vector"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
-               uiItemMenuF(layout, _("Convertor"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
-               uiItemMenuF(layout, _("Group"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
-               uiItemMenuF(layout, _("Dynamic"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_DYNAMIC));
-               uiItemMenuF(layout, _("Layout"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
+               uiItemMenuF(layout, IFACE_(N_("Input")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+               uiItemMenuF(layout, IFACE_(N_("Output")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+               uiItemMenuF(layout, IFACE_(N_("Color")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+               uiItemMenuF(layout, IFACE_(N_("Vector")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
+               uiItemMenuF(layout, IFACE_(N_("Convertor")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+               uiItemMenuF(layout, IFACE_(N_("Group")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+               uiItemMenuF(layout, IFACE_(N_("Dynamic")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_DYNAMIC));
+               uiItemMenuF(layout, IFACE_(N_("Layout")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
        }
        else if(snode->treetype==NTREE_COMPOSIT) {
-               uiItemMenuF(layout, _("Input"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
-               uiItemMenuF(layout, _("Output"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
-               uiItemMenuF(layout, _("Color"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
-               uiItemMenuF(layout, _("Vector"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
-               uiItemMenuF(layout, _("Filter"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_FILTER));
-               uiItemMenuF(layout, _("Convertor"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
-               uiItemMenuF(layout, _("Matte"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_MATTE));
-               uiItemMenuF(layout, _("Distort"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
-               uiItemMenuF(layout, _("Group"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
-               uiItemMenuF(layout, _("Layout"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
+               uiItemMenuF(layout, IFACE_(N_("Input")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+               uiItemMenuF(layout, IFACE_(N_("Output")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+               uiItemMenuF(layout, IFACE_(N_("Color")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+               uiItemMenuF(layout, IFACE_(N_("Vector")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_VECTOR));
+               uiItemMenuF(layout, IFACE_(N_("Filter")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_FILTER));
+               uiItemMenuF(layout, IFACE_(N_("Convertor")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+               uiItemMenuF(layout, IFACE_(N_("Matte")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_MATTE));
+               uiItemMenuF(layout, IFACE_(N_("Distort")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
+               uiItemMenuF(layout, IFACE_(N_("Group")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+               uiItemMenuF(layout, IFACE_(N_("Layout")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
        }
        else if(snode->treetype==NTREE_TEXTURE) {
-               uiItemMenuF(layout, _("Input"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
-               uiItemMenuF(layout, _("Output"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
-               uiItemMenuF(layout, _("Color"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
-               uiItemMenuF(layout, _("Patterns"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_PATTERN));
-               uiItemMenuF(layout, _("Textures"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_TEXTURE));
-               uiItemMenuF(layout, _("Convertor"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
-               uiItemMenuF(layout, _("Distort"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
-               uiItemMenuF(layout, _("Group"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
-               uiItemMenuF(layout, _("Layout"), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
+               uiItemMenuF(layout, IFACE_(N_("Input")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_INPUT));
+               uiItemMenuF(layout, IFACE_(N_("Output")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OUTPUT));
+               uiItemMenuF(layout, IFACE_(N_("Color")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_OP_COLOR));
+               uiItemMenuF(layout, IFACE_(N_("Patterns")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_PATTERN));
+               uiItemMenuF(layout, IFACE_(N_("Textures")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_TEXTURE));
+               uiItemMenuF(layout, IFACE_(N_("Convertor")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_CONVERTOR));
+               uiItemMenuF(layout, IFACE_(N_("Distort")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_DISTORT));
+               uiItemMenuF(layout, IFACE_(N_("Group")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_GROUP));
+               uiItemMenuF(layout, IFACE_(N_("Layout")), 0, node_add_menu, SET_INT_IN_POINTER(NODE_CLASS_LAYOUT));
        }
 }
+#undef IFACE_
 
 void node_menus_register(void)
 {
index f451050588b09cd889430f6d6f8af9f0c853fc45..ab0b8582d337f25f508e3809c54f291877de02c4 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include  ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna ../../blenloader'
 incs += ' #/extern/glew/include'
 
index 221bf8ed87a0564a2a7de4c4229cb07e2a81f447..6dd4103dc6da37e60db8c58dc6980848f20c917b 100644 (file)
@@ -275,7 +275,7 @@ static int modeselect_addmode(char *str, const char *title, int id, int icon)
 {
        static char formatstr[] = "|%s %%x%d %%i%d";
 
-       if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE))
+       if(UI_translate_iface())
                return sprintf(str, formatstr, BLF_gettext(title), id, icon);
        else
                return sprintf(str, formatstr, title, id, icon);
index d25e3307219e2a026bf2540c39a23e6945bc638b..3daede5f785b5739e625c56ca647e43a6c843e75 100644 (file)
@@ -62,6 +62,8 @@
 
 #include "RNA_define.h"
 
+#include "UI_interface.h"
+
 #include "transform.h"
 
 /* *********************** TransSpace ************************** */
@@ -419,7 +421,7 @@ const char * BIF_menustringTransformOrientation(const bContext *C, const char *t
                menu= BLF_gettext(menu);
        }
        
-       str_menu = MEM_callocN(strlen(menu) + strlen(title) + 1 + 40 * BIF_countTransformOrientation(C), _("UserTransSpace from matrix"));
+       str_menu = MEM_callocN(strlen(menu) + strlen(title) + 1 + 40 * BIF_countTransformOrientation(C), UI_translate_do_tooltip(N_("UserTransSpace from matrix")));
        p = str_menu;
        
        p += sprintf(str_menu, "%s", title);
index 51ee7e28d0bbc421a339ad9a84f955c55d5157b2..bd5a455df986b98b252c8e2ba03e829cccbecace 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * $Id: IMB_indexer.h 39759 2011-08-28 21:48:52Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 199ba0eff14b52cba82d8d0afbcba5af43f87b9e..2e45c0eb07abb6d9d1ebaa483f915dee8d494f00 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: indexer.c 39764 2011-08-29 01:00:14Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 62acc08c372b82e1d34098f98c0863d4edd1fe31..d1202136d56ccb61cda77664fb1d57905e7d653b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: indexer_dv.c 39833 2011-09-01 01:48:50Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index e1a0d95..fecc658
@@ -1,5 +1,5 @@
 /*
- * $Id: DNA_speaker_types.h 39792 2011-08-30 09:15:55Z nexyon 
+ * $Id$ 
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index dbd567b9316f4415f3e806258042fc7ea95a72b9..60208de5aa597810236a5583fbf138dd0011b641 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: rna_speaker.c 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 0ebb28dbf4a0d434dca4f614a74bb075519a182c..4941c75c4003b6194090e2ac9f27c1c9a50ce0b5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: rna_texture_api.c 39762 2011-08-28 23:44:43Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index 5dcaf9e54237f29f9f7815324694ac00d045b5c0..b909a0d5f5579614dce193da2387babc7de975e5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: bpy_app_handlers.c 37799 2011-06-24 23:14:26Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 8c1faa1..bfa4134
@@ -1,5 +1,5 @@
 /*
- * $Id: bpy_app_handlers.h 37799 2011-06-24 23:14:26Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 7a61637..7c80653
@@ -1,5 +1,5 @@
 /*
- * $Id: bpy_intern_string.c 37626 2011-06-18 23:22:55Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 2a4be2b..af6a9b7
@@ -1,5 +1,5 @@
 /*
- * $Id: bpy_intern_string.h 37626 2011-06-18 23:22:55Z gsrb3d $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 4a0fa50..50b75b0
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils.c 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 300c054..b798b5e
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils.h 38674 2011-07-25 01:44:19Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 37730ba..d0c7ec7
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Color.c 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 0afb0ee..0fc8803
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Color.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index afff927..5c609d8
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Euler.c 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 2df3d61..849e16c
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils_Euler.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 1a1a9f8..3953171
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Matrix.c 38674 2011-07-25 01:44:19Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 84a92ba..aa736d1
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils_Matrix.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index d43cae9..2be258a
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Quaternion.c 38674 2011-07-25 01:44:19Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 4ba7089..d606621
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils_Quaternion.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index d0c1d6a..56c1334
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Vector.c 38674 2011-07-25 01:44:19Z campbellbarton $
+ * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
old mode 100755 (executable)
new mode 100644 (file)
index e430a10..0ede836
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_Vector.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index c39e1a3025eb4aa28e43551513563725b7ac9b7c..0394d732ae32e97bd0b67c3f5f3b4f62611ad18c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: mathutils_geometry.c 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 0b07fc1..c963a63
@@ -1,5 +1,5 @@
 /* 
- * $Id: mathutils_geometry.h 38409 2011-07-15 04:01:47Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
index a0be707f840fdb2c64948ffd50e57a68d3cadd46..0fef66d48c7246938755a1afb958be20600f8ab8 100644 (file)
@@ -431,16 +431,17 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports)
        else if(retval == BKE_READ_EXOTIC_OK_OTHER)
                BKE_write_undo(C, "Import file");
        else if(retval == BKE_READ_EXOTIC_FAIL_OPEN) {
-               BKE_reportf(reports, RPT_ERROR, _("Can't read file: \"%s\", %s."), filepath, errno ? strerror(errno) : _("Unable to open the file"));
+               BKE_reportf(reports, RPT_ERROR, UI_translate_do_iface(N_("Can't read file: \"%s\", %s.")), filepath,
+                               errno ? strerror(errno) : UI_translate_do_iface(N_("Unable to open the file")));
        }
        else if(retval == BKE_READ_EXOTIC_FAIL_FORMAT) {
-               BKE_reportf(reports, RPT_ERROR, _("File format is not supported in file: \"%s\"."), filepath);
+               BKE_reportf(reports, RPT_ERROR, UI_translate_do_iface(N_("File format is not supported in file: \"%s\".")), filepath);
        }
        else if(retval == BKE_READ_EXOTIC_FAIL_PATH) {
-               BKE_reportf(reports, RPT_ERROR, _("File path invalid: \"%s\"."), filepath);
+               BKE_reportf(reports, RPT_ERROR, UI_translate_do_iface(N_("File path invalid: \"%s\".")), filepath);
        }
        else {
-               BKE_reportf(reports, RPT_ERROR, _("Unknown error loading: \"%s\"."), filepath);
+               BKE_reportf(reports, RPT_ERROR, UI_translate_do_iface(N_("Unknown error loading: \"%s\".")), filepath);
                BLI_assert(!"invalid 'retval'");
        }
 
index 83086201730d560a477d36dffcd46be9e93fc954..32f7e404a0a06d03e8e57797215fe2c918938edf 100644 (file)
@@ -79,7 +79,6 @@
 #include "GHOST_C-api.h"
 
 #include "RNA_define.h"
-#include "RNA_access.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -127,7 +126,6 @@ void WM_init(bContext *C, int argc, const char **argv)
                wm_init_cursor_data();
        }
        GHOST_CreateSystemPaths();
-
        wm_operatortype_init();
        WM_menutype_init();
 
@@ -139,7 +137,7 @@ void WM_init(bContext *C, int argc, const char **argv)
        
        ED_file_init();                 /* for fsmenu */
        ED_init_node_butfuncs();        
-
+       
        BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
        BLF_lang_init();
        /* get the default database, plus a wm */
@@ -382,6 +380,7 @@ void WM_exit(bContext *C)
        BIF_freeTemplates(C);
        
        free_ttfont(); /* bke_font.h */
+
        free_openrecent();
        
        BKE_freecubetable();
index 921ef006de296bd444cadcbf34b94416243be63e..ff4aeef9339cc9ca3968be1892d766818b0dae9d 100644 (file)
@@ -152,10 +152,10 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType*))
 
        if(ot->name==NULL) {
                fprintf(stderr, "ERROR: Operator %s has no name property!\n", ot->idname);
-               ot->name= _("Dummy Name");
+               ot->name= UI_translate_do_iface(N_("Dummy Name"));
        }
 
-       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:_("(undocumented operator)")); // XXX All ops should have a description but for now allow them not to.
+       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:UI_translate_do_iface(N_("(undocumented operator)"))); // XXX All ops should have a description but for now allow them not to.
        RNA_def_struct_identifier(ot->srna, ot->idname);
 
        BLI_ghash_insert(global_ops_hash, (void *)ot->idname, ot);
@@ -168,7 +168,7 @@ void WM_operatortype_append_ptr(void (*opfunc)(wmOperatorType*, void*), void *us
        ot= MEM_callocN(sizeof(wmOperatorType), "operatortype");
        ot->srna= RNA_def_struct(&BLENDER_RNA, "", "OperatorProperties");
        opfunc(ot, userdata);
-       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:_("(undocumented operator)"));
+       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:UI_translate_do_iface(N_("(undocumented operator)")));
        RNA_def_struct_identifier(ot->srna, ot->idname);
 
        BLI_ghash_insert(global_ops_hash, (void *)ot->idname, ot);
@@ -362,7 +362,7 @@ wmOperatorType *WM_operatortype_append_macro(const char *idname, const char *nam
        ot->poll= NULL;
 
        if(!ot->description)
-               ot->description= _("(undocumented operator)");
+               ot->description= UI_translate_do_iface(N_("(undocumented operator)"));
        
        RNA_def_struct_ui_text(ot->srna, ot->name, ot->description); // XXX All ops should have a description but for now allow them not to.
        RNA_def_struct_identifier(ot->srna, ot->idname);
@@ -387,7 +387,7 @@ void WM_operatortype_append_macro_ptr(void (*opfunc)(wmOperatorType*, void*), vo
        ot->poll= NULL;
 
        if(!ot->description)
-               ot->description= _("(undocumented operator)");
+               ot->description= UI_translate_do_iface(N_("(undocumented operator)"));
 
        opfunc(ot, userdata);
 
@@ -784,7 +784,7 @@ int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message
        else
                properties= NULL;
 
-       pup= uiPupMenuBegin(C, _("OK?"), ICON_QUESTION);
+       pup= uiPupMenuBegin(C, UI_translate_do_iface(N_("OK?")), ICON_QUESTION);
        layout= uiPupMenuLayout(pup);
        uiItemFullO(layout, op->type->idname, message, ICON_NONE, properties, WM_OP_EXEC_REGION_WIN, 0);
        uiPupMenuEnd(C, pup);
@@ -877,11 +877,11 @@ void WM_operator_properties_select_all(wmOperatorType *ot) {
 
 void WM_operator_properties_gesture_border(wmOperatorType *ot, int extend)
 {
-       RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, _("Gesture Mode"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, N_("Gesture Mode"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, N_("X Min"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, N_("X Max"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, N_("Y Min"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, N_("Y Max"), "", INT_MIN, INT_MAX);
 
        if(extend)
                RNA_def_boolean(ot->srna, "extend", 1, _("Extend"), _("Extend selection instead of deselecting everything first"));
@@ -889,13 +889,13 @@ void WM_operator_properties_gesture_border(wmOperatorType *ot, int extend)
 
 void WM_operator_properties_gesture_straightline(wmOperatorType *ot, int cursor)
 {
-       RNA_def_int(ot->srna, "xstart", 0, INT_MIN, INT_MAX, _("X Start"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "xend", 0, INT_MIN, INT_MAX, _("X End"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "ystart", 0, INT_MIN, INT_MAX, _("Y Start"), "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "yend", 0, INT_MIN, INT_MAX, _("Y End"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xstart", 0, INT_MIN, INT_MAX, N_("X Start"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xend", 0, INT_MIN, INT_MAX, N_("X End"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "ystart", 0, INT_MIN, INT_MAX, N_("Y Start"), "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "yend", 0, INT_MIN, INT_MAX, N_("Y End"), "", INT_MIN, INT_MAX);
        
        if(cursor)
-               RNA_def_int(ot->srna, "cursor", cursor, 0, INT_MAX, _("Cursor"), _("Mouse cursor style to use during the modal operator"), 0, INT_MAX);
+               RNA_def_int(ot->srna, "cursor", cursor, 0, INT_MAX, N_("Cursor"), N_("Mouse cursor style to use during the modal operator"), 0, INT_MAX);
 }
 
 
@@ -1026,7 +1026,7 @@ static uiBlock *wm_block_dialog_create(bContext *C, ARegion *ar, void *userData)
                col= uiLayoutColumn(layout, FALSE);
                col_block= uiLayoutGetBlock(col);
                /* Create OK button, the callback of which will execute op */
-               btn= uiDefBut(col_block, BUT, 0, _("OK"), 0, -30, 0, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
+               btn= uiDefBut(col_block, BUT, 0, UI_translate_do_iface(N_("OK")), 0, -30, 0, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
                uiButSetFunc(btn, dialog_exec_cb, data, col_block);
        }
 
@@ -1272,19 +1272,19 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
        split = uiLayoutSplit(layout, 0, 0);
        col = uiLayoutColumn(split, 0);
        uiItemL(col, "Links", ICON_NONE);
-       uiItemStringO(col, _("Donations"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment");
-       uiItemStringO(col, _("Credits"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/credits");
-       uiItemStringO(col, _("Release Log"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-259");
-       uiItemStringO(col, _("Manual"), ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:2.5/Manual");
-       uiItemStringO(col, _("Blender Website"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
-       uiItemStringO(col, _("User Community"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community");
+       uiItemStringO(col, UI_translate_do_iface(N_("Donations")), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment");
+       uiItemStringO(col, UI_translate_do_iface(N_("Credits")), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/credits");
+       uiItemStringO(col, UI_translate_do_iface(N_("Release Log")), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-259");
+       uiItemStringO(col, UI_translate_do_iface(N_("Manual")), ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:2.5/Manual");
+       uiItemStringO(col, UI_translate_do_iface(N_("Blender Website")), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
+       uiItemStringO(col, UI_translate_do_iface(N_("User Community")), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community");
        if(strcmp(STRINGIFY(BLENDER_VERSION_CYCLE), "release")==0) {
                BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d" STRINGIFY(BLENDER_VERSION_CHAR) "_release", BLENDER_VERSION/100, BLENDER_VERSION%100);
        }
        else {
                BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
        }
-       uiItemStringO(col, _("Python API Reference"), ICON_URL, "WM_OT_url_open", "url", url);
+       uiItemStringO(col, UI_translate_do_iface(N_("Python API Reference")), ICON_URL, "WM_OT_url_open", "url", url);
        uiItemL(col, "", ICON_NONE);
 
        col = uiLayoutColumn(split, 0);
@@ -1294,7 +1294,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
                uiItemS(col);
        }
 
-       uiItemL(col, _("Recent"), ICON_NONE);
+       uiItemL(col, UI_translate_do_iface(N_("Recent")), ICON_NONE);
        for(recent = G.recent_files.first, i=0; (i<5) && (recent); recent = recent->next, i++) {
                uiItemStringO(col, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
        }
@@ -1863,9 +1863,9 @@ static void untitled(char *name)
                char *c= BLI_last_slash(name);
                
                if(c)
-                       strcpy(&c[1], _("untitled.blend"));
+                       strcpy(&c[1], "untitled.blend");
                else
-                       strcpy(name, _("untitled.blend"));
+                       strcpy(name, "untitled.blend");
        }
 }
 
index 894d18e95b0c0e8169c48b422e5b978ef673ad99..073b5824ae1086a342c0975bc30820698ac793da 100644 (file)
@@ -75,6 +75,8 @@
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 
+#include "UI_interface.h"
+
 /* the global to talk to ghost */
 static GHOST_SystemHandle g_system= NULL;
 
@@ -506,11 +508,11 @@ void WM_window_open_temp(bContext *C, rcti *position, int type)
        ED_screen_set(C, win->screen);
        
        if(sa->spacetype==SPACE_IMAGE)
-               GHOST_SetTitle(win->ghostwin, _("Blender Render"));
+               GHOST_SetTitle(win->ghostwin, UI_translate_do_iface(N_("Blender Render")));
        else if(ELEM(sa->spacetype, SPACE_OUTLINER, SPACE_USERPREF))
-               GHOST_SetTitle(win->ghostwin, _("Blender User Preferences"));
+               GHOST_SetTitle(win->ghostwin, UI_translate_do_iface(N_("Blender User Preferences")));
        else if(sa->spacetype==SPACE_FILE)
-               GHOST_SetTitle(win->ghostwin, _("Blender File View"));
+               GHOST_SetTitle(win->ghostwin, UI_translate_do_iface(N_("Blender File View")));
        else
                GHOST_SetTitle(win->ghostwin, "Blender");
 }
index 47379ab887bc978e6c6e8e4016017972100ca813..0b5d9f7c15cc43d4272475bcb7b59f1efaf784d9 100644 (file)
@@ -454,8 +454,8 @@ elseif(WIN32)
 
        install( # same as linux!, deduplicate
                DIRECTORY
-          ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-          ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                       ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
+                       ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
                DESTINATION ${TARGETDIR_VER}/datafiles
                PATTERN ".svn" EXCLUDE
        )
index 4e9c8eb8f80f5fd0dc00d061e5a3e9127e852467..6312fea76983c358cee2363e0fddd960ca89dcb0 100644 (file)
@@ -104,7 +104,6 @@ extern char datatoc_bfont_ttf[];
 #include "BKE_utildefines.h"
 
 #include "RNA_define.h"
-#include "RNA_access.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -405,12 +404,6 @@ int main(int argc, char** argv)
        // We don't use threads directly in the BGE, but we need to call this so things like
        // freeing up GPU_Textures works correctly.
        BLI_threadapi_init();
-       // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c)
-       BLF_init(11, U.dpi);
-       BLF_lang_init();
-       // use default settings
-       BLF_lang_encoding("");
-       BLF_lang_set("");
 
        RNA_init();
 
@@ -424,6 +417,12 @@ int main(int argc, char** argv)
 
        IMB_init();
 
+       // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c)
+       BLF_init(11, U.dpi);
+       BLF_lang_init();
+       BLF_lang_encoding("");
+       BLF_lang_set("");
+
        BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size);
 
        // Parse command line options
old mode 100755 (executable)
new mode 100644 (file)
index 5bc8626..0879404
@@ -1,5 +1,5 @@
 /**
- * $Id: BL_Action.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index de2bedb..92fbe95
@@ -1,5 +1,5 @@
 /**
- * $Id: BL_Action.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 2b7719a..4e4d3bc
@@ -1,5 +1,5 @@
 /**
- * $Id: BL_ActionManager.cpp 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
old mode 100755 (executable)
new mode 100644 (file)
index 96a3775..a3c8379
@@ -1,5 +1,5 @@
 /**
- * $Id: BL_ActionManager.h 39792 2011-08-30 09:15:55Z nexyon $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *