Merge commit 'upstream/ui-rf' into django-colors

18 files changed, 486 insertions, 296 deletions

diff --git a/.gitignore b/.gitignore
index 2f78cf5..d404d9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
-
+*.DS_Store
+*~
diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..a09808b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2d4c199
--- /dev/null
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,171 @@
+# Django Debug Toolbar en Español.
+# 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"
+"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 "Ocultar"
+
+#: templates/debug_toolbar/base.html:56
+msgid "Close"
+msgstr "Cerrar"
+
+#: templates/debug_toolbar/panels/cache.html:14
+msgid "Total Calls"
+msgstr "Total Llamadas"
+
+#: templates/debug_toolbar/panels/cache.html:16
+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
+#: 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"
+
+#: templates/debug_toolbar/panels/cache.html:40
+msgid "Type"
+msgstr "Tipo"
+
+#: templates/debug_toolbar/panels/cache.html:41
+msgid "Parameters"
+msgstr "Parámetros"
+
+#: templates/debug_toolbar/panels/cache.html:42
+msgid "Function"
+msgstr "Función"
+
+#: templates/debug_toolbar/panels/headers.html:6
+msgid "Key"
+msgstr "Llave"
+
+#: 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 "Valor"
+
+#: templates/debug_toolbar/panels/logger.html:7
+msgid "Level"
+msgstr "Nivel"
+
+#: templates/debug_toolbar/panels/logger.html:9
+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"
+
+#: templates/debug_toolbar/panels/request_vars.html:54
+msgid "No SESSION data"
+msgstr "No SESSION datos"
+
+#: templates/debug_toolbar/panels/request_vars.html:78
+msgid "No GET data"
+msgstr "No GET datos"
+
+#: templates/debug_toolbar/panels/request_vars.html:102
+msgid "No POST data"
+msgstr "No POST datos"
+
+#: templates/debug_toolbar/panels/settings_vars.html:6
+msgid "Setting"
+msgstr "Configuración"
+
+#: templates/debug_toolbar/panels/signals.html:6
+msgid "Signal"
+msgstr "Señal"
+
+#: templates/debug_toolbar/panels/sql.html:7
+msgid "Action"
+msgstr "Acción"
+
+#: templates/debug_toolbar/panels/sql.html:31
+msgid "Line"
+msgstr "Línea"
+
+#: templates/debug_toolbar/panels/sql.html:32
+msgid "Method"
+msgstr "Método"
+
+#: templates/debug_toolbar/panels/sql.html:33
+msgid "File"
+msgstr "Archivo"
+
+#: 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 "Regresar"
+
+#: 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 "SQL Ejecutado"
+
+#: templates/debug_toolbar/panels/sql_select.html:30
+msgid "Empty set"
+msgstr "Set Vacío"
+
+#: templates/debug_toolbar/panels/templates.html:14
+msgid "Template"
+msgstr "Plantilla"
+
+#: templates/debug_toolbar/panels/timer.html:10
+msgid "Resource"
+msgstr "Recurso"
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index d0f4562..b80daef 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <script type="text/javascript" charset="utf-8">
 	// When jQuery is sourced, it's going to overwrite whatever might be in the
 	// '$' variable, so store a reference of it in a temporary variable...
@@ -20,7 +21,7 @@
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">Hide &raquo;</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">{% trans "Hide" %} &raquo;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
@@ -51,7 +52,7 @@
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
 				<div class="djDebugPanelTitle">
-					<a href="" class="close">Close</a>
+					<a href="" class="close">{% trans "Close" %}</a>
 					<h3>{{ panel.title|safe }}</h3>
 				</div>
 				<div class="djDebugPanelContent">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index d102cdd..5c5f13b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <table>
 	<colgroup>
 		<col width="12%"/>
@@ -10,13 +11,13 @@
 		<col width="12%"/>
 	</colgroup>
 	<tr>
-		<th>Total Calls</th>
+		<th>{% trans "Total Calls" %}</th>
 		<td>{{ cache_calls }}</td>
-		<th>Total Time</th>
+		<th>{% trans "Total Time" %}</th>
 		<td>{{ cache_time }}ms</td>
-		<th>Hits</th>
+		<th>{% trans "Hits" %}</th>
 		<td>{{ cache.hits }}</td>
-		<th>Misses</th>
+		<th>{% trans "Misses" %}</th>
 		<td>{{ cache.misses }}</td>
 	</tr>
 	<tr>
@@ -31,14 +32,14 @@
 	</tr>
 </table>
 {% if cache.calls %}
-<h3>Breakdown</h3>
+<h3>{% trans "Breakdown" %}</h3>
 <table>
 	<thead>
 		<tr>
