handle merge conflicts

1 files changed, 7 insertions, 3 deletions

diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index 7ea6543..3d82dd0 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -1,4 +1,5 @@
 import django
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class VersionDebugPanel(DebugPanel):
@@ -6,9 +7,12 @@ class VersionDebugPanel(DebugPanel):
     Panel that displays the Django version.
     """
     name = 'Version'
-    
-    def title(self):
-        return 'Version: %s' % (django.get_version())
+
+    def nav_title(self):
+        return _('Django Version')
+
+    def nav_subtitle(self):
+        return django.get_version()
 
     def url(self):
         return ''