right panel done

28 files changed, 316 insertions, 305 deletions

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 3aee5f1ab5a..ce3110dab3d 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1437,8 +1437,8 @@ static int ed_marker_camera_bind_exec(bContext *C, wmOperator *UNUSED(op))
 static void MARKER_OT_camera_bind(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Bind Camera to Markers";
-	ot->description= "Bind the active camera to selected markers(s)";
+	ot->name= _("Bind Camera to Markers");
+	ot->description= _("Bind the active camera to selected markers(s)");
 	ot->idname= "MARKER_OT_camera_bind";
 
 	/* api callbacks */
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index f938fcfa39f..1a69f88b382 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -333,9 +333,9 @@ static int toggle_time_exec(bContext *C, wmOperator *UNUSED(op))
 static void ANIM_OT_time_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Toggle Frames/Seconds";
+	ot->name= _("Toggle Frames/Seconds");
 	ot->idname= "ANIM_OT_time_toggle";
-	ot->description= "Toggle whether timing is displayed in frames or seconds for active timeline view";
+	ot->description= _("Toggle whether timing is displayed in frames or seconds for active timeline view");
 	
 	/* api callbacks */
 	ot->exec= toggle_time_exec;
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index ec60ddbfa1c..5c4a79217c2 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1197,7 +1197,7 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Insert Keyframe Menu";
 	ot->idname= "ANIM_OT_keyframe_insert_menu";
-	ot->description= "Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined";
+	ot->description= _("Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined");
 	
 	/* callbacks */
 	ot->invoke= insert_key_menu_invoke;
@@ -1362,7 +1362,7 @@ void ANIM_OT_keyframe_delete_v3d (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete Keyframe";
-	ot->description= "Remove keyframes on current frame for selected object";
+	ot->description= _("Remove keyframes on current frame for selected object");
 	ot->idname= "ANIM_OT_keyframe_delete_v3d";
 	
 	/* callbacks */
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 9dc0acb4131..18544d4d154 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -2036,8 +2036,8 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_switch_direction(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Switch Direction";
-	ot->description= "Switch direction of selected splines";
+	ot->name= _("Switch Direction");
+	ot->description= _("Switch direction of selected splines");
 	ot->idname= "CURVE_OT_switch_direction";
 	
 	/* api callbacks */
@@ -2084,8 +2084,8 @@ static int set_goal_weight_exec(bContext *C, wmOperator *op)
 void CURVE_OT_spline_weight_set(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Set Goal Weight";
-	ot->description= "Set softbody goal weight for selected points";
+	ot->name= _("Set Goal Weight");
+	ot->description= _("Set softbody goal weight for selected points");
 	ot->idname= "CURVE_OT_spline_weight_set";
 	
 	/* api callbacks */
@@ -2136,8 +2136,8 @@ static int set_radius_exec(bContext *C, wmOperator *op)
 void CURVE_OT_radius_set(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Set Curve Radius";
-	ot->description= "Set per-point radius which is used for bevel tapering";
+	ot->name= _("Set Curve Radius");
+	ot->description= _("Set per-point radius which is used for bevel tapering");
 	ot->idname= "CURVE_OT_radius_set";
 	
 	/* api callbacks */
@@ -2212,8 +2212,8 @@ static int smooth_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_smooth(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Smooth";
-	ot->description= "Flatten angles of selected points";
+	ot->name= _("Smooth");
+	ot->description= _("Flatten angles of selected points");
 	ot->idname= "CURVE_OT_smooth";
 	
 	/* api callbacks */
@@ -2378,8 +2378,8 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_smooth_radius(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Smooth Curve Radius";
-	ot->description= "Flatten radiuses of selected points";
+	ot->name= _("Smooth Curve Radius");
+	ot->description= _("Flatten radiuses of selected points");
 	ot->idname= "CURVE_OT_smooth_radius";
 	
 	/* api clastbacks */
@@ -2532,7 +2532,7 @@ static int de_select_first_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_de_select_first(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select or Deselect First";
+	ot->name= _("Select or Deselect First");
 	ot->idname= "CURVE_OT_de_select_first";
 	
 	/* api cfirstbacks */
@@ -2556,7 +2556,7 @@ static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_de_select_last(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select or Deselect Last";
+	ot->name= _("Select or Deselect Last");
 	ot->idname= "CURVE_OT_de_select_last";
 	
 	/* api clastbacks */
@@ -2634,7 +2634,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
 void CURVE_OT_select_all(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select or Deselect All";
+	ot->name= _("Select or Deselect All");
 	ot->idname= "CURVE_OT_select_all";
 	
 	/* api callbacks */
@@ -2708,7 +2708,7 @@ static int hide_exec(bContext *C, wmOperator *op)
 void CURVE_OT_hide(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Hide Selected";
+	ot->name= _("Hide Selected");
 	ot->idname= "CURVE_OT_hide";
 	
 	/* api callbacks */
@@ -2768,7 +2768,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_reveal(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Reveal Hidden";
+	ot->name= _("Reveal Hidden");
 	ot->idname= "CURVE_OT_reveal";
 	
 	/* api callbacks */
@@ -2826,7 +2826,7 @@ static int select_inverse_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_inverse(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Inverse";
+	ot->name= _("Select Inverse");
 	ot->idname= "CURVE_OT_select_inverse";
 	
 	/* api callbacks */
@@ -3265,8 +3265,8 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 void CURVE_OT_subdivide(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Subdivide";
-	ot->description= "Subdivide selected segments";
+	ot->name= _("Subdivide");
+	ot->description= _("Subdivide selected segments");
 	ot->idname= "CURVE_OT_subdivide";
 	
 	/* api callbacks */
@@ -3583,8 +3583,8 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
-	ot->name= "Set Spline Type";
-	ot->description = "Set type of active spline";
+	ot->name= _("Set Spline Type");
+	ot->description = _("Set type of active spline");
 	ot->idname= "CURVE_OT_spline_type_set";
 	
 	/* api callbacks */
@@ -4161,7 +4161,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 void CURVE_OT_make_segment(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Make Segment";
+	ot->name= _("Make Segment");
 	ot->idname= "CURVE_OT_make_segment";
 	
 	/* api callbacks */
@@ -4702,7 +4702,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void CURVE_OT_vertex_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Vertex";
+	ot->name= _("Add Vertex");
 	ot->idname= "CURVE_OT_vertex_add";
 	
 	/* api callbacks */
@@ -4762,8 +4762,8 @@ static int extrude_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 void CURVE_OT_extrude(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Extrude";
-	ot->description = "Extrude selected control point(s) and move";
+	ot->name= _("Extrude");
+	ot->description = _("Extrude selected control point(s) and move");
 	ot->idname= "CURVE_OT_extrude";
 	
 	/* api callbacks */
@@ -4891,8 +4891,8 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot)
 		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
-	ot->name= "Toggle Cyclic";
-	ot->description = "Make active spline closed/opened loop";
+	ot->name= _("Toggle Cyclic");
+	ot->description = _("Make active spline closed/opened loop");
 	ot->idname= "CURVE_OT_cyclic_toggle";
 	
 	/* api callbacks */
@@ -4968,7 +4968,7 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
 void CURVE_OT_select_linked(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Linked All";
+	ot->name= _("Select Linked All");
 	ot->idname= "CURVE_OT_select_linked";
 
 	/* api callbacks */
@@ -5028,7 +5028,7 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event
 void CURVE_OT_select_linked_pick(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Linked";
+	ot->name= _("Select Linked");
 	ot->idname= "CURVE_OT_select_linked_pick";
 
 	/* api callbacks */
@@ -5106,7 +5106,7 @@ static int select_row_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_row(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Control Point Row";
+	ot->name= _("Select Control Point Row");
 	ot->idname= "CURVE_OT_select_row";
 	
 	/* api callbacks */
@@ -5133,7 +5133,7 @@ static int select_next_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_next(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Next";
+	ot->name= _("Select Next");
 	ot->idname= "CURVE_OT_select_next";
 	
 	/* api callbacks */
@@ -5160,7 +5160,7 @@ static int select_previous_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_previous(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Previous";
+	ot->name= _("Select Previous");
 	ot->idname= "CURVE_OT_select_previous";
 	
 	/* api callbacks */
@@ -5247,7 +5247,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_more(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select More";
+	ot->name= _("Select More");
 	ot->idname= "CURVE_OT_select_more";
 	
 	/* api callbacks */
@@ -5408,7 +5408,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_select_less(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Less";
+	ot->name= _("Select Less");
 	ot->idname= "CURVE_OT_select_less";
 	
 	/* api callbacks */
@@ -5471,7 +5471,7 @@ static int select_random_exec(bContext *C, wmOperator *op)
 void CURVE_OT_select_random(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Random";
+	ot->name= _("Select Random");
 	ot->idname= "CURVE_OT_select_random";
 	
 	/* api callbacks */
@@ -5596,7 +5596,7 @@ static int select_nth_exec(bContext *C, wmOperator *op)
 void CURVE_OT_select_nth(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Nth";
+	ot->name= _("Select Nth");
 	ot->description= "";
 	ot->idname= "CURVE_OT_select_nth";
 
@@ -5635,8 +5635,8 @@ static int duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 void CURVE_OT_duplicate(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Duplicate Curve";
-	ot->description = "Duplicate selected control points and segments between them";
+	ot->name= _("Duplicate Curve");
+	ot->description = _("Duplicate selected control points and segments between them");
 	ot->idname= "CURVE_OT_duplicate";
 	
 	/* api callbacks */
@@ -6001,8 +6001,8 @@ void CURVE_OT_delete(wmOperatorType *ot)
 		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
-	ot->name= "Delete";
-	ot->description = "Delete selected control points or segments";
+	ot->name= _("Delete");
+	ot->description = _("Delete selected control points or segments");
 	ot->idname= "CURVE_OT_delete";
 	
 	/* api callbacks */
@@ -6045,7 +6045,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 void CURVE_OT_shade_smooth(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Shade Smooth";
+	ot->name= _("Shade Smooth");
 	ot->idname= "CURVE_OT_shade_smooth";
 	
 	/* api callbacks */
@@ -6059,7 +6059,7 @@ void CURVE_OT_shade_smooth(wmOperatorType *ot)
 void CURVE_OT_shade_flat(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Shade Flat";
+	ot->name= _("Shade Flat");
 	ot->idname= "CURVE_OT_shade_flat";
 	
 	/* api callbacks */
@@ -6638,8 +6638,8 @@ static int add_primitive_bezier_exec(bContext *C, wmOperator *op)
 void CURVE_OT_primitive_bezier_curve_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Bezier";
-	ot->description= "Construct a Bezier Curve";
+	ot->name= _("Add Bezier");
+	ot->description= _("Construct a Bezier Curve");
 	ot->idname= "CURVE_OT_primitive_bezier_curve_add";
 	
 	/* api callbacks */
@@ -6661,8 +6661,8 @@ static int add_primitive_bezier_circle_exec(bContext *C, wmOperator *op)
 void CURVE_OT_primitive_bezier_circle_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Bezier Circle";
-	ot->description= "Construct a Bezier Circle";
+	ot->name= _("Add Bezier Circle");
+	ot->description= _("Construct a Bezier Circle");
 	ot->idname= "CURVE_OT_primitive_bezier_circle_add";
 	
 	/* api callbacks */
@@ -6684,8 +6684,8 @@ static int add_primitive_nurbs_curve_exec(bContext *C, wmOperator *op)
 void CURVE_OT_primitive_nurbs_curve_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Nurbs Curve";
-	ot->description= "Construct a Nurbs Curve";
+	ot->name= _("Add Nurbs Curve");
+	ot->description= _("Construct a Nurbs Curve");
 	ot->idname= "CURVE_OT_primitive_nurbs_curve_add";
 	
 	/* api callbacks */
@@ -6707,8 +6707,8 @@ static int add_primitive_nurbs_circle_exec(bContext *C, wmOperator *op)
 void CURVE_OT_primitive_nurbs_circle_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Nurbs Circle";
-	ot->description= "Construct a Nurbs Circle";
+	ot->name= _("Add Nurbs Circle");
+	ot->description= _("Construct a Nurbs Circle");
 	ot->idname= "CURVE_OT_primitive_nurbs_circle_add";
 	
 	/* api callbacks */
@@ -6730,8 +6730,8 @@ static int add_primitive_curve_path_exec(bContext *C, wmOperator *op)
 void CURVE_OT_primitive_nurbs_path_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Path";
-	ot->description= "Construct a Path";
+	ot->name= _("Add Path");
+	ot->description= _("Construct a Path");
 	ot->idname= "CURVE_OT_primitive_nurbs_path_add";
 	
 	/* api callbacks */
@@ -6754,8 +6754,8 @@ static int add_primitive_nurbs_surface_curve_exec(bContext *C, wmOperator *op)
 void SURFACE_OT_primitive_nurbs_surface_curve_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Curve";
-	ot->description= "Construct a Nurbs surface Curve";
+	ot->name= _("Add Surface Curve");
+	ot->description= _("Construct a Nurbs surface Curve");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_curve_add";
 	
 	/* api callbacks */
@@ -6777,8 +6777,8 @@ static int add_primitive_nurbs_surface_circle_exec(bContext *C, wmOperator *op)
 void SURFACE_OT_primitive_nurbs_surface_circle_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Circle";
-	ot->description= "Construct a Nurbs surface Circle";
+	ot->name= _("Add Surface Circle");
+	ot->description= _("Construct a Nurbs surface Circle");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_circle_add";
 	
 	/* api callbacks */
@@ -6800,8 +6800,8 @@ static int add_primitive_nurbs_surface_surface_exec(bContext *C, wmOperator *op)
 void SURFACE_OT_primitive_nurbs_surface_surface_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Patch";
-	ot->description= "Construct a Nurbs surface Patch";
+	ot->name= _("Add Surface Patch");
+	ot->description= _("Construct a Nurbs surface Patch");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_surface_add";
 	
 	/* api callbacks */
@@ -6823,8 +6823,8 @@ static int add_primitive_nurbs_surface_cylinder_exec(bContext *C, wmOperator *op
 void SURFACE_OT_primitive_nurbs_surface_cylinder_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Cylinder";
-	ot->description= "Construct a Nurbs surface Cylinder";
+	ot->name= _("Add Surface Cylinder");
+	ot->description= _("Construct a Nurbs surface Cylinder");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_cylinder_add";
 	
 	/* api callbacks */
@@ -6846,8 +6846,8 @@ static int add_primitive_nurbs_surface_sphere_exec(bContext *C, wmOperator *op)
 void SURFACE_OT_primitive_nurbs_surface_sphere_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Sphere";
-	ot->description= "Construct a Nurbs surface Sphere";
+	ot->name= _("Add Surface Sphere");
+	ot->description= _("Construct a Nurbs surface Sphere");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_sphere_add";
 	
 	/* api callbacks */
@@ -6869,8 +6869,8 @@ static int add_primitive_nurbs_surface_torus_exec(bContext *C, wmOperator *op)
 void SURFACE_OT_primitive_nurbs_surface_torus_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Surface Torus";
-	ot->description= "Construct a Nurbs surface Torus";
+	ot->name= _("Add Surface Torus");
+	ot->description= _("Construct a Nurbs surface Torus");
 	ot->idname= "SURFACE_OT_primitive_nurbs_surface_torus_add";
 	
 	/* api callbacks */
@@ -6924,7 +6924,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op))
 void CURVE_OT_tilt_clear(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Clear Tilt";
+	ot->name= _("Clear Tilt");
 	ot->idname= "CURVE_OT_tilt_clear";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 352960d285a..fe5e35cc763 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 set(INC
 	../include
+	../../blenfont
 	../../blenkernel
 	../../blenloader
 	../../blenlib
diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript
index d2fd9e5fe9d..7847744a6f1 100644
--- a/source/blender/editors/gpencil/SConscript
+++ b/source/blender/editors/gpencil/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../gpu ../../blenloader'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index f4da734473d..2acc97417de 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -42,6 +42,8 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -1756,9 +1758,9 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
 /* ------------------------------- */
 
 static EnumPropertyItem prop_gpencil_drawmodes[] = {
-	{GP_PAINTMODE_DRAW, "DRAW", 0, "Draw Freehand", ""},
-	{GP_PAINTMODE_DRAW_STRAIGHT, "DRAW_STRAIGHT", 0, "Draw Straight Lines", ""},
-	{GP_PAINTMODE_ERASER, "ERASER", 0, "Eraser", ""},
+	{GP_PAINTMODE_DRAW, "DRAW", 0, N_("Draw Freehand"), ""},
+	{GP_PAINTMODE_DRAW_STRAIGHT, "DRAW_STRAIGHT", 0, N_("Draw Straight Lines"), ""},
+	{GP_PAINTMODE_ERASER, "ERASER", 0, N_("Eraser"), ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -1767,7 +1769,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Grease Pencil Draw";
 	ot->idname= "GPENCIL_OT_draw";
-	ot->description= "Make annotations on the active data";
+	ot->description= _("Make annotations on the active data");
 	
 	/* api callbacks */
 	ot->exec= gpencil_draw_exec;
@@ -1780,7 +1782,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 	
 	/* settings for drawing */
-	RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements.");
+	RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_gpencil_drawmodes), 0, "Mode", "Way to intepret mouse movements.");
 	
 	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 62043f240e4..fbc0c2ceb3b 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -403,7 +403,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]), "Shortcut: %s", buf);
+			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), _("Shortcut: %s"), buf);
 			data->color[data->totline]= 0x888888;
 			data->totline++;
 		}
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 3985b728c8e..c1f34f15aee 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -300,29 +300,29 @@ 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_LA: return "Browse Lattice 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_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 _("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_LA: return _("Browse Lattice 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_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");
 		}
 	}
-	return "Browse ID data to be linked";
+	return _("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)
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a9fe4ce95e1..57ab39e32b2 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -183,8 +183,8 @@ void ED_object_add_generic_props(wmOperatorType *ot, int do_editmode)
 		RNA_def_property_flag(prop, PROP_HIDDEN);
 	}
 	
-	RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location for the newly added object", -FLT_MAX, FLT_MAX);
-	RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, "Rotation", "Rotation for the newly added object", -FLT_MAX, FLT_MAX);
+	RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Location for the newly added object"), -FLT_MAX, FLT_MAX);
+	RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, _("Rotation"), _("Rotation for the newly added object"), -FLT_MAX, FLT_MAX);
 	
 	prop = RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", "");
 	RNA_def_property_flag(prop, PROP_HIDDEN);
@@ -338,8 +338,8 @@ static int object_add_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Object";
-	ot->description = "Add an object to the scene";
+	ot->name= _("Add Object");
+	ot->description = _("Add an object to the scene");
 	ot->idname= "OBJECT_OT_add";
 	
 	/* api callbacks */
@@ -430,8 +430,8 @@ static int effector_add_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_effector_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Effector";
-	ot->description = "Add an empty object with a physics effector to the scene";
+	ot->name= _("Add Effector");
+	ot->description = _("Add an empty object with a physics effector to the scene");
 	ot->idname= "OBJECT_OT_effector_add";
 	
 	/* api callbacks */
@@ -485,8 +485,8 @@ void OBJECT_OT_camera_add(wmOperatorType *ot)
 	PropertyRNA *prop;
 	
 	/* identifiers */
-	ot->name= "Add Camera";
-	ot->description = "Add a camera object to the scene";
+	ot->name= _("Add Camera");
+	ot->description = _("Add a camera object to the scene");
 	ot->idname= "OBJECT_OT_camera_add";
 	
 	/* api callbacks */
@@ -563,8 +563,8 @@ static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUS
 void OBJECT_OT_metaball_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Metaball";
-	ot->description= "Add an metaball object to the scene";
+	ot->name= _("Add Metaball");
+	ot->description= _("Add an metaball object to the scene");
 	ot->idname= "OBJECT_OT_metaball_add";
 
 	/* api callbacks */
@@ -603,8 +603,8 @@ static int object_add_text_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_text_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Text";
-	ot->description = "Add a text object to the scene";
+	ot->name= _("Add Text");
+	ot->description = _("Add a text object to the scene");
 	ot->idname= "OBJECT_OT_text_add";
 	
 	/* api callbacks */
@@ -772,8 +772,8 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot)
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name= "Add Group Instance";
-	ot->description = "Add a dupligroup instance";
+	ot->name= _("Add Group Instance");
+	ot->description = _("Add a dupligroup instance");
 	ot->idname= "OBJECT_OT_group_instance_add";
 
 	/* api callbacks */
@@ -1704,8 +1704,8 @@ void OBJECT_OT_duplicate(wmOperatorType *ot)
 	PropertyRNA *prop;
 	
 	/* identifiers */
-	ot->name= "Duplicate Objects";
-	ot->description = "Duplicate selected objects";
+	ot->name= _("Duplicate Objects");
+	ot->description = _("Duplicate selected objects");
 	ot->idname= "OBJECT_OT_duplicate";
 	
 	/* api callbacks */
@@ -1775,8 +1775,8 @@ static int add_named_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_add_named(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Named Object";
-	ot->description = "Add named object";
+	ot->name= _("Add Named Object");
+	ot->description = _("Add named object");
 	ot->idname= "OBJECT_OT_add_named";
 	
 	/* api callbacks */
@@ -1882,8 +1882,8 @@ static int join_shapes_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_join_shapes(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Join as Shapes";
-	ot->description = "Merge selected objects to shapes of active object";
+	ot->name= _("Join as Shapes");
+	ot->description = _("Merge selected objects to shapes of active object");
 	ot->idname= "OBJECT_OT_join_shapes";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 1fc7c02fd74..5ee920734bf 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1587,9 +1587,9 @@ static int object_calculate_paths_exec (bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_paths_calculate (wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Calculate Object Paths";
+	ot->name= _("Calculate Object Paths");
 	ot->idname= "OBJECT_OT_paths_calculate";
-	ot->description= "Calculate paths for the selected bones";
+	ot->description= _("Calculate paths for the selected bones");
 	
 	/* api callbacks */
 	ot->exec= object_calculate_paths_exec;
@@ -1633,7 +1633,7 @@ void OBJECT_OT_paths_clear (wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Clear Object Paths";
 	ot->idname= "OBJECT_OT_paths_clear";
-	ot->description= "Clear path caches for selected bones";
+	ot->description= _("Clear path caches for selected bones");
 	
 	/* api callbacks */
 	ot->exec= object_clear_paths_exec;
@@ -1690,8 +1690,8 @@ static int shade_poll(bContext *C)
 void OBJECT_OT_shade_flat(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Shade Flat";
-	ot->description= "Display faces 'smooth' (using vertext normals)";
+	ot->name= _("Shade Flat");
+	ot->description= _("Display faces 'smooth' (using vertext normals)");
 	ot->idname= "OBJECT_OT_shade_flat";
 	
 	/* api callbacks */
@@ -1705,8 +1705,8 @@ void OBJECT_OT_shade_flat(wmOperatorType *ot)
 void OBJECT_OT_shade_smooth(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Shade Smooth";
-	ot->description= "Display faces 'flat'";
+	ot->name= _("Shade Smooth");
+	ot->description= _("Display faces 'flat'");
 	ot->idname= "OBJECT_OT_shade_smooth";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 6a379d1171d..dfe0b6e96bc 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -918,9 +918,9 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 void OBJECT_OT_origin_set(wmOperatorType *ot)
 {
 	static EnumPropertyItem prop_set_center_types[] = {
-		{GEOMETRY_TO_ORIGIN, "GEOMETRY_ORIGIN", 0, "Geometry to Origin", "Move object geometry to object origin"},
-		{ORIGIN_TO_GEOMETRY, "ORIGIN_GEOMETRY", 0, "Origin to Geometry", "Move object origin to center of object geometry"},
-		{ORIGIN_TO_CURSOR, "ORIGIN_CURSOR", 0, "Origin to 3D Cursor", "Move object origin to position of the 3d cursor"},
+		{GEOMETRY_TO_ORIGIN, "GEOMETRY_ORIGIN", 0, N_("Geometry to Origin"), N_("Move object geometry to object origin")},
+		{ORIGIN_TO_GEOMETRY, "ORIGIN_GEOMETRY", 0, N_("Origin to Geometry"), N_("Move object origin to center of object geometry")},
+		{ORIGIN_TO_CURSOR, "ORIGIN_CURSOR", 0, N_("Origin to 3D Cursor"), N_("Move object origin to position of the 3d cursor")},
 		{0, NULL, 0, NULL, NULL}
 	};
 	
@@ -931,8 +931,8 @@ void OBJECT_OT_origin_set(wmOperatorType *ot)
 	};
 	
 	/* identifiers */
-	ot->name= "Set Origin";
-	ot->description = "Set the object's origin, by either moving the data, or set to center of data, or use 3d cursor";
+	ot->name= _("Set Origin");
+	ot->description = _("Set the object's origin, by either moving the data, or set to center of data, or use 3d cursor");
 	ot->idname= "OBJECT_OT_origin_set";
 	
 	/* api callbacks */
@@ -944,7 +944,7 @@ void OBJECT_OT_origin_set(wmOperatorType *ot)
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
-	ot->prop= RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", "");
+	ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_set_center_types), 0, "Type", "");
 	RNA_def_enum(ot->srna, "center", prop_set_bounds_types, V3D_CENTROID, "Center", "");
 }
 
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 1a3e4d8a50f..3c406c80926 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2447,7 +2447,7 @@ static void SCREEN_OT_repeat_history(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Repeat History";
-	ot->description= "Display menu for previous actions performed";
+	ot->description= _("Display menu for previous actions performed");
 	ot->idname= "SCREEN_OT_repeat_history";
 	
 	/* api callbacks */
@@ -3168,7 +3168,7 @@ static void SCREEN_OT_new(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "New Screen";
-	ot->description= "Add a new screen";
+	ot->description= _("Add a new screen");
 	ot->idname= "SCREEN_OT_new";
 	
 	/* api callbacks */
@@ -3193,8 +3193,8 @@ static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op))
 static void SCREEN_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Delete Screen"; //was scene
-	ot->description= "Delete active screen";
+	ot->name= _("Delete Screen"); //was scene
+	ot->description= _("Delete active screen");
 	ot->idname= "SCREEN_OT_delete";
 	
 	/* api callbacks */
@@ -3240,16 +3240,16 @@ static int scene_new_exec(bContext *C, wmOperator *op)
 static void SCENE_OT_new(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[]= {
-		{SCE_COPY_NEW, "NEW", 0, "New", "Add new scene"},
-		{SCE_COPY_EMPTY, "EMPTY", 0, "Copy Settings", "Make a copy without any objects"},
-		{SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, "Link Objects", "Link to the objects from the current scene"},
-		{SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, "Link Object Data", "Copy objects linked to data from the current scene"},
-		{SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy", "Make a full copy of the current scene"},
+		{SCE_COPY_NEW, "NEW", 0, N_("New"), N_("Add new scene")},
+		{SCE_COPY_EMPTY, "EMPTY", 0, N_("Copy Settings"), N_("Make a copy without any objects")},
+		{SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, N_("Link Objects"), N_("Link to the objects from the current scene")},
+		{SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, N_("Link Object Data"), N_("Copy objects linked to data from the current scene")},
+		{SCE_COPY_FULL, "FULL_COPY", 0, N_("Full Copy"), N_("Make a full copy of the current scene")},
 		{0, NULL, 0, NULL, NULL}};
 	
 	/* identifiers */
-	ot->name= "New Scene";
-	ot->description= "Add new scene by type";
+	ot->name= _("New Scene");
+	ot->description= _("Add new scene by type");
 	ot->idname= "SCENE_OT_new";
 	
 	/* api callbacks */
@@ -3260,7 +3260,7 @@ static void SCENE_OT_new(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-	ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
+	ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, "Type", "");
 }
 
 /********************* delete scene operator *********************/
@@ -3277,8 +3277,8 @@ static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op))
 static void SCENE_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Delete Scene";
-	ot->description= "Delete active scene";
+	ot->name= _("Delete Scene");
+	ot->description= _("Delete active scene");
 	ot->idname= "SCENE_OT_delete";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index 0a4f251e46f..71eee0aaeba 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 set(INC
 	../include
+	../../blenfont
 	../../blenkernel
 	../../blenloader
 	../../blenlib
diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript
index a4270f1f59a..740353bc1f0 100644
--- a/source/blender/editors/space_buttons/SConscript
+++ b/source/blender/editors/space_buttons/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna ../../render/extern/include ../../blenloader'
 
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index 99e5c6d693e..346531b2b11 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -43,6 +43,8 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -83,8 +85,8 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(e
 void BUTTONS_OT_toolbox(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Toolbox";
-	ot->description="Display button panel toolbox";
+	ot->name= _("Toolbox");
+	ot->description=_("Display button panel toolbox");
 	ot->idname= "BUTTONS_OT_toolbox";
 	
 	/* api callbacks */
@@ -216,8 +218,8 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void BUTTONS_OT_file_browse(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Accept";
-	ot->description="Open a file browser, Hold Shift to open the file, Alt to browse containing directory";
+	ot->name= _("Accept");
+	ot->description=_("Open a file browser, Hold Shift to open the file, Alt to browse containing directory");
 	ot->idname= "BUTTONS_OT_file_browse";
 	
 	/* api callbacks */
@@ -233,8 +235,8 @@ void BUTTONS_OT_file_browse(wmOperatorType *ot)
 void BUTTONS_OT_directory_browse(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Accept";
-	ot->description="Open a directory browser, Hold Shift to open the file, Alt to browse containing directory";
+	ot->name= _("Accept");
+	ot->description=_("Open a directory browser, Hold Shift to open the file, Alt to browse containing directory");
 	ot->idname= "BUTTONS_OT_directory_browse";
 
 	/* api callbacks */
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 185a13358f3..899442a8d5a 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -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.");
+				 _("File path."));
 		uiButSetCompleteFunc(but, autocomplete_directory, 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");    
+				_("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");    
+				_("Increment the filename number"));    
 		RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1); 
 		uiBlockEndAlign(block);
 	}
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index fc685657253..41d87ac0e08 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -295,8 +295,8 @@ static int file_border_select_exec(bContext *C, wmOperator *op)
 void FILE_OT_select_border(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Activate/Select File";
-	ot->description= "Activate/select the file(s) contained in the border";
+	ot->name= _("Activate/Select File");
+	ot->description= _("Activate/select the file(s) contained in the border");
 	ot->idname= "FILE_OT_select_border";
 	
 	/* api callbacks */
@@ -346,8 +346,8 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 void FILE_OT_select(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Activate/Select File";
-	ot->description= "Activate/select file";
+	ot->name= _("Activate/Select File");
+	ot->description= _("Activate/select file");
 	ot->idname= "FILE_OT_select";
 	
 	/* api callbacks */
@@ -393,8 +393,8 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op))
 void FILE_OT_select_all_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select/Deselect All Files";
-	ot->description= "Select/deselect all files";
+	ot->name= _("Select/Deselect All Files");
+	ot->description= _("Select/deselect all files");
 	ot->idname= "FILE_OT_select_all_toggle";
 	
 	/* api callbacks */
@@ -430,8 +430,8 @@ static int bookmark_select_exec(bContext *C, wmOperator *op)
 void FILE_OT_select_bookmark(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Directory";
-	ot->description= "Select a bookmarked directory";
+	ot->name= _("Select Directory");
+	ot->description= _("Select a bookmarked directory");
 	ot->idname= "FILE_OT_select_bookmark";
 	
 	/* api callbacks */
@@ -463,7 +463,7 @@ static int bookmark_add_exec(bContext *C, wmOperator *UNUSED(op))
 void FILE_OT_bookmark_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Bookmark";
+	ot->name= _("Add Bookmark");
 	ot->description= _("Add a bookmark for the selected/active directory");
 	ot->idname= "FILE_OT_bookmark_add";
 	
@@ -496,8 +496,8 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op)
 void FILE_OT_delete_bookmark(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Delete Bookmark";
-	ot->description= "Delete selected bookmark";
+	ot->name= _("Delete Bookmark");
+	ot->description= _("Delete selected bookmark");
 	ot->idname= "FILE_OT_delete_bookmark";
 	
 	/* api callbacks */
@@ -558,8 +558,8 @@ static int file_highlight_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *e
 void FILE_OT_highlight(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Highlight File";
-	ot->description= "Highlight selected file(s)";
+	ot->name= _("Highlight File");
+	ot->description= _("Highlight selected file(s)");
 	ot->idname= "FILE_OT_highlight";
 	
 	/* api callbacks */
@@ -592,8 +592,8 @@ static int file_operator_poll(bContext *C)
 void FILE_OT_cancel(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Cancel File Load";
-	ot->description= "Cancel loading of selected file";
+	ot->name= _("Cancel File Load");
+	ot->description= _("Cancel loading of selected file");
 	ot->idname= "FILE_OT_cancel";
 	
 	/* api callbacks */
@@ -752,8 +752,8 @@ int file_exec(bContext *C, wmOperator *exec_op)
 void FILE_OT_execute(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Execute File Window";
-	ot->description= "Execute selected file";
+	ot->name= _("Execute File Window");
+	ot->description= _("Execute selected file");
 	ot->idname= "FILE_OT_execute";
 	
 	/* api callbacks */
@@ -785,8 +785,8 @@ int file_parent_exec(bContext *C, wmOperator *UNUSED(unused))
 void FILE_OT_parent(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Parent File";
-	ot->description= "Move to parent directory";
+	ot->name= _("Parent File");
+	ot->description= _("Move to parent directory");
 	ot->idname= "FILE_OT_parent";
 	
 	/* api callbacks */
@@ -810,8 +810,8 @@ static int file_refresh_exec(bContext *C, wmOperator *UNUSED(unused))
 void FILE_OT_previous(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Previous Folder";
-	ot->description= "Move to previous folder";
+	ot->name= _("Previous Folder");
+	ot->description= _("Move to previous folder");
 	ot->idname= "FILE_OT_previous";
 	
 	/* api callbacks */
@@ -841,8 +841,8 @@ int file_previous_exec(bContext *C, wmOperator *UNUSED(unused))
 void FILE_OT_next(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Next Folder";
-	ot->description= "Move to next folder";
+	ot->name= _("Next Folder");
+	ot->description= _("Move to next folder");
 	ot->idname= "FILE_OT_next";
 	
 	/* api callbacks */
@@ -968,9 +968,9 @@ void FILE_OT_smoothscroll(wmOperatorType *ot)
 {
 	
 	/* identifiers */
-	ot->name= "Smooth Scroll";
+	ot->name= _("Smooth Scroll");
 	ot->idname= "FILE_OT_smoothscroll";
-	ot->description="Smooth scroll to make editable file visible.";
+	ot->description=_("Smooth scroll to make editable file visible.");
 	
 	/* api callbacks */
 	ot->invoke= file_smoothscroll_invoke;
@@ -1192,8 +1192,8 @@ static int file_hidedot_exec(bContext *C, wmOperator *UNUSED(unused))
 void FILE_OT_hidedot(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Toggle Hide Dot Files";
-	ot->description= "Toggle hide hidden dot files";
+	ot->name= _("Toggle Hide Dot Files");
+	ot->description= _("Toggle hide hidden dot files");
 	ot->idname= "FILE_OT_hidedot";
 	
 	/* api callbacks */
@@ -1242,8 +1242,8 @@ static int file_bookmark_toggle_exec(bContext *C, wmOperator *UNUSED(unused))
 void FILE_OT_bookmark_toggle(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Toggle Bookmarks";
-	ot->description= "Toggle bookmarks display";
+	ot->name= _("Toggle Bookmarks");
+	ot->description= _("Toggle bookmarks display");
 	ot->idname= "FILE_OT_bookmark_toggle";
 	
 	/* api callbacks */
@@ -1272,8 +1272,8 @@ static int file_filenum_exec(bContext *C, wmOperator *op)
 void FILE_OT_filenum(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Increment Number in Filename";
-	ot->description= "Increment number in filename";
+	ot->name= _("Increment Number in Filename");
+	ot->description= _("Increment number in filename");
 	ot->idname= "FILE_OT_filenum";
 	
 	/* api callbacks */
@@ -1326,8 +1326,8 @@ static int file_rename_poll(bContext *C)
 void FILE_OT_rename(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Rename File or Directory";
-	ot->description= "Rename file or file directory";
+	ot->name= _("Rename File or Directory");
+	ot->description= _("Rename file or file directory");
 	ot->idname= "FILE_OT_rename";
 	
 	/* api callbacks */
@@ -1378,8 +1378,8 @@ int file_delete_exec(bContext *C, wmOperator *UNUSED(op))
 void FILE_OT_delete(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Delete File";
-	ot->description= "Delete selected file";
+	ot->name= _("Delete File");
+	ot->description= _("Delete selected file");
 	ot->idname= "FILE_OT_delete";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c
index 0fb17498443..1fef6d3846e 100644
--- a/source/blender/editors/space_info/info_ops.c
+++ b/source/blender/editors/space_info/info_ops.c
@@ -412,7 +412,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm
 void INFO_OT_reports_display_update(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Update Reports Display";
+	ot->name= _("Update Reports Display");
 	ot->idname= "INFO_OT_reports_display_update";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index ea3263e0021..1ec4d42d453 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -450,7 +450,7 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	 * in order to not overflow short tselem->nr */
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_COMBINED));
-	te->name= "Combined";
+	te->name= _("Combined");
 	te->directdata= &srl->passflag;
 	
 	/* save cpu cycles, but we add the first to invoke an open/close triangle */
@@ -463,11 +463,11 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_VECTOR));
-	te->name= "Vector";
+	te->name= _("Vector");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_NORMAL));
-	te->name= "Normal";
+	te->name= _("Normal");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_UV));
@@ -475,27 +475,27 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_MIST));
-	te->name= "Mist";
+	te->name= _("Mist");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXOB));
-	te->name= "Index Object";
+	te->name= _("Index Object");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_RGBA));
-	te->name= "Color";
+	te->name= _("Color");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_DIFFUSE));
-	te->name= "Diffuse";
+	te->name= _("Diffuse");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SPEC));
-	te->name= "Specular";
+	te->name= _("Specular");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SHADOW));
-	te->name= "Shadow";
+	te->name= _("Shadow");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_AO));
@@ -503,23 +503,23 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFLECT));
-	te->name= "Reflection";
+	te->name= _("Reflection");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFRACT));
-	te->name= "Refraction";
+	te->name= _("Refraction");
 	te->directdata= &srl->passflag;
 	
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDIRECT));
-	te->name= "Indirect";
+	te->name= _("Indirect");
 	te->directdata= &srl->passflag;
 
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_ENVIRONMENT));
-	te->name= "Environment";
+	te->name= _("Environment");
 	te->directdata= &srl->passflag;
 
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_EMIT));
-	te->name= "Emit";
+	te->name= _("Emit");
 	te->directdata= &srl->passflag;
 }
 
@@ -546,7 +546,7 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s
 	TreeElement *tenla= outliner_add_element(soops, lb, sce, te, TSE_R_LAYER_BASE, 0);
 	int a;
 	
-	tenla->name= "RenderLayers";
+	tenla->name= _("RenderLayers");
 	for(a=0, srl= sce->r.layers.first; srl; srl= srl->next, a++) {
 		TreeElement *tenlay= outliner_add_element(soops, &tenla->subtree, sce, te, TSE_R_LAYER, a);
 		tenlay->name= srl->name;
@@ -2814,9 +2814,9 @@ static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 void OUTLINER_OT_show_active(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Show Active";
+	ot->name= _("Show Active");
 	ot->idname= "OUTLINER_OT_show_active";
-	ot->description= "Adjust the view so that the active Object is shown centered";
+	ot->description= _("Adjust the view so that the active Object is shown centered");
 	
 	/* callbacks */
 	ot->exec= outliner_show_active_exec;
@@ -3044,9 +3044,9 @@ static int outliner_show_hierarchy_exec(bContext *C, wmOperator *UNUSED(op))
 void OUTLINER_OT_show_hierarchy(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Show Hierarchy";
+	ot->name= _("Show Hierarchy");
 	ot->idname= "OUTLINER_OT_show_hierarchy";
-	ot->description= "Open all object entries and close all others";
+	ot->description= _("Open all object entries and close all others");
 	
 	/* callbacks */
 	ot->exec= outliner_show_hierarchy_exec;
diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt
index 79081c7cfd4..965f7e541b8 100644
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ b/source/blender/editors/space_time/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 set(INC
 	../include
+	../../blenfont
 	../../blenkernel
 	../../blenloader
 	../../blenlib
diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript
index c08339ba692..ec59d774f65 100644
--- a/source/blender/editors/space_time/SConscript
+++ b/source/blender/editors/space_time/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna ../../blenloader'
 
diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c
index e9559426b81..b6a3afb23ca 100644
--- a/source/blender/editors/space_time/time_ops.c
+++ b/source/blender/editors/space_time/time_ops.c
@@ -39,6 +39,8 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 #include "BKE_context.h"
 
 #include "ED_screen.h"
@@ -161,9 +163,9 @@ static int time_view_all_exec (bContext *C, wmOperator *UNUSED(op))
 static void TIME_OT_view_all (wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "View All";
+	ot->name= _("View All");
 	ot->idname= "TIME_OT_view_all";
-	ot->description= "Show the entire playable frame range";
+	ot->description= _("Show the entire playable frame range");
 	
 	/* api callbacks */
 	ot->exec= time_view_all_exec;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 033d9cd4312..1f3fed02c85 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -917,8 +917,8 @@ void VIEW3D_OT_rotate(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name= "Rotate view";
-	ot->description = "Rotate the view";
+	ot->name= _("Rotate view");
+	ot->description = _("Rotate the view");
 	ot->idname= "VIEW3D_OT_rotate";
 
 	/* api callbacks */
@@ -1079,8 +1079,8 @@ void VIEW3D_OT_move(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name= "Move view";
-	ot->description = "Move the view";
+	ot->name= _("Move view");
+	ot->description = _("Move the view");
 	ot->idname= "VIEW3D_OT_move";
 
 	/* api callbacks */
@@ -1442,8 +1442,8 @@ static int viewzoom_cancel(bContext *C, wmOperator *op)
 void VIEW3D_OT_zoom(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Zoom View";
-	ot->description = "Zoom in/out in the view";
+	ot->name= _("Zoom View");
+	ot->description = _("Zoom in/out in the view");
 	ot->idname= "VIEW3D_OT_zoom";
 
 	/* api callbacks */
@@ -1676,8 +1676,8 @@ static int viewdolly_cancel(bContext *C, wmOperator *op)
 void VIEW3D_OT_dolly(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Dolly view";
-	ot->description = "Dolly in/out in the view";
+	ot->name= _("Dolly view");
+	ot->description = _("Dolly in/out in the view");
 	ot->idname= "VIEW3D_OT_dolly";
 
 	/* api callbacks */
@@ -2006,8 +2006,8 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was
 void VIEW3D_OT_view_center_camera(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "View Camera Center";
-	ot->description = "Center the camera view";
+	ot->name= _("View Camera Center");
+	ot->description = _("Center the camera view");
 	ot->idname= "VIEW3D_OT_view_center_camera";
 
 	/* api callbacks */
@@ -2071,8 +2071,8 @@ static int render_border_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_render_border(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Set Render Border";
-	ot->description = "Set the boundaries of the border render and enables border render ";
+	ot->name= _("Set Render Border");
+	ot->description = _("Set the boundaries of the border render and enables border render ");
 	ot->idname= "VIEW3D_OT_render_border";
 
 	/* api callbacks */
@@ -2227,8 +2227,8 @@ static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent *event
 void VIEW3D_OT_zoom_border(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Border Zoom";
-	ot->description = "Zoom in the view to the nearest object contained in the border";
+	ot->name= _("Border Zoom");
+	ot->description = _("Zoom in the view to the nearest object contained in the border");
 	ot->idname= "VIEW3D_OT_zoom_border";
 
 	/* api callbacks */
@@ -2278,8 +2278,8 @@ static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op))
 void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Zoom Camera 1:1";
-	ot->description = "Match the camera to 1:1 to the render output";
+	ot->name= _("Zoom Camera 1:1");
+	ot->description = _("Match the camera to 1:1 to the render output");
 	ot->idname= "VIEW3D_OT_zoom_camera_1_to_1";
 
 	/* api callbacks */
@@ -2293,13 +2293,13 @@ void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot)
 /* ********************* Changing view operator ****************** */
 
 static EnumPropertyItem prop_view_items[] = {
-	{RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"},
-	{RV3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"},
-	{RV3D_VIEW_LEFT, "LEFT", 0, "Left", "View From the Left"},
-	{RV3D_VIEW_RIGHT, "RIGHT", 0, "Right", "View From the Right"},
-	{RV3D_VIEW_TOP, "TOP", 0, "Top", "View From the Top"},
-	{RV3D_VIEW_BOTTOM, "BOTTOM", 0, "Bottom", "View From the Bottom"},
-	{RV3D_VIEW_CAMERA, "CAMERA", 0, "Camera", "View From the active amera"},
+	{RV3D_VIEW_FRONT, "FRONT", 0, N_("Front"), N_("View From the Front")},
+	{RV3D_VIEW_BACK, "BACK", 0, N_("Back"), N_("View From the Back")},
+	{RV3D_VIEW_LEFT, "LEFT", 0, N_("Left"), N_("View From the Left")},
+	{RV3D_VIEW_RIGHT, "RIGHT", 0, N_("Right"), N_("View From the Right")},
+	{RV3D_VIEW_TOP, "TOP", 0, N_("Top"), N_("View From the Top")},
+	{RV3D_VIEW_BOTTOM, "BOTTOM", 0, N_("Bottom"), N_("View From the Bottom")},
+	{RV3D_VIEW_CAMERA, "CAMERA", 0, N_("Camera"), N_("View From the active amera")},
 	{0, NULL, 0, NULL, NULL}};
 
 
@@ -2569,8 +2569,8 @@ static int vieworbit_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_view_orbit(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "View Orbit";
-	ot->description = "Orbit the view";
+	ot->name= _("View Orbit");
+	ot->description = _("Orbit the view");
 	ot->idname= "VIEW3D_OT_view_orbit";
 
 	/* api callbacks */
@@ -2617,8 +2617,8 @@ static int viewpan_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_view_pan(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "View Pan";
-	ot->description = "Pan the view";
+	ot->name= _("View Pan");
+	ot->description = _("Pan the view");
 	ot->idname= "VIEW3D_OT_view_pan";
 
 	/* api callbacks */
@@ -2726,8 +2726,8 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNU
 void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Add Background Image";
-	ot->description= "Add a new background image";
+	ot->name   = _("Add Background Image");
+	ot->description= _("Add a new background image");
 	ot->idname = "VIEW3D_OT_background_image_add";
 
 	/* api callbacks */
@@ -2739,8 +2739,8 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot)
 	ot->flag   = 0;
 	
 	/* 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"));
 }
 
 
@@ -2767,8 +2767,8 @@ static int background_image_remove_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Remove Background Image";
-	ot->description= "Remove a background image from the 3D view";
+	ot->name   = _("Remove Background Image");
+	ot->description= _("Remove a background image from the 3D view");
 	ot->idname = "VIEW3D_OT_background_image_remove";
 
 	/* api callbacks */
@@ -2866,8 +2866,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name= "Clipping Border";
-	ot->description = "Set the view clipping border";
+	ot->name= _("Clipping Border");
+	ot->description = _("Set the view clipping border");
 	ot->idname= "VIEW3D_OT_clip_border";
 
 	/* api callbacks */
@@ -2959,8 +2959,8 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name= "Set 3D Cursor";
-	ot->description = "Set the location of the 3D cursor";
+	ot->name= _("Set 3D Cursor");
+	ot->description = _("Set the location of the 3D cursor");
 	ot->idname= "VIEW3D_OT_cursor3d";
 
 	/* api callbacks */
@@ -3001,8 +3001,8 @@ void VIEW3D_OT_manipulator(wmOperatorType *ot)
 {
 
 	/* identifiers */
-	ot->name= "3D Manipulator";
-	ot->description = "Manipulate selected item by axis";
+	ot->name= _("3D Manipulator");
+	ot->description = _("Manipulate selected item by axis");
 	ot->idname= "VIEW3D_OT_manipulator";
 
 	/* api callbacks */
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 56ea3e8abd3..32c2ba32b93 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -278,9 +278,9 @@ static char *view3d_modeselect_pup(Scene *scene)
 	static char formatstr[] = "|%s %%x%d %%i%d";
 	char *str = string;
 
-	str += sprintf(str, "Mode: %%t");
+	str += sprintf(str, _("Mode: %%t"));
 	
-	str += sprintf(str, formatstr, "Object Mode", OB_MODE_OBJECT, ICON_OBJECT_DATA);
+	str += sprintf(str, formatstr, _("Object Mode"), OB_MODE_OBJECT, ICON_OBJECT_DATA);
 	
 	if(ob==NULL) return string;
 	
@@ -289,31 +289,31 @@ static char *view3d_modeselect_pup(Scene *scene)
 		|| (ob->type == OB_CURVE) || (ob->type == OB_SURF) || (ob->type == OB_FONT)
 		|| (ob->type == OB_MBALL) || (ob->type == OB_LATTICE))) {
 		
-		str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT, ICON_EDITMODE_HLT);
+		str += sprintf(str, formatstr, _("Edit Mode"), OB_MODE_EDIT, ICON_EDITMODE_HLT);
 	}
 	else if (ob->type == OB_ARMATURE) {
 		if (ob->mode & OB_MODE_POSE)
-			str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT|OB_MODE_POSE, ICON_EDITMODE_HLT);
+			str += sprintf(str, formatstr, _("Edit Mode"), OB_MODE_EDIT|OB_MODE_POSE, ICON_EDITMODE_HLT);
 		else
-			str += sprintf(str, formatstr, "Edit Mode", OB_MODE_EDIT, ICON_EDITMODE_HLT);
+			str += sprintf(str, formatstr, _("Edit Mode"), OB_MODE_EDIT, ICON_EDITMODE_HLT);
 	}
 
 	if (ob->type == OB_MESH) {
 
-		str += sprintf(str, formatstr, "Sculpt Mode", OB_MODE_SCULPT, ICON_SCULPTMODE_HLT);
-		str += sprintf(str, formatstr, "Vertex Paint", OB_MODE_VERTEX_PAINT, ICON_VPAINT_HLT);
-		str += sprintf(str, formatstr, "Texture Paint", OB_MODE_TEXTURE_PAINT, ICON_TPAINT_HLT);
-		str += sprintf(str, formatstr, "Weight Paint", OB_MODE_WEIGHT_PAINT, ICON_WPAINT_HLT);
+		str += sprintf(str, formatstr, _("Sculpt Mode"), OB_MODE_SCULPT, ICON_SCULPTMODE_HLT);
+		str += sprintf(str, formatstr, _("Vertex Paint"), OB_MODE_VERTEX_PAINT, ICON_VPAINT_HLT);
+		str += sprintf(str, formatstr, _("Texture Paint"), OB_MODE_TEXTURE_PAINT, ICON_TPAINT_HLT);
+		str += sprintf(str, formatstr, _("Weight Paint"), OB_MODE_WEIGHT_PAINT, ICON_WPAINT_HLT);
 	}
 
 	
 	/* if active object is an armature */
 	if (ob->type==OB_ARMATURE) {
-		str += sprintf(str, formatstr, "Pose Mode", OB_MODE_POSE, ICON_POSE_HLT);
+		str += sprintf(str, formatstr, _("Pose Mode"), OB_MODE_POSE, ICON_POSE_HLT);
 	}
 
 	if (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) || modifiers_findByType(ob, eModifierType_Softbody)) {
-		str += sprintf(str, formatstr, "Particle Mode", OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE);
+		str += sprintf(str, formatstr, _("Particle Mode"), OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE);
 	}
 	(void)str;
 	return (string);
@@ -487,7 +487,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
 	uiBlockBeginAlign(block);
 	uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) , 
-			  0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, "Mode");
+			  0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, _("Mode"));
 	uiBlockEndAlign(block);
 	
 	/* Draw type */
@@ -524,17 +524,17 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 		block= uiLayoutGetBlock(row);
 		
 		if(v3d->twflag & V3D_USE_MANIPULATOR) {
-			uiDefIconButBitC(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, "Translate manipulator mode");
-			uiDefIconButBitC(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, "Rotate manipulator mode");
-			uiDefIconButBitC(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, "Scale manipulator mode");
+			uiDefIconButBitC(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, _("Translate manipulator mode"));
+			uiDefIconButBitC(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, _("Rotate manipulator mode"));
+			uiDefIconButBitC(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, _("Scale manipulator mode"));
 		}
 			
 		if (v3d->twmode > (BIF_countTransformOrientation(C) - 1) + V3D_MANIP_CUSTOM) {
 			v3d->twmode = 0;
 		}
 			
-		str_menu = BIF_menustringTransformOrientation(C, "Orientation");
-		uiDefButC(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac, UI_UNIT_Y, &v3d->twmode, 0, 0, 0, 0, "Transform Orientation");
+		str_menu = BIF_menustringTransformOrientation(C, _("Orientation"));
+		uiDefButC(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac, UI_UNIT_Y, &v3d->twmode, 0, 0, 0, 0, _("Transform Orientation"));
 		MEM_freeN((void *)str_menu);
 	}
 
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index eaae865156e..9c7462ea747 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -358,9 +358,9 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot)
 {
 	
 	/* identifiers */
-	ot->name= "Smooth View";
+	ot->name= _("Smooth View");
 	ot->idname= "VIEW3D_OT_smoothview";
-	ot->description="The time to animate the change of view (in milliseconds)";
+	ot->description=_("The time to animate the change of view (in milliseconds)");
 	
 	/* api callbacks */
 	ot->invoke= view3d_smoothview_invoke;
@@ -408,8 +408,8 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot)
 {
 	
 	/* identifiers */
-	ot->name= "Align Camera To View";
-	ot->description= "Set camera view to active view";
+	ot->name= _("Align Camera To View");
+	ot->description= _("Set camera view to active view");
 	ot->idname= "VIEW3D_OT_camera_to_view";
 	
 	/* api callbacks */
@@ -1611,7 +1611,7 @@ void VIEW3D_OT_localview(wmOperatorType *ot)
 {
 	
 	/* identifiers */
-	ot->name= "Local View";
+	ot->name= _("Local View");
 	ot->description= _("Toggle display of selected object(s) separately and centered in view");
 	ot->idname= "VIEW3D_OT_localview";
 	
@@ -1837,8 +1837,8 @@ void VIEW3D_OT_game_start(wmOperatorType *ot)
 {
 	
 	/* identifiers */
-	ot->name= "Start Game Engine";
-	ot->description= "Start game engine";
+	ot->name= _("Start Game Engine");
+	ot->description= _("Start game engine");
 	ot->idname= "VIEW3D_OT_game_start";
 	
 	/* api callbacks */
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 861feb73f48..bb2ba654d9c 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -217,7 +217,7 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot)
 	ot->poll   = ED_operator_view3d_active;
 
 	prop= RNA_def_property(ot->srna, "orientation", PROP_ENUM, PROP_NONE);
-	RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation");
+	RNA_def_property_ui_text(prop, _("Orientation"), _("Transformation orientation"));
 	RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf);
 }
 
@@ -526,8 +526,8 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot)
 void TRANSFORM_OT_resize(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Resize";
-	ot->description= "Resize selected items"; 
+	ot->name   = _("Resize");
+	ot->description= _("Resize selected items");
 	ot->idname = OP_RESIZE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -547,8 +547,8 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot)
 void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Trackball";
-	ot->description= "Trackball style rotation of selected items";
+	ot->name   = _("Trackball");
+	ot->description= _("Trackball style rotation of selected items");
 	ot->idname = OP_TRACKBALL;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -587,11 +587,11 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
 void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Tilt";
+	ot->name   = _("Tilt");
 	/*optionals - 
 		"Tilt selected vertices."
 		"Specify an extra axis rotation for selected vertices of 3d curve." */
-	ot->description= "Tilt selected control vertices of 3d curve"; 
+	ot->description= _("Tilt selected control vertices of 3d curve");
 	ot->idname = OP_TILT;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -610,8 +610,8 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
 void TRANSFORM_OT_warp(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Warp";
-	ot->description= "Warp selected items around the cursor";
+	ot->name   = _("Warp");
+	ot->description= _("Warp selected items around the cursor");
 	ot->idname = OP_WARP;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -631,8 +631,8 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot)
 void TRANSFORM_OT_shear(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Shear";
-	ot->description= "Shear selected items along the horizontal screen axis";
+	ot->name   = _("Shear");
+	ot->description= _("Shear selected items along the horizontal screen axis");
 	ot->idname = OP_SHEAR;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -652,8 +652,8 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot)
 void TRANSFORM_OT_push_pull(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Push/Pull";
-	ot->description= "Push/Pull selected items";
+	ot->name   = _("Push/Pull");
+	ot->description= _("Push/Pull selected items");
 	ot->idname = OP_PUSH_PULL;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -672,8 +672,8 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot)
 void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Shrink/Fatten";
-	ot->description= "Shrink/fatten selected vertices along normals";
+	ot->name   = _("Shrink/Fatten");
+	ot->description= _("Shrink/fatten selected vertices along normals");
 	ot->idname = OP_SHRINK_FATTEN;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -692,9 +692,9 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
 void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "To Sphere";
+	ot->name   = _("To Sphere");
 	//added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()" 
-	ot->description= "Move selected vertices outward in a spherical shape around mesh center";
+	ot->description= _("Move selected vertices outward in a spherical shape around mesh center");
 	ot->idname = OP_TOSPHERE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -713,8 +713,8 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Mirror";
-	ot->description= "Mirror selected vertices around one or more axes";
+	ot->name   = _("Mirror");
+	ot->description= _("Mirror selected vertices around one or more axes");
 	ot->idname = OP_MIRROR;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -731,8 +731,8 @@ void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
 void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Edge Slide";
-	ot->description= "Slide an edge loop along a mesh"; 
+	ot->name   = _("Edge Slide");
+	ot->description= _("Slide an edge loop along a mesh");
 	ot->idname = OP_EDGE_SLIDE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -751,8 +751,8 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
 void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Edge Crease";
-	ot->description= "Change the crease of edges";
+	ot->name   = _("Edge Crease");
+	ot->description= _("Change the crease of edges");
 	ot->idname = OP_EDGE_CREASE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -771,8 +771,8 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot)
 void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name   = "Sequence Slide";
-	ot->description= "Slide a sequence strip in time";
+	ot->name   = _("Sequence Slide");
+	ot->description= _("Slide a sequence strip in time");
 	ot->idname = OP_SEQ_SLIDE;
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
@@ -793,8 +793,8 @@ void TRANSFORM_OT_transform(struct wmOperatorType *ot)
 	PropertyRNA *prop;
 
 	/* identifiers */
-	ot->name   = "Transform";
-	ot->description= "Transform selected items by mode type";
+	ot->name   = _("Transform");
+	ot->description= _("Transform selected items by mode type");
 	ot->idname = "TRANSFORM_OT_transform";
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
 
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 2d539055db3..35053cf3b97 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -49,6 +49,8 @@
 #include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_api.h"
+
 //#include "BIF_editmesh.h"
 //#include "BIF_interface.h"
 //#include "BIF_space.h"
@@ -407,14 +409,14 @@ EnumPropertyItem *BIF_enumTransformOrientation(bContext *C)
 }
 
 const char * BIF_menustringTransformOrientation(const bContext *C, const char *title) {
-	char menu[] = "%t|Global%x0|Local%x1|Gimbal%x4|Normal%x2|View%x3";
+	char* menu = _("%t|Global%x0|Local%x1|Gimbal%x4|Normal%x2|View%x3");
 	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
 	TransformOrientation *ts;
 	int i = V3D_MANIP_CUSTOM;
 	char *str_menu, *p;
 	
 	
-	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), _("UserTransSpace from matrix"));
 	p = str_menu;
 	
 	p += sprintf(str_menu, "%s", title);