Merge with trunk r40409

1 files changed, 12 insertions, 11 deletions

diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 396ad035f31..afcc4d250e2 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -19,6 +19,7 @@
 # <pep8 compliant>
 import bpy
 from bpy.types import Header, Menu
+from blf import gettext as _
 
 
 class TIME_HT_header(Header):
@@ -43,11 +44,11 @@ class TIME_HT_header(Header):
 
         row = layout.row(align=True)
         if not scene.use_preview_range:
-            row.prop(scene, "frame_start", text="Start")
-            row.prop(scene, "frame_end", text="End")
+            row.prop(scene, "frame_start", text=_("Start"))
+            row.prop(scene, "frame_end", text=_("End"))
         else:
-            row.prop(scene, "frame_preview_start", text="Start")
-            row.prop(scene, "frame_preview_end", text="End")
+            row.prop(scene, "frame_preview_start", text=_("Start"))
+            row.prop(scene, "frame_preview_end", text=_("End"))
 
         layout.prop(scene, "frame_current", text="")
 
@@ -143,14 +144,14 @@ class TIME_MT_frame(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("marker.add", text="Add Marker")
-        layout.operator("marker.duplicate", text="Duplicate Marker")
-        layout.operator("marker.delete", text="Delete Marker")
+        layout.operator("marker.add", text=_("Add Marker"))
+        layout.operator("marker.duplicate", text=_("Duplicate Marker"))
+        layout.operator("marker.delete", text=_("Delete Marker"))
 
         layout.separator()
 
-        layout.operator("marker.rename", text="Rename Marker")
-        layout.operator("marker.move", text="Grab/Move Marker")
+        layout.operator("marker.rename", text=_("Rename Marker"))
+        layout.operator("marker.move", text=_("Grab/Move Marker"))
 
         layout.separator()
 
@@ -182,8 +183,8 @@ class TIME_MT_playback(Menu):
 
         layout.separator()
 
-        layout.prop(scene, "use_frame_drop", text="Frame Dropping")
-        layout.prop(scene, "use_audio_sync", text="AV-sync", icon='SPEAKER')
+        layout.prop(scene, "use_frame_drop", text=_("Frame Dropping"))
+        layout.prop(scene, "use_audio_sync", text=_("AV-sync"), icon='SPEAKER')
         layout.prop(scene, "use_audio")
         layout.prop(scene, "use_audio_scrub")