Merging r40345 through r40365 from trunk into soc-2011-garlic
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:47:05 +0000 (15:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 15:47:05 +0000 (15:47 +0000)
13 files changed:
1  2 
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_userdef.c

@@@ -109,10 -108,10 +109,10 @@@ class PARTICLE_PT_context_particles(Par
              layout.template_ID(context.space_data, "pin_id")
  
              if part.is_fluid:
-                 layout.label(text=_("Settings used for fluid."))
 -                layout.label(text="Settings used for fluid")
++                layout.label(text=_("Settings used for fluid"))
                  return
  
 -            layout.prop(part, "type", text="Type")
 +            layout.prop(part, "type", text=_("Type"))
  
          elif not psys.settings:
              split = layout.split(percentage=0.32)
                  row.template_ID(psys, "settings", new="particle.new")
  
              #row = layout.row()
 -            #row.label(text="Viewport")
 -            #row.label(text="Render")
 +            #row.label(text=_("Viewport"))
 +            #row.label(text=_("Render"))
  
              if part.is_fluid:
-                 layout.label(text=str(part.count) + " fluid particles for this frame.")
+                 layout.label(text=str(part.count) + " fluid particles for this frame")
                  return
  
              row = col.row()
@@@ -722,7 -721,7 +722,7 @@@ class PARTICLE_PT_boidbrain(ParticleBut
                  row.prop(rule, "use_predict")
                  row.prop(rule, "fear_factor")
              elif rule.type == 'FOLLOW_PATH':
-                 row.label(text=_("Not yet functional."))
 -                row.label(text="Not yet functional")
++                row.label(text=_("Not yet functional"))
              elif rule.type == 'AVOID_COLLISION':
                  row.prop(rule, "use_avoid")
                  row.prop(rule, "use_avoid_collision")
@@@ -1043,27 -1042,27 +1043,27 @@@ class PARTICLE_PT_children(ParticleButt
  
          if part.child_type == 'SIMPLE':
              sub = col.column(align=True)
 -            sub.prop(part, "child_radius", text="Radius")
 -            sub.prop(part, "child_roundness", text="Roundness", slider=True)
 +            sub.prop(part, "child_radius", text=_("Radius"))
 +            sub.prop(part, "child_roundness", text=_("Roundness"), slider=True)
              if psys:
 -                sub.prop(psys, "child_seed", text="Seed")
 +                sub.prop(psys, "child_seed", text=_("Seed"))
          elif part.virtual_parents > 0.0:
              sub = col.column(align=True)
 -            sub.label(text="Parting not")
 -            sub.label(text="available with")
 -            sub.label(text="virtual parents")
 +            sub.label(text=_("Parting not"))
 +            sub.label(text=_("available with"))
-             sub.label(text=_("virtual parents."))
++            sub.label(text=_("virtual parents"))
          else:
              sub = col.column(align=True)
 -            sub.prop(part, "child_parting_factor", text="Parting", slider=True)
 -            sub.prop(part, "child_parting_min", text="Min")
 -            sub.prop(part, "child_parting_max", text="Max")
 +            sub.prop(part, "child_parting_factor", text=_("Parting"), slider=True)
 +            sub.prop(part, "child_parting_min", text=_("Min"))
 +            sub.prop(part, "child_parting_max", text=_("Max"))
  
          col = split.column()
 -        col.label(text="Roughness:")
 +        col.label(text=_("Roughness:"))
  
          sub = col.column(align=True)
 -        sub.prop(part, "roughness_1", text="Uniform")
 -        sub.prop(part, "roughness_1_size", text="Size")
 +        sub.prop(part, "roughness_1", text=_("Uniform"))
 +        sub.prop(part, "roughness_1_size", text=_("Size"))
  
          sub = col.column(align=True)
          sub.prop(part, "roughness_endpoint", "Endpoint")
@@@ -849,10 -841,10 +849,10 @@@ void uiItemEnumO_string(uiLayout *layou
        
        /* enum lookup */
        if((prop= RNA_struct_find_property(&ptr, propname))) {
 -              RNA_property_enum_items(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free);
 +              RNA_property_enum_items_gettexted(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free);
                if(item==NULL || RNA_enum_value_from_id(item, value_str, &value)==0) {
                        if(free) MEM_freeN(item);
-                       RNA_warning("%s.%s, enum %s not found.", RNA_struct_identifier(ptr.type), propname, value_str);
+                       RNA_warning("%s.%s, enum %s not found", RNA_struct_identifier(ptr.type), propname, value_str);
                        return;
                }
  
@@@ -2808,7 -2794,7 +2808,7 @@@ void uiLayoutOperatorButs(const bContex
                empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0;
  
                if(empty && (flag & UI_LAYOUT_OP_SHOW_EMPTY)) {
-                       uiItemL(layout, _("No Properties."), ICON_NONE);
 -                      uiItemL(layout, "No Properties", ICON_NONE);
++                      uiItemL(layout, _("No Properties"), ICON_NONE);
                }
        }
        
@@@ -395,12 -393,12 +395,12 @@@ static void template_ID(bContext *C, ui
                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,
-                                       UI_translate_do_tooltip(N_("Indirect library datablock, cannot change.")));
 -                                      "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,
-                                       UI_translate_do_tooltip(N_("Direct linked library datablock, click to make local.")));
 -                                      "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);
                        }
  
                        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.")));
++                                              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)
@@@ -181,7 -181,7 +181,7 @@@ void file_draw_buttons(const bContext *
                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, 
-                                UI_translate_do_tooltip(N_("File path.")));
 -                               "File path");
++                               UI_translate_do_tooltip(N_("File path")));
                uiButSetCompleteFunc(but, autocomplete_directory, NULL);
                uiButSetFlag(but, UI_BUT_NO_UTF8);
  
                        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,
-                                        UI_translate_do_tooltip(overwrite_alert ?N_("File name, overwrite existing.") : N_("File name.")));
 -                                       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);