Marked more strings for translation and updated 'fr' locale.

Signed-off-by: Rob Hudson <rob@cogit8.org>

12 files changed, 161 insertions, 75 deletions

diff --git a/debug_toolbar/locale/fr/LC_MESSAGES/django.mo b/debug_toolbar/locale/fr/LC_MESSAGES/django.mo
index 6d5b30c..cf4ac82 100644
--- a/debug_toolbar/locale/fr/LC_MESSAGES/django.mo
+++ b/debug_toolbar/locale/fr/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/fr/LC_MESSAGES/django.po b/debug_toolbar/locale/fr/LC_MESSAGES/django.po
index 878f307..5594459 100644
--- a/debug_toolbar/locale/fr/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Debug Toolbar 0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-02 13:13-0800\n"
+"POT-Creation-Date: 2009-11-14 15:20+0100\n"
 "PO-Revision-Date: 2009-10-14 22:53+0200\n"
 "Last-Translator: David Paccoud <dpaccoud@gmail.com>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -16,17 +16,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: panels/cache.py:92
+#, python-format
+msgid "Cache: %.2fms"
+msgstr ""
+
+#: panels/cache.py:95
+msgid "Cache Usage"
+msgstr "Usage du cache"
+
+#: panels/headers.py:36 panels/headers.py:39
+msgid "HTTP Headers"
+msgstr "En-têtes HTTP"
+
 #: panels/logger.py:56
 msgid "Logging"
-msgstr "Loguer"
+msgstr "Journaux"
+
+#: panels/logger.py:63
+#, fuzzy
+msgid "Log Messages"
+msgstr "Message"
+
+#: panels/request_vars.py:13 panels/request_vars.py:16
+msgid "Request Vars"
+msgstr "Variables de requête"
 
 #: panels/settings_vars.py:16
 msgid "Settings"
 msgstr "Paramètres"
 
-#: panels/signals.py:39
+#: panels/settings_vars.py:19
+#, python-format
+msgid "Settings from <code>%s</code>"
+msgstr "Paramètres de <code>%s</code>"
+
+#: panels/signals.py:39 panels/signals.py:42
 msgid "Signals"
-msgstr "Signals"
+msgstr "Signaux"
+
+#: panels/sql.py:146
+msgid "SQL"
+msgstr "SQL"
+
+#: panels/sql.py:160
+#, fuzzy
+msgid "SQL Queries"
+msgstr "Requêtes SQL"
 
 #: panels/template.py:47
 msgid "Templates"
@@ -35,7 +71,7 @@ msgstr "Gabarits"
 #: panels/template.py:52
 #, python-format
 msgid "Templates (%(num_templates)s rendered)"
-msgstr ""
+msgstr "Gabarits (%(num_templates)s affichés)"
 
 #: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39
 #: templates/debug_toolbar/panels/logger.html:7
@@ -46,14 +82,49 @@ msgstr ""
 msgid "Time"
 msgstr "Temps"
 
-#: panels/version.py:20
+#: panels/timer.py:47
+#, fuzzy
+msgid "Resource Usage"
+msgstr "Usage des ressources"
+
+#: panels/timer.py:78
+msgid "User CPU time"
+msgstr "Temps CPU utilisateur"
+
+#: panels/timer.py:79
+msgid "System CPU time"
+msgstr "Temps CPU système"
+
+#: panels/timer.py:80
+#, fuzzy
+msgid "Total CPU time"
+msgstr "Temps CPU Total"
+
+#: panels/timer.py:81
+msgid "Elapsed time"
+msgstr "Temps écoulé"
+
+#: panels/timer.py:82
+#, fuzzy
+msgid "Context switches"
+msgstr "Changements de contexte"
+
+#: panels/version.py:20 panels/version.py:29
 #, fuzzy
 msgid "Versions"
-msgstr "Version de Django"
+msgstr "Versions"
+
+#: templates/debug_toolbar/base.html:23
+msgid "Hide Toolbar"
+msgstr "Masquer la barre"
 
 #: templates/debug_toolbar/base.html:23
 msgid "Hide"
-msgstr "Cacher"
+msgstr "Masquer"
+
+#: templates/debug_toolbar/base.html:48
+msgid "Show Toolbar"
+msgstr "Afficher la barre"
 
 #: templates/debug_toolbar/base.html:54
 msgid "Close"
@@ -75,13 +146,13 @@ msgstr ""
 "La barre de Debug Django a intercepté une redirection vers l'adresse ci-"
 "dessous afin de permettre la consultation des messages de debug.  Vous "
 "pouvez cliquer sur le lien ci-dessus pour continuer normalement avec la "
