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

12 files changed, 409 insertions, 40 deletions

diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.po b/debug_toolbar/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 0000000..0d661a7
--- /dev/null
+++ b/debug_toolbar/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,168 @@
+# Django Debug Toolbar auf Deutsch.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Jannis Leidel, 2009.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-21 15:26-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/debug_toolbar/base.html:24
+msgid "Hide"
+msgstr "Verbergen"
+
+#: templates/debug_toolbar/base.html:56
+msgid "Close"
+msgstr "Schließen"
+
+#: templates/debug_toolbar/panels/cache.html:14
+msgid "Total Calls"
+msgstr "Aufrufe gesamt"
+
+#: templates/debug_toolbar/panels/cache.html:16
+msgid "Total Time"
+msgstr "Zeit gesamt"
+
+#: templates/debug_toolbar/panels/cache.html:18
+msgid "Hits"
+msgstr "Aufrufe"
+
+#: templates/debug_toolbar/panels/cache.html:20
+msgid "Misses"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:35
+msgid "Breakdown"
+msgstr ""
+
+#: 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 "Zeit"
+
+#: templates/debug_toolbar/panels/cache.html:40
+msgid "Type"
+msgstr "Typ"
+
+#: templates/debug_toolbar/panels/cache.html:41
+msgid "Parameters"
+msgstr "Parameter"
+
+#: templates/debug_toolbar/panels/cache.html:42
+msgid "Function"
+msgstr "Funktion"
+
+#: templates/debug_toolbar/panels/headers.html:6
+msgid "Key"
+msgstr "Schlüssel"
+
+#: templates/debug_toolbar/panels/headers.html:7
+#: templates/debug_toolbar/panels/request_vars.html:13
+#: templates/debug_toolbar/panels/request_vars.html:41
+#: templates/debug_toolbar/panels/request_vars.html:65
+#: templates/debug_toolbar/panels/request_vars.html:89
+#: templates/debug_toolbar/panels/settings_vars.html:7
+#: templates/debug_toolbar/panels/timer.html:11
+msgid "Value"
+msgstr "Wert"
+
+#: templates/debug_toolbar/panels/logger.html:7
+msgid "Level"
+msgstr "Niveau"
+
+#: templates/debug_toolbar/panels/logger.html:9
+msgid "Message"
+msgstr "Nachricht"
+
+#: templates/debug_toolbar/panels/logger.html:10
+msgid "Location"
+msgstr "Ort"
+
+#: templates/debug_toolbar/panels/logger.html:25
+msgid "No messages logged"
+msgstr "Keine Nachricht gespeichert"
+
+#: templates/debug_toolbar/panels/request_vars.html:26
+msgid "None"
+msgstr "Nichts"
+
+#: templates/debug_toolbar/panels/request_vars.html:54
+msgid "No SESSION data"
+msgstr "Keine SESSION-Daten"
+
+#: templates/debug_toolbar/panels/request_vars.html:78
+msgid "No GET data"
+msgstr "Keine GET-Daten"
+
+#: templates/debug_toolbar/panels/request_vars.html:102
+msgid "No POST data"
+msgstr "Keine POST-Daten"
+
+#: templates/debug_toolbar/panels/settings_vars.html:6
+msgid "Setting"
+msgstr "Einstellung"
+
+#: templates/debug_toolbar/panels/signals.html:6
+msgid "Signal"
+msgstr "Signal"
+
+#: templates/debug_toolbar/panels/sql.html:7
+msgid "Action"
+msgstr "Aktion"
+
+#: templates/debug_toolbar/panels/sql.html:31
+msgid "Line"
+msgstr "Zeile"
+
+#: templates/debug_toolbar/panels/sql.html:32
+msgid "Method"
+msgstr "Methode"
+
+#: templates/debug_toolbar/panels/sql.html:33
+msgid "File"
+msgstr "Datei"
+
+#: templates/debug_toolbar/panels/sql_explain.html:2
+#: templates/debug_toolbar/panels/sql_profile.html:2
+#: templates/debug_toolbar/panels/sql_select.html:2
+#: templates/debug_toolbar/panels/template_source.html:2
+msgid "Back"
+msgstr "Zurück"
+
+#: templates/debug_toolbar/panels/sql_explain.html:5
+#: templates/debug_toolbar/panels/sql_profile.html:5
+#: templates/debug_toolbar/panels/sql_select.html:5
+msgid "Executed SQL"
+msgstr "Ausgeführtes SQL"
+
+#: templates/debug_toolbar/panels/sql_select.html:30
+msgid "Empty set"
+msgstr "Leeres Set"
+
+#: templates/debug_toolbar/panels/templates.html:14
+msgid "Template"
+msgstr "Template"
+
+#: templates/debug_toolbar/panels/timer.html:10
+msgid "Resource"
+msgstr "Ressource"
+
+#: templates/debug_toolbar/panels/request_vars.html:12
+#: templates/debug_toolbar/panels/request_vars.html:40
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:88
+msgid "Variable"
+msgstr "Variable"
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..d15b2c1 100644
--- a/debug_toolbar/locale/es/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po
@@ -2,10 +2,9 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Percy Pérez-Pinedo <percyp3@gmail.com>, 2009.
-#
+# 
 # Caracteres especiales: á, é, í, ó, ú, ñ,
-#
-#, fuzzy
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -18,6 +17,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"
@@ -34,18 +62,6 @@ msgstr "Total Llamadas"
 msgid "Total Time"
 msgstr "Tiempo Total"
 
