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, 1 deletions

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 8c6a972..391902f 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -7,6 +7,7 @@ from django.dispatch import Signal
 from django.template.context import get_standard_processors
 from django.template.loader import render_to_string
 from django.test.signals import template_rendered
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 # Code taken and adapted from Simon Willison and Django Snippets:
@@ -42,7 +43,7 @@ class TemplateDebugPanel(DebugPanel):
         self.templates.append(kwargs)
 
     def nav_title(self):
-        return 'Templates'
+        return _('Templates')
 
     def title(self):
         return 'Templates'