-"redirection.  Si vous voulez désactiver cette fonctionnalité, positionnez la "
-"clé <code>INTERCEPT_REDIRECTS</code> du dictionnaire "
+"redirection.  Si vous voulez désactiver cette fonctionnalité, paramétrez la "
+"valeur de la clé <code>INTERCEPT_REDIRECTS</code> du dictionnaire "
 "<code>DEBUG_TOOLBAR_CONFIG</code> à <code>False</code>."
 
 #: templates/debug_toolbar/panels/cache.html:14
 msgid "Total Calls"
-msgstr "Total des appels"
+msgstr "Nombre total d'appels"
 
 #: templates/debug_toolbar/panels/cache.html:16
 msgid "Total Time"
@@ -89,11 +160,11 @@ msgstr "Temps Total"
 
 #: templates/debug_toolbar/panels/cache.html:18
 msgid "Hits"
-msgstr "Touché"
+msgstr "Requêtes"
 
 #: templates/debug_toolbar/panels/cache.html:20
 msgid "Misses"
-msgstr "Raté"
+msgstr "Ratés"
 
 #: templates/debug_toolbar/panels/cache.html:35
 msgid "Breakdown"
@@ -116,10 +187,10 @@ msgid "Key"
 msgstr "Clé"
 
 #: templates/debug_toolbar/panels/headers.html:6
-#: templates/debug_toolbar/panels/request_vars.html:12
-#: templates/debug_toolbar/panels/request_vars.html:38
-#: templates/debug_toolbar/panels/request_vars.html:60
-#: templates/debug_toolbar/panels/request_vars.html:82
+#: templates/debug_toolbar/panels/request_vars.html:37
+#: templates/debug_toolbar/panels/request_vars.html:63
+#: templates/debug_toolbar/panels/request_vars.html:85
+#: templates/debug_toolbar/panels/request_vars.html:107
 #: templates/debug_toolbar/panels/settings_vars.html:6
 #: templates/debug_toolbar/panels/timer.html:10
 msgid "Value"
@@ -135,48 +206,61 @@ msgstr "Message"
 
 #: templates/debug_toolbar/panels/logger.html:24
 msgid "No messages logged"
-msgstr "Aucun message logué"
+msgstr "Aucun message dans le journal"
+
+#: templates/debug_toolbar/panels/request_vars.html:3
+msgid "View information"
+msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:2
+#: templates/debug_toolbar/panels/request_vars.html:7
 #, fuzzy
+msgid "View Function"
+msgstr "Fonction"
+
+#: templates/debug_toolbar/panels/request_vars.html:8
+msgid "args"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:9
+msgid "kwargs"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:27
 msgid "COOKIES Variables"
-msgstr "Variable"
+msgstr "Variables des COOKIES"
 
-#: templates/debug_toolbar/panels/request_vars.html:11
-#: templates/debug_toolbar/panels/request_vars.html:37
-#: templates/debug_toolbar/panels/request_vars.html:59
-#: templates/debug_toolbar/panels/request_vars.html:81
+#: templates/debug_toolbar/panels/request_vars.html:36
+#: templates/debug_toolbar/panels/request_vars.html:62
+#: templates/debug_toolbar/panels/request_vars.html:84
+#: templates/debug_toolbar/panels/request_vars.html:106
 msgid "Variable"
 msgstr "Variable"
 
-#: templates/debug_toolbar/panels/request_vars.html:25
+#: templates/debug_toolbar/panels/request_vars.html:50
 msgid "No COOKIE data"
 msgstr "Aucune donnée de COOKIE"
 
-#: templates/debug_toolbar/panels/request_vars.html:28
-#, fuzzy
+#: templates/debug_toolbar/panels/request_vars.html:53
 msgid "SESSION Variables"
-msgstr "Variable"
+msgstr "Variables de SESSION"
 
-#: templates/debug_toolbar/panels/request_vars.html:51
+#: templates/debug_toolbar/panels/request_vars.html:76
 msgid "No SESSION data"
 msgstr "Aucune donnée de SESSION"
 
-#: templates/debug_toolbar/panels/request_vars.html:54
-#, fuzzy
+#: templates/debug_toolbar/panels/request_vars.html:79
 msgid "GET Variables"
-msgstr "Variable"
+msgstr "Variables GET"
 
-#: templates/debug_toolbar/panels/request_vars.html:73
+#: templates/debug_toolbar/panels/request_vars.html:98
 msgid "No GET data"
 msgstr "Aucune donnée GET"
 
-#: templates/debug_toolbar/panels/request_vars.html:76
-#, fuzzy
+#: templates/debug_toolbar/panels/request_vars.html:101
 msgid "POST Variables"
-msgstr "Variable"
+msgstr "Variables POST"
 
