update property strings cover. 461 new items

9 files changed, 124 insertions, 119 deletions

diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index c4a302d4d18..73c9f817497 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -48,6 +48,8 @@
 #include "BLI_edgehash.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_displist.h"
@@ -322,8 +324,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_uv_texture_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add UV Texture";
-	ot->description= "Add UV texture layer";
+	ot->name= _("Add UV Texture");
+	ot->description= _("Add UV texture layer");
 	ot->idname= "MESH_OT_uv_texture_add";
 	
 	/* api callbacks */
@@ -401,8 +403,8 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void MESH_OT_drop_named_image(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Assign Image to UV Texture";
-	ot->description= "Assigns Image to active UV layer, or creates a UV layer";
+	ot->name= _("Assign Image to UV Texture");
+	ot->description= _("Assigns Image to active UV layer, or creates a UV layer");
 	ot->idname= "MESH_OT_drop_named_image";
 	
 	/* api callbacks */
@@ -413,8 +415,8 @@ void MESH_OT_drop_named_image(wmOperatorType *ot)
 	ot->flag= OPTYPE_UNDO;
 	
 	/* properties */
-	RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Image name to assign.");
-	RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file");
+	RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Image name to assign."));
+	RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, _("Filepath"), _("Path to image file"));
 }
 
 static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op))
@@ -431,8 +433,8 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_uv_texture_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove UV Texture";
-	ot->description= "Remove UV texture layer";
+	ot->name= _("Remove UV Texture");
+	ot->description= _("Remove UV texture layer");
 	ot->idname= "MESH_OT_uv_texture_remove";
 	
 	/* api callbacks */
@@ -460,8 +462,8 @@ static int vertex_color_add_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_vertex_color_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Vertex Color";
-	ot->description= "Add vertex color layer";
+	ot->name= _("Add Vertex Color");
+	ot->description= _("Add vertex color layer");
 	ot->idname= "MESH_OT_vertex_color_add";
 	
 	/* api callbacks */
@@ -486,8 +488,8 @@ static int vertex_color_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_vertex_color_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Vertex Color";
-	ot->description= "Remove vertex color layer";
+	ot->name= _("Remove Vertex Color");
+	ot->description= _("Remove vertex color layer");
 	ot->idname= "MESH_OT_vertex_color_remove";
 	
 	/* api callbacks */
@@ -521,8 +523,8 @@ static int sticky_add_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_sticky_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Sticky";
-	ot->description= "Add sticky UV texture layer";
+	ot->name= _("Add Sticky");
+	ot->description= _("Add sticky UV texture layer");
 	ot->idname= "MESH_OT_sticky_add";
 	
 	/* api callbacks */
@@ -553,8 +555,8 @@ static int sticky_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void MESH_OT_sticky_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Sticky";
-	ot->description= "Remove sticky UV texture layer";
+	ot->name= _("Remove Sticky");
+	ot->description= _("Remove sticky UV texture layer");
 	ot->idname= "MESH_OT_sticky_remove";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 6cd49ac3861..7ff882d9eb0 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1455,7 +1455,7 @@ void OBJECT_OT_constraint_add(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-	ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), "");
+	ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(constraint_type_items), 0, _("Type"), "");
 }
 
 void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot)
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 2ac9161ffa3..47a9bf86567 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -50,6 +50,8 @@
 #include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 #include "BKE_curve.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
@@ -643,8 +645,8 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot)
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name= "Add Modifier";
-	ot->description = "Add a modifier to the active object";
+	ot->name= _("Add Modifier");
+	ot->description = _("Add a modifier to the active object");
 	ot->idname= "OBJECT_OT_modifier_add";
 	
 	/* api callbacks */
@@ -656,7 +658,7 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-	prop= RNA_def_enum(ot->srna, "type", modifier_type_items, eModifierType_Subsurf, "Type", "");
+	prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(modifier_type_items), eModifierType_Subsurf, "Type", "");
 	RNA_def_enum_funcs(prop, modifier_add_itemf);
 	ot->prop= prop;
 }