-			<th>Time&nbsp;(ms)</th>
-			<th>Type</th>
-			<th>Parameters</th>
-			<th>Function</th>
+			<th>{% trans "Time" %}&nbsp;(ms)</th>
+			<th>{% trans "Type" %}</th>
+			<th>{% trans "Parameters" %}</th>
+			<th>{% trans "Function" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index a6b6b59..957a021 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,18 +1,19 @@
+{% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for key, value in headers.iteritems %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ key|escape }}</td>
-    				<td>{{ value|escape }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
-</div>
\ No newline at end of file
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for key, value in headers.iteritems %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ key|escape }}</td>
+					<td>{{ value|escape }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 2bfab05..515742c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,26 +1,27 @@
+{% load i18n %}
 <div class="boxed">
-    {% if records %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>Level</th>
-    				<th>Time</th>
-    				<th>Message</th>
-    				<th>Location</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for record in records %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ record.level }}</td>
-    					<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
-    					<td>{{ record.message }}</td>
-    					<td>{{ record.file }}:{{ record.line }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>No messages logged.</p>
-    {% endif %}
+	{% if records %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Level" %}</th>
+					<th>{% trans "Time" %}</th>
+					<th>{% trans "Message" %}</th>
+					<th>{% trans "Location" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for record in records %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ record.level }}</td>
+						<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
+						<td>{{ record.message }}</td>
+						<td>{{ record.file }}:{{ record.line }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No messages logged" %}.</p>
+	{% endif %}
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index d8c81ba..b1d7233 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,103 +1,104 @@
+{% load i18n %}
 <h4>COOKIES Variables</h4>
 <div class="boxed">
-    {% if cookies %}
-    	<table>
-    		<colgroup>
-    			<col style="width:20%"/>
-    			<col/>
-    		</colgroup>
-    		<thead>
-    			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in cookies %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
+	{% if cookies %}
+		<table>
+			<colgroup>
+				<col style="width:20%"/>
+				<col/>
+			</colgroup>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in cookies %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No COOKIE data" %}</p>
+	{% endif %}
 </div>
 
 <h4>SESSION Variables</h4>
 <div class="boxed">
-    {% if session %}
-    	<table>
-    		<colgroup>
-    			<col style="width:20%"/>
-    			<col/>
-    		</colgroup>
-    		<thead>
-    			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in session %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
+	{% if session %}
+		<table>
+			<colgroup>
+				<col style="width:20%"/>
+				<col/>
+			</colgroup>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in session %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No SESSION data" %}</p>
+	{% endif %}
 </div>
 
 <h4>GET Variables</h4>
 <div class="boxed">
-    {% if get %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in get %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|join:", "|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
+	{% if get %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in get %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|join:", "|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No GET data" %}</p>
+	{% endif %}
 </div>
 
 <h4>POST Variables</h4>
 <div class="boxed">
-    {% if post %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in post %}
-    				<tr class="{% cycle 'row1' 'row2' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|join:", "|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
-</div>
\ No newline at end of file
+	{% if post %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in post %}
+					<tr class="{% cycle 'row1' 'row2' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|join:", "|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No POST data" %}</p>
+	{% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 8c65700..1591966 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,18 +1,19 @@
+{% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>Setting</th>
-    			<th>Value</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for var in settings.items|dictsort:"0" %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ var.0 }}</td>
-    				<td><code>{{ var.1|pprint }}</code></td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
-</div>
\ No newline at end of file
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Setting" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for var in settings.items|dictsort:"0" %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ var.0 }}</td>
+					<td><code>{{ var.1|pprint }}</code></td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index c7a7733..94414ea 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,20 +1,21 @@
+{% load i18n %}
 <div class="boxed">
-    <table>
-        <thead>
-            <tr>
-                <th>Signal</th>
-                <th>Providing Args</th>
-                <th>Receivers</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for name, signal, receivers in signals %}
-                <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-                    <td>{{ name|escape }}</td>
-                    <td>{{ signal.providing_args|join:", " }}</td>
-                    <td>{{ receivers|join:", " }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Signal" %}</th>
+				<th>Providing Args</th>
+				<th>Receivers</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for name, signal, receivers in signals %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ name|escape }}</td>
+					<td>{{ signal.providing_args|join:", " }}</td>
+					<td>{{ receivers|join:", " }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index bb805e6..aecfad6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,51 +1,51 @@
+{% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>Time&nbsp;(ms)</th>
-    			<th>Action</th>
-    			<th>Stacktrace</th>
-    			<th>Query</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for query in queries %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ query.time|floatformat:"2" }}</td>
-    				<td>
-    				{% if query.params %}
-    					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
-    					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
-    					{% if is_mysql %}
-    						<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
-    					{% endif %}
-    				{% endif %}
-    				</td>
-    				<td>
-    					{% if query.stacktrace %}
-    					<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
-    					<div class="djSQLHideStacktraceDiv" style="display:none;">
-    						<table>
-    							<tr>
-    								<th>Line</th>
-    								<th>Method</th>
-    								<th>File</th>
-    							</tr>
-    							{% for file, line, method in query.stacktrace %}
-    								<tr>
-    									<td>{{ line }}</td>
-    									<td><pre>{{ method|escape }}<pre></td>
-    									<td><pre>{{ file|escape }}</pre></td>
-    								</tr>
-    							{% endfor %}
-    						</table>
-    					</div>
-    					{% endif %}
-    				</td>
-    				<td class="syntax">{{ query.sql|safe }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Time" %}&nbsp;(ms)</th>
+				<th>{% trans "Action" %}</th>
+				<th>Stacktrace</th>
+				<th>Query</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for query in queries %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ query.time|floatformat:"2" }}</td>
+					<td>
+					{% if query.params %}
+						<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
+						<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
+						{% if is_mysql %}
+							<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
+						{% endif %}
+					{% endif %}
+					</td>
+					<td>
+						{% if query.stacktrace %}
+						<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
+						<div class="djSQLHideStacktraceDiv" style="display:none;">
+							<table>
+								<tr>
+									<th>{% trans "Line" %}</th>
+									<th>{% trans "Method" %}</th>
+									<th>{% trans "File" %}</th>
+								</tr>
+								{% for file, line, method in query.stacktrace %}
+									<tr>
+										<td>{{ line }}</td>
+										<td><pre>{{ method|escape }}<pre></td>
+										<td><pre>{{ file|escape }}</pre></td>
+									</tr>
+								{% endfor %}
+							</table>
+						</div>
+						{% endif %}
+					</td>
+					<td class="syntax">{{ query.sql|safe }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
-
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index d26a8a3..38249b3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Explained</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	<table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index c5410f8..7df65da 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Profiled</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	<table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 4fc928d..e4d6027 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Selected</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	{% if result %}
@@ -29,6 +30,6 @@
 		</tbody>
 	</table>
 	{% else %}
-		<p>Empty set</p>
+		<p>{% trans "Empty set" %}</p>
 	{% endif %}
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 2094a3f..8e8253d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,9 +1,14 @@
-<a class="close back" href="">Back</a>
-<h3>Template Source: <code>{{ template_name }}</code></h3>
-<div class="panelScrollWrap">
-    <div class="panelScrollContent">
-        <div class="boxed">
-            {{ source }}
-        </div>
-    </div>
+{% load i18n %}
+<div class="djDebugPanelTitle">
+	<a class="close back" href="">{% trans "Back" %}</a>
+	<h3>Template Source: <code>{{ template_name }}</code></h3>
+</div>
+<div class="djDebugPanelContent">
+	<div class="panelScrollWrap">
+		<div class="panelScrollContent">
+			<div class="boxed">
+				{{ source }}
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 622321f..d4e18b5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h4>Template path{{ template_dirs|length|pluralize }}</h4>
 <div class="boxed">
 {% if template_dirs %}
@@ -11,37 +12,37 @@
 {% endif %}
 </div>
 
-<h4>Template{{ templates|length|pluralize }}</h4>
+<h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4>
 <div class="boxed">
-    {% if templates %}
-    <dl>
-    {% for template in templates %}
-    	<dt><strong><a class="remoteCall" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
-    	<dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
-    	<dd>
-    		<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
-    		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div>
-    	</dd>
-    {% endfor %}
-    </dl>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
+	{% if templates %}
+	<dl>
+	{% for template in templates %}
+		<dt><strong><a class="remoteCall" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
+		<dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
+		<dd>
+			<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
+			<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div>
+		</dd>
+	{% endfor %}
+	</dl>
+	{% else %}
+		<p>None</p>
+	{% endif %}
 </div>
 
 <h4>Context processor{{ context_processors|length|pluralize }}</h4>
 <div class="boxed">
-    {% if context_processors %}
-    <dl>
-    {% for key, value in context_processors.iteritems %}
-    	<dt><strong>{{ key|escape }}</strong></dt>
-    	<dd>
-    		<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
-    		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div>
-    	</dd>
-    {% endfor %}
-    </dl>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
-</div>
\ No newline at end of file
+	{% if context_processors %}
+	<dl>
+	{% for key, value in context_processors.iteritems %}
+		<dt><strong>{{ key|escape }}</strong></dt>
+		<dd>
+			<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
+			<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div>
+		</dd>
+	{% endfor %}
+	</dl>
+	{% else %}
+		<p>None</p>
+	{% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index ba801b2..9fd479f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,22 +1,23 @@
+{% load i18n %}
 <div class="boxed">
-    <table>
-    	<colgroup>
-    		<col style="width:20%"/>
-    		<col/>
-    	</colgroup>
-    	<thead>
-    		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for key, value in rows %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ key|escape }}</td>
-    				<td>{{ value|escape }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<colgroup>
+			<col style="width:20%"/>
+			<col/>
+		</colgroup>
+		<thead>
+			<tr>
+				<th>{% trans "Resource" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for key, value in rows %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ key|escape }}</td>
+					<td>{{ value|escape }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index 1f5c84b..1128cea 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <html>
 <head>
 </head>
@@ -5,11 +6,11 @@
 <h1>HttpResponseRedirect</h1>
 <p>Location: <a href="{{ redirect_to|urlencode }}">{{ redirect_to }}</a></p>
 <p class="notice">
-	The Django Debug Toolbar has intercepted a redirect to the above URL for
+	{% 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
 	<code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key
-	<code>INTERCEPT_REDIRECTS</code> to <code>False</code>.
+	<code>INTERCEPT_REDIRECTS</code> to <code>False</code>." %}
 </p>
 </body>
 </html>