-#: templates/debug_toolbar/panels/request_vars.html:95
+#: templates/debug_toolbar/panels/request_vars.html:120
 msgid "No POST data"
 msgstr "Aucune donnée POST"
 
@@ -194,7 +278,7 @@ msgstr ""
 
 #: templates/debug_toolbar/panels/signals.html:7
 msgid "Receivers"
-msgstr ""
+msgstr "Receveurs"
 
 #: templates/debug_toolbar/panels/sql.html:6
 msgid "Action"
@@ -202,11 +286,11 @@ msgstr "Action"
 
 #: templates/debug_toolbar/panels/sql.html:7
 msgid "Stacktrace"
-msgstr ""
+msgstr "Pile d'appel"
 
 #: templates/debug_toolbar/panels/sql.html:8
 msgid "Query"
-msgstr ""
+msgstr "Requête"
 
 #: templates/debug_toolbar/panels/sql.html:38
 msgid "Line"
@@ -254,14 +338,12 @@ msgid "Empty set"
 msgstr "Ensemble vide"
 
 #: templates/debug_toolbar/panels/template_source.html:4
-#, fuzzy
 msgid "Template Source"
-msgstr "Gabarit"
+msgstr "Source du gabarit"
 
 #: templates/debug_toolbar/panels/templates.html:2
-#, fuzzy
 msgid "Template path"
-msgstr "Gabarit"
+msgstr "Chemin du gabarit"
 
 #: templates/debug_toolbar/panels/templates.html:13
 msgid "Template"
@@ -270,16 +352,16 @@ msgstr "Gabarit"
 #: templates/debug_toolbar/panels/templates.html:21
 #: templates/debug_toolbar/panels/templates.html:37
 msgid "Toggle Context"
-msgstr ""
+msgstr "Afficher/Masquer le contexte"
 
 #: templates/debug_toolbar/panels/templates.html:28
 #: templates/debug_toolbar/panels/templates.html:43
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #: templates/debug_toolbar/panels/templates.html:31
 msgid "Context processor"
-msgstr ""
+msgstr "Processeur de contexte"
 
 #: templates/debug_toolbar/panels/timer.html:9
 msgid "Resource"
@@ -287,9 +369,8 @@ msgstr "Ressources"
 
 #: templates/debug_toolbar/panels/versions.html:6
 msgid "Package"
-msgstr ""
+msgstr "Paquet"
 
 #: templates/debug_toolbar/panels/versions.html:7
-#, fuzzy
 msgid "Version"
-msgstr "Version de Django"
+msgstr "Version"
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index a05d3cc..8cdd929 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -7,6 +7,7 @@ except ImportError:
 from django.core import cache
 from django.core.cache.backends.base import BaseCache
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class CacheStatTracker(BaseCache):
@@ -88,10 +89,10 @@ class CacheDebugPanel(DebugPanel):
             cache.cache = self.cache
 
     def nav_title(self):
-        return 'Cache: %.2fms' % self.cache.total_time
+        return _('Cache: %.2fms') % self.cache.total_time
 
     def title(self):
-        return 'Cache Usage'
+        return _('Cache Usage')
 
     def url(self):
         return ''
@@ -102,4 +103,4 @@ class CacheDebugPanel(DebugPanel):
             cache_time = self.cache.total_time,
             cache = self.cache,
         )
-        return render_to_string('debug_toolbar/panels/cache.html', context)
\ No newline at end of file
+        return render_to_string('debug_toolbar/panels/cache.html', context)
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
index 06858ef..7a44c2d 100644
--- a/debug_toolbar/panels/headers.py
+++ b/debug_toolbar/panels/headers.py
@@ -1,4 +1,5 @@
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class HeaderDebugPanel(DebugPanel):
@@ -32,10 +33,10 @@ class HeaderDebugPanel(DebugPanel):
     )
 
     def nav_title(self):
-        return 'HTTP Headers'
+        return _('HTTP Headers')
 
     def title(self):
-        return 'HTTP Headers'
+        return _('HTTP Headers')
 
     def url(self):
         return ''
@@ -49,4 +50,4 @@ class HeaderDebugPanel(DebugPanel):
         context = {
             'headers': self.headers
         }
-        return render_to_string('debug_toolbar/panels/headers.html', context)
\ No newline at end of file
+        return render_to_string('debug_toolbar/panels/headers.html', context)
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index a16b933..99f2602 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -56,10 +56,11 @@ class LoggingPanel(DebugPanel):
         return _("Logging")
 
     def nav_subtitle(self):
+        # FIXME l10n: use ngettext
         return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
 
     def title(self):
-        return 'Log Messages'
+        return _('Log Messages')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index ab356a0..cea5ec7 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -1,4 +1,5 @@
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class RequestVarsDebugPanel(DebugPanel):
@@ -9,10 +10,10 @@ class RequestVarsDebugPanel(DebugPanel):
     has_content = True
 
     def nav_title(self):
