Merge commit 'percy/master' into ui-rf

17 files changed, 52 insertions, 17 deletions

diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo
index a09808b..98e8c4d 100644
--- a/debug_toolbar/locale/es/LC_MESSAGES/django.mo
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po
index 2d4c199..66a9d72 100644
--- a/debug_toolbar/locale/es/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po
@@ -18,6 +18,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: panels/logger.py:56
+msgid "Logging"
+msgstr "Registros"
+
+#: panels/settings_vars.py:16
+msgid "Settings"
+msgstr "Configuraciones"
+
+#: panels/signals.py:39
+msgid "Signals"
+msgstr "Señales"
+
+#: panels/template.py:46
+msgid "Templates"
+msgstr "Plantillas"
+
+#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39
+#: templates/debug_toolbar/panels/logger.html:8
+#: templates/debug_toolbar/panels/sql.html:6
+#: templates/debug_toolbar/panels/sql_explain.html:7
+#: templates/debug_toolbar/panels/sql_profile.html:7
+#: templates/debug_toolbar/panels/sql_select.html:7
+msgid "Time"
+msgstr "Tiempo"
+
+#: panels/version.py:12
+msgid "Django Version"
+msgstr "Versión Django"
+
 #: templates/debug_toolbar/base.html:24
 msgid "Hide"
 msgstr "Ocultar"
@@ -162,7 +191,7 @@ msgstr "SQL Ejecutado"
 msgid "Empty set"
 msgstr "Set Vacío"
 
-#: templates/debug_toolbar/panels/templates.html:14
+#: templates/debug_toolbar/panels/templates.html:15
 msgid "Template"
 msgstr "Plantilla"
 
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index 7ba1686..a16b933 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -5,6 +5,7 @@ try:
 except ImportError:
     threading = None
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class ThreadTrackingHandler(logging.Handler):
@@ -52,7 +53,7 @@ class LoggingPanel(DebugPanel):
         return records
 
     def nav_title(self):
-        return "Logging"
+        return _("Logging")
 
     def nav_subtitle(self):
         return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index 0b7c315..f30f601 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -1,8 +1,10 @@
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.views.debug import get_safe_settings
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
+
 class SettingsVarsDebugPanel(DebugPanel):
     """
     A panel to display all variables in django.conf.settings
@@ -11,7 +13,7 @@ class SettingsVarsDebugPanel(DebugPanel):
     has_content = True
 
     def nav_title(self):
-        return 'Settings'
+        return _('Settings')
 
     def title(self):
         return 'Settings from <code>%s</code>' % settings.SETTINGS_MODULE
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index a922694..56fbfd4 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -7,6 +7,7 @@ from django.db.models.signals import class_prepared, pre_init, post_init, \
     pre_save, post_save, pre_delete, post_delete, post_syncdb
 from django.dispatch.dispatcher import WEAKREF_TYPES
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 
 try:
     from django.db.backends.signals import connection_created
@@ -35,7 +36,7 @@ class SignalDebugPanel(DebugPanel):
     }
 
     def nav_title(self):
-        return "Signals"
+        return _("Signals")
 
     def title(self):
         return "Signals"
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'
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:
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index 083b9cf..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):
@@ -8,7 +9,7 @@ class VersionDebugPanel(DebugPanel):
     name = 'Version'
 
     def nav_title(self):
-        return 'Django Version'
+        return _('Django Version')
 
     def nav_subtitle(self):
         return django.get_version()
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index 957a021..3aafb3e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -16,4 +16,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 515742c..736c676 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -24,4 +24,4 @@
 	{% else %}
 		<p>{% trans "No messages logged" %}.</p>
 	{% endif %}
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index b1d7233..7f5e33f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -101,4 +101,4 @@
 	{% else %}
 		<p>{% trans "No POST data" %}</p>
 	{% endif %}
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1591966..6d9cf2a 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -16,4 +16,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index 94414ea..2b95d52 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -18,4 +18,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index aecfad6..8d1fefc 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -48,4 +48,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 8e8253d..dd23fa3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -11,4 +11,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 9fd479f..d25f051 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -20,4 +20,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index 1128cea..d0d9b35 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -8,7 +8,7 @@
 <p class="notice">
 	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for
 	debug viewing purposes.  You can click the above link to continue with the
-	redirect as normal.  If you'd like to disable this feature, set the
+	redirect as normal.  If you'd like to disable this feature, set the" %}
 	<code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key
 	<code>INTERCEPT_REDIRECTS</code> to <code>False</code>." %}
 </p>