@@ -750,8 +752,8 @@ static int modifier_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e
 
 void OBJECT_OT_modifier_remove(wmOperatorType *ot)
 {
-	ot->name= "Remove Modifier";
-	ot->description= "Remove a modifier from the active object";
+	ot->name= _("Remove Modifier");
+	ot->description= _("Remove a modifier from the active object");
 	ot->idname= "OBJECT_OT_modifier_remove";
 
 	ot->invoke= modifier_remove_invoke;
@@ -789,8 +791,8 @@ static int modifier_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
 
 void OBJECT_OT_modifier_move_up(wmOperatorType *ot)
 {
-	ot->name= "Move Up Modifier";
-	ot->description= "Move modifier up in the stack";
+	ot->name= _("Move Up Modifier");
+	ot->description= _("Move modifier up in the stack");
 	ot->idname= "OBJECT_OT_modifier_move_up";
 
 	ot->invoke= modifier_move_up_invoke;
@@ -828,8 +830,8 @@ static int modifier_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE
 
 void OBJECT_OT_modifier_move_down(wmOperatorType *ot)
 {
-	ot->name= "Move Down Modifier";
-	ot->description= "Move modifier down in the stack";
+	ot->name= _("Move Down Modifier");
+	ot->description= _("Move modifier down in the stack");
 	ot->idname= "OBJECT_OT_modifier_move_down";
 
 	ot->invoke= modifier_move_down_invoke;
@@ -869,14 +871,14 @@ static int modifier_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev
 }
 
 static EnumPropertyItem modifier_apply_as_items[] = {
-	{MODIFIER_APPLY_DATA, "DATA", 0, "Object Data", "Apply modifier to the object's data"},
-	{MODIFIER_APPLY_SHAPE, "SHAPE", 0, "New Shape", "Apply deform-only modifier to a new shape on this object"},
+	{MODIFIER_APPLY_DATA, "DATA", 0, N_("Object Data"), N_("Apply modifier to the object's data")},
+	{MODIFIER_APPLY_SHAPE, "SHAPE", 0, N_("New Shape"), N_("Apply deform-only modifier to a new shape on this object")},
 	{0, NULL, 0, NULL, NULL}};
 
 void OBJECT_OT_modifier_apply(wmOperatorType *ot)
 {
-	ot->name= "Apply Modifier";
-	ot->description= "Apply modifier and remove from the stack";
+	ot->name= _("Apply Modifier");
+	ot->description= _("Apply modifier and remove from the stack");
 	ot->idname= "OBJECT_OT_modifier_apply";
 
 	ot->invoke= modifier_apply_invoke;
@@ -886,7 +888,7 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	RNA_def_enum(ot->srna, "apply_as", modifier_apply_as_items, MODIFIER_APPLY_DATA, "Apply as", "How to apply the modifier to the geometry");
+	RNA_def_enum(ot->srna, "apply_as", RNA_enum_items_gettexted(modifier_apply_as_items), MODIFIER_APPLY_DATA, _("Apply as"), _("How to apply the modifier to the geometry"));
 	edit_modifier_properties(ot);
 }
 
@@ -918,8 +920,8 @@ static int modifier_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
 
 void OBJECT_OT_modifier_convert(wmOperatorType *ot)
 {
-	ot->name= "Convert Modifier";
-	ot->description= "Convert particles to a mesh object";
+	ot->name= _("Convert Modifier");
+	ot->description= _("Convert particles to a mesh object");
 	ot->idname= "OBJECT_OT_modifier_convert";
 
 	ot->invoke= modifier_convert_invoke;
@@ -957,8 +959,8 @@ static int modifier_copy_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
 
 void OBJECT_OT_modifier_copy(wmOperatorType *ot)
 {
-	ot->name= "Copy Modifier";
-	ot->description= "Duplicate modifier at the same position in the stack";
+	ot->name= _("Copy Modifier");
+	ot->description= _("Duplicate modifier at the same position in the stack");
 	ot->idname= "OBJECT_OT_modifier_copy";
 
 	ot->invoke= modifier_copy_invoke;
@@ -1002,8 +1004,8 @@ static int multires_higher_levels_delete_invoke(bContext *C, wmOperator *op, wmE
 
 void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot)
 {
-	ot->name= "Delete Higher Levels";
-	ot->description= "Deletes the higher resolution mesh, potential loss of detail";
+	ot->name= _("Delete Higher Levels");
+	ot->description= _("Deletes the higher resolution mesh, potential loss of detail");
 	ot->idname= "OBJECT_OT_multires_higher_levels_delete";
 
 	ot->poll= multires_poll;
@@ -1043,8 +1045,8 @@ static int multires_subdivide_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
 {
-	ot->name= "Multires Subdivide";
-	ot->description= "Add a new level of subdivision";
+	ot->name= _("Multires Subdivide");
+	ot->description= _("Add a new level of subdivision");
 	ot->idname= "OBJECT_OT_multires_subdivide";
 
 	ot->poll= multires_poll;
@@ -1101,8 +1103,8 @@ static int multires_reshape_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
 
 void OBJECT_OT_multires_reshape(wmOperatorType *ot)
 {
-	ot->name= "Multires Reshape";
-	ot->description= "Copy vertex coordinates from other object";
+	ot->name= _("Multires Reshape");
+	ot->description= _("Copy vertex coordinates from other object");
 	ot->idname= "OBJECT_OT_multires_reshape";
 
 	ot->poll= multires_poll;
@@ -1176,8 +1178,8 @@ static int multires_external_save_invoke(bContext *C, wmOperator *op, wmEvent *U
 
 void OBJECT_OT_multires_external_save(wmOperatorType *ot)
 {
-	ot->name= "Multires Save External";
-	ot->description= "Save displacements to an external file";
+	ot->name= _("Multires Save External");
+	ot->description= _("Save displacements to an external file");
 	ot->idname= "OBJECT_OT_multires_external_save";
 
 	// XXX modifier no longer in context after file browser .. ot->poll= multires_poll;
@@ -1210,8 +1212,8 @@ static int multires_external_pack_exec(bContext *C, wmOperator *UNUSED(op))
 
 void OBJECT_OT_multires_external_pack(wmOperatorType *ot)
 {
-	ot->name= "Multires Pack External";
-	ot->description= "Pack displacements from an external file";
+	ot->name= _("Multires Pack External");
+	ot->description= _("Pack displacements from an external file");
 	ot->idname= "OBJECT_OT_multires_external_pack";
 
 	ot->poll= multires_poll;
@@ -1249,8 +1251,8 @@ static int multires_base_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUS
 
 void OBJECT_OT_multires_base_apply(wmOperatorType *ot)
 {
-	ot->name= "Multires Apply Base";
-	ot->description= "Modify the base mesh to conform to the displaced mesh";
+	ot->name= _("Multires Apply Base");
+	ot->description= _("Modify the base mesh to conform to the displaced mesh");
 	ot->idname= "OBJECT_OT_multires_base_apply";
 
 	ot->poll= multires_poll;
@@ -1343,8 +1345,8 @@ static int meshdeform_bind_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e
 void OBJECT_OT_meshdeform_bind(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Mesh Deform Bind";
-	ot->description = "Bind mesh to cage in mesh deform modifier";
+	ot->name= _("Mesh Deform Bind");
+	ot->description = _("Bind mesh to cage in mesh deform modifier");
 	ot->idname= "OBJECT_OT_meshdeform_bind";
 	
 	/* api callbacks */
@@ -1391,8 +1393,8 @@ static int explode_refresh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e
 
 void OBJECT_OT_explode_refresh(wmOperatorType *ot)
 {
-	ot->name= "Explode Refresh";
-	ot->description= "Refresh data in the Explode modifier";
+	ot->name= _("Explode Refresh");
+	ot->description= _("Refresh data in the Explode modifier");
 	ot->idname= "OBJECT_OT_explode_refresh";
 
 	ot->poll= explode_poll;
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index e62fa403518..96988d15ab2 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -327,9 +327,9 @@ static int shape_key_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_shape_key_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Shape Key";
+	ot->name= _("Remove Shape Key");
 	ot->idname= "OBJECT_OT_shape_key_remove";
-	ot->description= "Remove shape key from the object";
+	ot->description= _("Remove shape key from the object");
 	
 	/* api callbacks */
 	ot->poll= shape_key_mode_poll;
@@ -360,8 +360,8 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_shape_key_clear(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Clear Shape Keys";
-	ot->description= "Clear weights for all shape keys";
+	ot->name= _("Clear Shape Keys");
+	ot->description= _("Clear weights for all shape keys");
 	ot->idname= "OBJECT_OT_shape_key_clear";
 	
 	/* api callbacks */
@@ -385,7 +385,7 @@ static int shape_key_mirror_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_shape_key_mirror(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Mirror Shape Key";
+	ot->name= _("Mirror Shape Key");
 	ot->idname= "OBJECT_OT_shape_key_mirror";
 
 	/* api callbacks */
@@ -448,13 +448,13 @@ static int shape_key_move_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_shape_key_move(wmOperatorType *ot)
 {
 	static EnumPropertyItem slot_move[] = {
-		{-1, "UP", 0, "Up", ""},
-		{1, "DOWN", 0, "Down", ""},
+		{-1, "UP", 0, N_("Up"), ""},
+		{1, "DOWN", 0, N_("Down"), ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
-	ot->name= "Move Shape Key";
+	ot->name= _("Move Shape Key");
 	ot->idname= "OBJECT_OT_shape_key_move";
 
 	/* api callbacks */
@@ -464,6 +464,6 @@ void OBJECT_OT_shape_key_move(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", "");
+	RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(slot_move), 0, _("Type"), "");
 }
 
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index eed92549652..04390612dd0 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1552,7 +1552,7 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Vertex Group";
+	ot->name= _("Add Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_add";
 	
 	/* api callbacks */
@@ -1683,7 +1683,7 @@ static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_select(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Vertex Group";
+	ot->name= _("Select Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_select";
 
 	/* api callbacks */
@@ -1707,7 +1707,7 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Deselect Vertex Group";
+	ot->name= _("Deselect Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_deselect";
 
 	/* api callbacks */
@@ -1733,7 +1733,7 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_copy(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Copy Vertex Group";
+	ot->name= _("Copy Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_copy";
 
 	/* api callbacks */
@@ -1763,7 +1763,7 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_vertex_group_levels(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Vertex Group Levels";
+	ot->name= _("Vertex Group Levels");
 	ot->idname= "OBJECT_OT_vertex_group_levels";
 	
 	/* api callbacks */
@@ -1773,8 +1773,8 @@ void OBJECT_OT_vertex_group_levels(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, "Offset", "Value to add to weights.", -1.0f, 1.f);
-	RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, "Gain", "Value to multiply weights by.", 0.0f, 10.f);
+	RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, N_("Offset"), N_("Value to add to weights."), -1.0f, 1.f);
+	RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, N_("Gain"), N_("Value to multiply weights by."), 0.0f, 10.f);
 }
 
 static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op))
@@ -1793,7 +1793,7 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_normalize(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Normalize Vertex Group";
+	ot->name= _("Normalize Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_normalize";
 
 	/* api callbacks */
@@ -1882,7 +1882,7 @@ static int vertex_group_blend_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_blend(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Blend Vertex Group";
+	ot->name= _("Blend Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_blend";
 	ot->description= "";
 
@@ -1995,9 +1995,9 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Copy Vertex Groups to Linked";
+	ot->name= _("Copy Vertex Groups to Linked");
 	ot->idname= "OBJECT_OT_vertex_group_copy_to_linked";
-	ot->description= "Copy Vertex Groups to all users of the same Geometry data";
+	ot->description= _("Copy Vertex Groups to all users of the same Geometry data");
 
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
@@ -2033,9 +2033,9 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_vertex_group_copy_to_selected(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Copy Vertex Group to Selected";
+	ot->name= _("Copy Vertex Group to Selected");
 	ot->idname= "OBJECT_OT_vertex_group_copy_to_selected";
-	ot->description= "Copy Vertex Groups to other selected objects with matching indices";
+	ot->description= _("Copy Vertex Groups to other selected objects with matching indices");
 
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
@@ -2091,9 +2091,9 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot)
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name= "Set Active Vertex Group";
+	ot->name= _("Set Active Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_set_active";
-	ot->description= "Set the active vertex group";
+	ot->description= _("Set the active vertex group");
 
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
@@ -2104,7 +2104,7 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active.");
+	prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, _("Group"), _("Vertex group to set as active."));
 	RNA_def_enum_funcs(prop, vgroup_itemf);
 	ot->prop= prop;
 }
@@ -2223,9 +2223,9 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
 
 void OBJECT_OT_vertex_group_sort(wmOperatorType *ot)
 {
-	ot->name= "Sort Vertex Groups";
+	ot->name= _("Sort Vertex Groups");
 	ot->idname= "OBJECT_OT_vertex_group_sort";
-	ot->description= "Sorts vertex groups alphabetically";
+	ot->description= _("Sorts vertex groups alphabetically");
 
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
@@ -2276,13 +2276,13 @@ static int vgroup_move_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_vertex_group_move(wmOperatorType *ot)
 {
 	static EnumPropertyItem vgroup_slot_move[] = {
-		{1, "UP", 0, "Up", ""},
-		{-1, "DOWN", 0, "Down", ""},
+		{1, "UP", 0, N_("Up"), ""},
+		{-1, "DOWN", 0, N_("Down"), ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
-	ot->name= "Move Vertex Group";
+	ot->name= _("Move Vertex Group");
 	ot->idname= "OBJECT_OT_vertex_group_move";
 
 	/* api callbacks */
@@ -2292,5 +2292,5 @@ void OBJECT_OT_vertex_group_move(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	RNA_def_enum(ot->srna, "direction", vgroup_slot_move, 0, "Direction", "Direction to move, UP or DOWN");
+	RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(vgroup_slot_move), 0, _("Direction"), _("Direction to move, UP or DOWN"));
 }
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 7f0cedb71c9..8392c25f46e 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -87,9 +87,9 @@ static int particle_system_add_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_particle_system_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Particle System Slot";
+	ot->name= _("Add Particle System Slot");
 	ot->idname= "OBJECT_OT_particle_system_add";
-	ot->description="Add a particle system";
+	ot->description=_("Add a particle system");
 	
 	/* api callbacks */
 	ot->poll= ED_operator_object_active_editable;
@@ -126,9 +126,9 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_particle_system_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Particle System Slot";
+	ot->name= _("Remove Particle System Slot");
 	ot->idname= "OBJECT_OT_particle_system_remove";
-	ot->description="Remove the selected particle system";
+	ot->description=_("Remove the selected particle system");
 	
 	/* api callbacks */
 	ot->poll= ED_operator_object_active_editable;
@@ -185,9 +185,9 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op))
 void PARTICLE_OT_new(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "New Particle Settings";
+	ot->name= _("New Particle Settings");
 	ot->idname= "PARTICLE_OT_new";
-	ot->description="Add new particle settings";
+	ot->description=_("Add new particle settings");
 	
 	/* api callbacks */
 	ot->exec= new_particle_settings_exec;
@@ -234,9 +234,9 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
 void PARTICLE_OT_new_target(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "New Particle Target";
+	ot->name= _("New Particle Target");
 	ot->idname= "PARTICLE_OT_new_target";
-	ot->description="Add a new particle target";
+	ot->description=_("Add a new particle target");
 	
 	/* api callbacks */
 	ot->exec= new_particle_target_exec;
@@ -283,9 +283,9 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
 void PARTICLE_OT_target_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Particle Target";
+	ot->name= _("Remove Particle Target");
 	ot->idname= "PARTICLE_OT_target_remove";
-	ot->description="Remove the selected particle target";
+	ot->description=_("Remove the selected particle target");
 	
 	/* api callbacks */
 	ot->exec= remove_particle_target_exec;
@@ -323,9 +323,9 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op))
 
 void PARTICLE_OT_target_move_up(wmOperatorType *ot)
 {
-	ot->name= "Move Up Target";
+	ot->name= _("Move Up Target");
 	ot->idname= "PARTICLE_OT_target_move_up";
-	ot->description= "Move particle target up in the list";
+	ot->description= _("Move particle target up in the list");
 	
 	ot->exec= target_move_up_exec;
 	
@@ -361,9 +361,9 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op))
 
 void PARTICLE_OT_target_move_down(wmOperatorType *ot)
 {
-	ot->name= "Move Down Target";
+	ot->name= _("Move Down Target");
 	ot->idname= "PARTICLE_OT_target_move_down";
-	ot->description= "Move particle target down in the list";
+	ot->description= _("Move particle target down in the list");
 	
 	ot->exec= target_move_down_exec;
 	
@@ -399,9 +399,9 @@ static int dupliob_move_up_exec(bContext *C, wmOperator *UNUSED(op))
 
 void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot)
 {
-	ot->name= "Move Up Dupli Object";
+	ot->name= _("Move Up Dupli Object");
 	ot->idname= "PARTICLE_OT_dupliob_move_up";
-	ot->description= "Move dupli object up in the list";
+	ot->description= _("Move dupli object up in the list");
 	
 	ot->exec= dupliob_move_up_exec;
 	
@@ -439,9 +439,9 @@ static int copy_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op))
 void PARTICLE_OT_dupliob_copy(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Copy Particle Dupliob";
+	ot->name= _("Copy Particle Dupliob");
 	ot->idname= "PARTICLE_OT_dupliob_copy";
-	ot->description="Duplicate the current dupliobject";
+	ot->description=_("Duplicate the current dupliobject");
 	
 	/* api callbacks */
 	ot->exec= copy_particle_dupliob_exec;
@@ -482,9 +482,9 @@ static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op))
 void PARTICLE_OT_dupliob_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Particle Dupliobject";
+	ot->name= _("Remove Particle Dupliobject");
 	ot->idname= "PARTICLE_OT_dupliob_remove";
-	ot->description="Remove the selected dupliobject";
+	ot->description=_("Remove the selected dupliobject");
 	
 	/* api callbacks */
 	ot->exec= remove_particle_dupliob_exec;
@@ -521,9 +521,9 @@ static int dupliob_move_down_exec(bContext *C, wmOperator *UNUSED(op))
 
 void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot)
 {
-	ot->name= "Move Down Dupli Object";
+	ot->name= _("Move Down Dupli Object");
 	ot->idname= "PARTICLE_OT_dupliob_move_down";
-	ot->description= "Move dupli object down in the list";
+	ot->description= _("Move dupli object down in the list");
 	
 	ot->exec= dupliob_move_down_exec;
 	
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index 19c600be937..3d2ae6dca3d 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -37,6 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
 
 #include "BKE_context.h"
 
@@ -120,31 +121,31 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
 	// Default panels
 	uiBlockBeginAlign(block);
 	if(sbuts->pathflag & (1<<BCONTEXT_RENDER))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_SCENE,			xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_RENDER, 0, 0, "Render");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_SCENE,			xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_RENDER, 0, 0, _("Render"));
 	if(sbuts->pathflag & (1<<BCONTEXT_SCENE))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_SCENE_DATA,			xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_SCENE_DATA,			xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, _("Scene"));
 	if(sbuts->pathflag & (1<<BCONTEXT_WORLD))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_WORLD,		xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_WORLD,		xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, _("World"));
 	if(sbuts->pathflag & (1<<BCONTEXT_OBJECT))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_OBJECT_DATA,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_OBJECT_DATA,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, _("Object"));
 	if(sbuts->pathflag & (1<<BCONTEXT_CONSTRAINT))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_CONSTRAINT,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, "Object Constraints");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_CONSTRAINT,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, _("Object Constraints"));
 	if(sbuts->pathflag & (1<<BCONTEXT_MODIFIER))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_MODIFIER,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, "Modifiers");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_MODIFIER,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, _("Modifiers"));
 	if(sbuts->pathflag & (1<<BCONTEXT_DATA))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	sbuts->dataicon,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, "Object Data");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	sbuts->dataicon,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, _("Object Data"));
 	if(sbuts->pathflag & (1<<BCONTEXT_BONE))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_BONE_DATA,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, "Bone");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_BONE_DATA,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, _("Bone"));
 	if(sbuts->pathflag & (1<<BCONTEXT_BONE_CONSTRAINT))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_CONSTRAINT_BONE,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE_CONSTRAINT, 0, 0, "Bone Constraints");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_CONSTRAINT_BONE,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE_CONSTRAINT, 0, 0, _("Bone Constraints"));
 	if(sbuts->pathflag & (1<<BCONTEXT_MATERIAL))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_MATERIAL,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MATERIAL, 0, 0, "Material");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_MATERIAL,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MATERIAL, 0, 0, _("Material"));
 	if(sbuts->pathflag & (1<<BCONTEXT_TEXTURE))
-		uiDefIconButS(block, ROW, B_BUTSPREVIEW,	ICON_TEXTURE,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, "Texture");
+		uiDefIconButS(block, ROW, B_BUTSPREVIEW,	ICON_TEXTURE,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, _("Texture"));
 	if(sbuts->pathflag & (1<<BCONTEXT_PARTICLE))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PARTICLES,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, "Particles");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PARTICLES,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, _("Particles"));
 	if(sbuts->pathflag & (1<<BCONTEXT_PHYSICS))
-		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PHYSICS,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, "Physics");
+		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PHYSICS,	xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, _("Physics"));
 	xco+= BUT_UNIT_X;
 	
 	uiBlockEndAlign(block);
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index f11f530be9e..54e2df45cff 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -688,7 +688,7 @@ 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, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Curve Modifier for the active F-Curve"));
 		
 		/* copy/paste (as sub-row)*/
 		row= uiLayoutRow(row, 1);
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index c431f5455ed..4a311d9113f 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -420,7 +420,7 @@ 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, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Modifier for the active NLA Strip"));
 		
 		/* copy/paste (as sub-row)*/
 		row= uiLayoutRow(row, 1);