-        return 'Request Vars'
+        return _('Request Vars')
 
     def title(self):
-        return 'Request Vars'
+        return _('Request Vars')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index f30f601..8243acf 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -16,7 +16,7 @@ class SettingsVarsDebugPanel(DebugPanel):
         return _('Settings')
 
     def title(self):
-        return 'Settings from <code>%s</code>' % settings.SETTINGS_MODULE
+        return _('Settings from <code>%s</code>') % settings.SETTINGS_MODULE
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 56fbfd4..ed5f92f 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -39,7 +39,7 @@ class SignalDebugPanel(DebugPanel):
         return _("Signals")
 
     def title(self):
-        return "Signals"
+        return _("Signals")
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 7a8fa65..9b6db22 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -14,6 +14,7 @@ from django.template.loader import render_to_string
 from django.utils import simplejson
 from django.utils.encoding import force_unicode
 from django.utils.hashcompat import sha_constructor
+from django.utils.translation import ugettext_lazy as _
 
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils import sqlparse
@@ -142,12 +143,13 @@ class SQLDebugPanel(DebugPanel):
         self._queries = []
 
     def nav_title(self):
-        return 'SQL'
+        return _('SQL')
 
     def nav_subtitle(self):
         self._queries = connection.queries[self._offset:]
         self._sql_time = sum([q['duration'] for q in self._queries])
         num_queries = len(self._queries)
+        # TODO l10n: use ngettext
         return "%d %s in %.2fms" % (
             num_queries,
             (num_queries == 1) and 'query' or 'queries',
@@ -155,7 +157,7 @@ class SQLDebugPanel(DebugPanel):
         )
 
     def title(self):
-        return 'SQL Queries'
+        return _('SQL Queries')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 4e390f6..583c1c0 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -35,6 +35,7 @@ class TimerDebugPanel(DebugPanel):
         return _('Time')
 
     def nav_subtitle(self):
+        # TODO l10n
         if self.has_resource:
             utime = self._end_rusage.ru_utime - self._start_rusage.ru_utime
             stime = self._end_rusage.ru_stime - self._start_rusage.ru_stime
@@ -43,7 +44,7 @@ class TimerDebugPanel(DebugPanel):
             return 'TOTAL: %0.2fms' % (self.total_time)
 
     def title(self):
-        return 'Resource Usage'
+        return _('Resource Usage')
 
     def url(self):
         return ''
@@ -72,12 +73,13 @@ class TimerDebugPanel(DebugPanel):
 #        urss = self._end_rusage.ru_idrss
 #        usrss = self._end_rusage.ru_isrss
 
+        # TODO l10n on values
         rows = (
-            ('User CPU time', '%0.3f msec' % utime),
-            ('System CPU time', '%0.3f msec' % stime),
-            ('Total CPU time', '%0.3f msec' % (utime + stime)),
-            ('Elapsed time', '%0.3f msec' % self.total_time),
-            ('Context switches', '%d voluntary, %d involuntary' % (vcsw, ivcsw)),
+            (_('User CPU time'), '%0.3f msec' % utime),
+            (_('System CPU time'), '%0.3f msec' % stime),
+            (_('Total CPU time'), '%0.3f msec' % (utime + stime)),
+            (_('Elapsed time'), '%0.3f msec' % self.total_time),
+            (_('Context switches'), '%d voluntary, %d involuntary' % (vcsw, ivcsw)),
 #            ('Memory use', '%d max RSS, %d shared, %d unshared' % (rss, srss, urss + usrss)),
 #            ('Page faults', '%d no i/o, %d requiring i/o' % (minflt, majflt)),
 #            ('Disk operations', '%d in, %d out, %d swapout' % (blkin, blkout, swap)),
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index bc09e75..96a4535 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -26,10 +26,7 @@ class VersionDebugPanel(DebugPanel):
         return ''
     
     def title(self):
-        return 'Versions'
-
-    def title(self):
-        return 'Versions'
+        return _('Versions')
 
     def content(self):
         versions = {}
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index b03047e..260f857 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -20,7 +20,7 @@
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">{% trans "Hide" %} &raquo;</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="{% trans "Hide Toolbar" %}">{% trans "Hide" %} &raquo;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
@@ -45,7 +45,7 @@
 		</ul>
 	</div>
 	<div style="display:none;" id="djDebugToolbarHandle">
-		<a title="Show Toolbar" id="djShowToolBarButton" href="#">&laquo;</a>
+		<a title="{% trans "Show Toolbar" %}" id="djShowToolBarButton" href="#">&laquo;</a>
 	</div>
 	{% for panel in panels %}
 		{% if panel.has_content %}