-#: templates/debug_toolbar/panels/cache.html:18
-msgid "Hits"
-msgstr ""
-
-#: templates/debug_toolbar/panels/cache.html:20
-msgid "Misses"
-msgstr ""
-
-#: templates/debug_toolbar/panels/cache.html:35
-msgid "Breakdown"
-msgstr ""
-
 #: templates/debug_toolbar/panels/cache.html:39
 #: templates/debug_toolbar/panels/logger.html:8
 #: templates/debug_toolbar/panels/sql.html:6
@@ -89,22 +105,6 @@ msgstr "Nivel"
 msgid "Message"
 msgstr "Mensaje"
 
-#: templates/debug_toolbar/panels/logger.html:10
-msgid "Location"
-msgstr ""
-
-#: templates/debug_toolbar/panels/logger.html:25
-msgid "No messages logged"
-msgstr ""
-
-#: templates/debug_toolbar/panels/request_vars.html:12
-#: templates/debug_toolbar/panels/request_vars.html:40
-#: templates/debug_toolbar/panels/request_vars.html:64
-#: templates/debug_toolbar/panels/request_vars.html:88
-#, fuzzy
-msgid "Variable"
-msgstr "Variable"
-
 #: templates/debug_toolbar/panels/request_vars.html:26
 msgid "None"
 msgstr "Ninguno"
@@ -162,10 +162,38 @@ 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"
 
 #: templates/debug_toolbar/panels/timer.html:10
 msgid "Resource"
 msgstr "Recurso"
+
+#: templates/debug_toolbar/panels/cache.html:18
+msgid "Hits"
+msgstr "Visitas"
+
+#: templates/debug_toolbar/panels/cache.html:35
+msgid "Breakdown"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:20
+msgid "Misses"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:12
+#: templates/debug_toolbar/panels/request_vars.html:40
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:88
+#, fuzzy
+msgid "Variable"
+msgstr "Variable"
+
+#: templates/debug_toolbar/panels/logger.html:25
+msgid "No messages logged"
+msgstr "No hay mensajes registrados"
+
+#: templates/debug_toolbar/panels/logger.html:10
+msgid "Location"
+msgstr ""
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.mo b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..e94f840
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po
new file mode 100644
index 0000000..7365992
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po
@@ -0,0 +1,167 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-24 22:59-0500\n"
+"PO-Revision-Date: 2009-08-24 23:08-0600\n"
+"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/debug_toolbar/base.html:24
+msgid "Hide"
+msgstr "הסתיר"
+
+#: templates/debug_toolbar/base.html:55
+msgid "Close"
+msgstr "סגור"
+
+#: templates/debug_toolbar/panels/cache.html:14
+msgid "Total Calls"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:16
+msgid "Total Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:20
+msgid "Misses"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:35
+msgid "Breakdown"
+msgstr ""
+
+#: 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:10
+#: templates/debug_toolbar/panels/sql_profile.html:10
+#: templates/debug_toolbar/panels/sql_select.html:10
+msgid "Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:40
+msgid "Type"
+msgstr "סוג"
+
+#: templates/debug_toolbar/panels/cache.html:41
+msgid "Parameters"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:42
+msgid "Function"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:6
+msgid "Key"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:7
+#: templates/debug_toolbar/panels/request_vars.html:13
+#: templates/debug_toolbar/panels/request_vars.html:41
+#: templates/debug_toolbar/panels/request_vars.html:65
+#: templates/debug_toolbar/panels/request_vars.html:89
+#: templates/debug_toolbar/panels/settings_vars.html:7
+#: templates/debug_toolbar/panels/timer.html:11
+msgid "Value"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:9
+msgid "Message"
+msgstr "הודעה"
+
+#: templates/debug_toolbar/panels/logger.html:10
+msgid "Location"
+msgstr "מקום"
+
+#: templates/debug_toolbar/panels/logger.html:25
+msgid "No messages logged"
+msgstr "אין הודעות"
+
+#: templates/debug_toolbar/panels/request_vars.html:12
+#: templates/debug_toolbar/panels/request_vars.html:40
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:88
+msgid "Variable"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:26
+msgid "No COOKIE data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:54
+msgid "No SESSION data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:78
+msgid "No GET data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:102
+msgid "No POST data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/signals.html:6
+msgid "Signal"
+msgstr "סימן"
+
+#: templates/debug_toolbar/panels/sql.html:31
+msgid "Line"
+msgstr "שורה"
+
+#: templates/debug_toolbar/panels/sql.html:32
+msgid "Method"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql.html:33
+msgid "File"
+msgstr "קובץ"
+
+#: templates/debug_toolbar/panels/sql_explain.html:3
+#: templates/debug_toolbar/panels/sql_profile.html:3
+#: templates/debug_toolbar/panels/sql_select.html:3
+#: templates/debug_toolbar/panels/template_source.html:3
+msgid "Back"
+msgstr "חזרה"
+
+#: templates/debug_toolbar/panels/sql_explain.html:8
+#: templates/debug_toolbar/panels/sql_profile.html:8
+#: templates/debug_toolbar/panels/sql_select.html:8
+msgid "Executed SQL"
+msgstr ""
+
+#: templates/debug_toolbar/panels/templates.html:15
+msgid "Template"
+msgstr ""
+
+#: templates/debug_toolbar/panels/timer.html:10
+msgid "Resource"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:18
+msgid "Hits"
+msgstr "הצלחות"
+
+#: templates/debug_toolbar/panels/logger.html:7
+msgid "Level"
+msgstr "רמה"
+
+#: templates/debug_toolbar/panels/sql.html:7
+msgid "Action"
+msgstr ""
+
+#: templates/debug_toolbar/panels/settings_vars.html:6
+msgid "Setting"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql_select.html:33
+msgid "Empty set"
+msgstr "תוצאות ריק"
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/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>