Commit: 090ab750b354b69b2fc3f0e1ecb51d9f57507ff9
Author: Bastien Montagne
Date:   Mon Dec 15 11:46:25 2014 +0100
Branches: master
https://developer.blender.org/rB090ab750b354b69b2fc3f0e1ecb51d9f57507ff9

Fix missing UI ID messages and/or I18N contexts for 
MovieClip/Mask/Palette/PaintCurve ID types.

===================================================================

M       source/blender/blenfont/BLF_translation.h
M       source/blender/editors/interface/interface_templates.c

===================================================================

diff --git a/source/blender/blenfont/BLF_translation.h 
b/source/blender/blenfont/BLF_translation.h
index c119967..b42e6f8 100644
--- a/source/blender/blenfont/BLF_translation.h
+++ b/source/blender/blenfont/BLF_translation.h
@@ -163,6 +163,8 @@ const char *BLF_translate_do_new_dataname(const char 
*msgctxt, const char *msgid
 #define BLF_I18NCONTEXT_ID_MESH                 "Mesh"
 #define BLF_I18NCONTEXT_ID_NODETREE             "NodeTree"
 #define BLF_I18NCONTEXT_ID_OBJECT               "Object"
+#define BLF_I18NCONTEXT_ID_PAINTCURVE           "PaintCurve"
+#define BLF_I18NCONTEXT_ID_PALETTE              "Palette"
 #define BLF_I18NCONTEXT_ID_PARTICLESETTINGS     "ParticleSettings"
 #define BLF_I18NCONTEXT_ID_SCENE                "Scene"
 #define BLF_I18NCONTEXT_ID_SCREEN               "Screen"
@@ -207,11 +209,15 @@ typedef struct
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_LAMP, "id_lamp"),              
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_LIBRARY, "id_library"),        
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_LATTICE, "id_lattice"),        
                                           \
+       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MASK, "id_mask"),              
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MATERIAL, "id_material"),      
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_METABALL, "id_metaball"),      
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MESH, "id_mesh"),              
                                           \
+       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MOVIECLIP, "id_movieclip"),    
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_NODETREE, "id_nodetree"),      
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_OBJECT, "id_object"),          
                                           \
+       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_PAINTCURVE, "id_paintcurve"),  
                                           \
+       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_PALETTE, "id_palette"),        
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_PARTICLESETTINGS, 
"id_particlesettings"),                                 \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_SCENE, "id_scene"),            
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_SCREEN, "id_screen"),          
                                           \
@@ -223,8 +229,6 @@ typedef struct
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_VFONT, "id_vfont"),            
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_WORLD, "id_world"),            
                                           \
        BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_WINDOWMANAGER, 
"id_windowmanager"),                                       \
-       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MOVIECLIP, "id_movieclip"),    
                                           \
-       BLF_I18NCONTEXTS_ITEM(BLF_I18NCONTEXT_ID_MASK, "id_mask"),              
                                           \
        {NULL, NULL, NULL}                                                      
                                           \
 }
 
diff --git a/source/blender/editors/interface/interface_templates.c 
b/source/blender/editors/interface/interface_templates.c
index 9e974fe..9d96513 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -350,6 +350,8 @@ static const char *template_id_browse_tip(StructRNA *type)
                        case ID_BR:  return N_("Browse Brush to be linked");
                        case ID_PA:  return N_("Browse Particle Settings to be 
linked");
                        case ID_GD:  return N_("Browse Grease Pencil Data to be 
linked");
+                       case ID_MC:  return N_("Browse Movie Clip to be 
linked");
+                       case ID_MSK: return N_("Browse Mask to be linked");
                        case ID_PAL: return N_("Browse Palette Data to be 
linked");
                        case ID_PC:  return N_("Browse Paint Curve Data to be 
linked");
                }
@@ -388,6 +390,10 @@ static const char *template_id_context(StructRNA *type)
                        case ID_BR:  return BLF_I18NCONTEXT_ID_BRUSH;
                        case ID_PA:  return BLF_I18NCONTEXT_ID_PARTICLESETTINGS;
                        case ID_GD:  return BLF_I18NCONTEXT_ID_GPENCIL;
+                       case ID_MC:  return BLF_I18NCONTEXT_ID_MOVIECLIP;
+                       case ID_MSK: return BLF_I18NCONTEXT_ID_MASK;
+                       case ID_PAL: return BLF_I18NCONTEXT_ID_PALETTE;
+                       case ID_PC:  return BLF_I18NCONTEXT_ID_PAINTCURVE;
                }
        }
        return BLF_I18NCONTEXT_DEFAULT;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to