Merge locale work by Percy.

15 files changed, 74 insertions, 60 deletions

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..ef153bf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
+    			<th>{% trans "Key" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 2bfab05..080f955 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="boxed">
     {% if records %}
     	<table>
     		<thead>
     			<tr>
-    				<th>Level</th>
-    				<th>Time</th>
-    				<th>Message</th>
-    				<th>Location</th>
+    				<th>{% trans "Level" %}</th>
+    				<th>{% trans "Time" %}</th>
+    				<th>{% trans "Message" %}</th>
+    				<th>{% trans "Location" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -21,6 +22,6 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>No messages logged.</p>
+    	<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 d8c81ba..c2797dc 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h4>COOKIES Variables</h4>
 <div class="boxed">
     {% if cookies %}
@@ -8,8 +9,8 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -22,7 +23,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "None" %}</p>
     {% endif %}
 </div>
 
@@ -36,8 +37,8 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -50,7 +51,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No SESSION data" %}</p>
     {% endif %}
 </div>
 
@@ -60,8 +61,8 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -74,7 +75,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No GET data" %}</p>
     {% endif %}
 </div>
 
@@ -84,8 +85,8 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -98,6 +99,6 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No POST data" %}</p>
     {% endif %}
-</div>
\ No newline at end of file
+</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..1b9d452 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Setting</th>
-    			<th>Value</th>
+    			<th>{% trans "Setting" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index c7a7733..fccf7ff 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 <div class="boxed">
     <table>
         <thead>
             <tr>
-                <th>Signal</th>
+                <th>{% trans "Signal" %}</th>
                 <th>Providing Args</th>
                 <th>Receivers</th>
             </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index bb805e6..cac2e47 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Time&nbsp;(ms)</th>
-    			<th>Action</th>
+    			<th>{% trans "Time" %}&nbsp;(ms)</th>
+    			<th>{% trans "Action" %}</th>
     			<th>Stacktrace</th>
     			<th>Query</th>
     		</tr>
@@ -27,9 +28,9 @@
     					<div class="djSQLHideStacktraceDiv" style="display:none;">
     						<table>
     							<tr>
-    								<th>Line</th>
-    								<th>Method</th>
-    								<th>File</th>
+    								<th>{% trans "Line" %}</th>
+    								<th>{% trans "Method" %}</th>
+    								<th>{% trans "File" %}</th>
     							</tr>
     							{% for file, line, method in query.stacktrace %}
     								<tr>
@@ -47,5 +48,4 @@
     		{% endfor %}
     	</tbody>
     </table>
-</div>
-
+</div>
\ No newline at end of file
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..a9d6a88 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,4 +1,5 @@
-<a class="close back" href="">Back</a>
+{% load i18n %}
+<a class="close back" href="">{% trans "Back" %}</a>
 <h3>Template Source: <code>{{ template_name }}</code></h3>
 <div class="panelScrollWrap">
     <div class="panelScrollContent">
@@ -6,4 +7,4 @@
             {{ source }}
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 622321f..194e477 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,7 +12,7 @@
 {% endif %}
 </div>
 
-<h4>Template{{ templates|length|pluralize }}</h4>
+<h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4>
 <div class="boxed">
     {% if templates %}
     <dl>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index ba801b2..d089276 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<colgroup>
@@ -6,8 +7,8 @@
     	</colgroup>
     	<thead>
     		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
+    			<th>{% trans "Resource" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
@@ -19,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 1f5c84b..5611977 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,9 +6,9 @@
 <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
+	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>