Merge commit 'upstream/ui-rf'

Conflicts:
	debug_toolbar/templates/debug_toolbar/panels/headers.html
	debug_toolbar/templates/debug_toolbar/panels/logger.html
	debug_toolbar/templates/debug_toolbar/panels/request_vars.html
	debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
	debug_toolbar/templates/debug_toolbar/panels/signals.html
	debug_toolbar/templates/debug_toolbar/panels/sql.html
	debug_toolbar/templates/debug_toolbar/panels/template_source.html
	debug_toolbar/templates/debug_toolbar/panels/timer.html

1 files changed, 2 insertions, 2 deletions

diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 4ff68db..4e390f6 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -4,9 +4,9 @@ except ImportError:
     pass # Will fail on Win32 systems
 import time
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
-
 class TimerDebugPanel(DebugPanel):
     """
     Panel that displays the time a response took in milliseconds.
@@ -32,7 +32,7 @@ class TimerDebugPanel(DebugPanel):
             self._end_rusage = resource.getrusage(resource.RUSAGE_SELF)
 
     def nav_title(self):
-        return 'Time'
+        return _('Time')
 
     def nav_subtitle(self):
         if self.has_resource: