Review translated strings.

aaugustin · aaugustin · commit e334bf6e4b49 · 2013-12-01T09:40:33.000+01:00
- Include trailing colons inside translated strings because some
  languages (eg. French) need a space before the colon.
- Normalize capitalization (title-style didn't seem warranted and looked
  weird in some cases).
- Normalize quotes (not very useful, but we had a random mixture of
  single and double quotes).
- Remove msgstr from the English po file because they're identical to
  msgid by definition.
diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.po b/debug_toolbar/locale/en/LC_MESSAGES/django.po
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
@@ -183,21 +183,21 @@ def _store_call_info(self, sender, name=None, time_taken=0,
 
     # Implement the Panel API
 
-    nav_title = _('Cache')
+    nav_title = _("Cache")
 
     @property
     def nav_subtitle(self):
         cache_calls = len(self.calls)
-        return ungettext('%(cache_calls)d call in %(time).2fms',
-                         '%(cache_calls)d calls in %(time).2fms',
+        return ungettext("%(cache_calls)d call in %(time).2fms",
+                         "%(cache_calls)d calls in %(time).2fms",
                          cache_calls) % {'cache_calls': cache_calls,
                                          'time': self.total_time}
 
     @property
     def title(self):
         count = len(getattr(settings, 'CACHES', ['default']))
-        return ungettext('Cache calls from %(count)d backend',
-                         'Cache calls from %(count)d backends',
+        return ungettext("Cache calls from %(count)d backend",
+                         "Cache calls from %(count)d backends",
                          count) % dict(count=count)
 
     def enable_instrumentation(self):
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
@@ -32,7 +32,7 @@ class HeadersPanel(Panel):
         'TZ',
     ))
 
-    title = _('Headers')
+    title = _("Headers")
 
     template = 'debug_toolbar/panels/headers.html'
 
diff --git a/debug_toolbar/panels/logging.py b/debug_toolbar/panels/logging.py
@@ -90,10 +90,10 @@ def __init__(self, *args, **kwargs):
     def nav_subtitle(self):
         records = self._records[threading.currentThread()]
         record_count = len(records)
-        return ungettext('%(count)s message', '%(count)s messages',
+        return ungettext("%(count)s message", "%(count)s messages",
                          record_count) % {'count': record_count}
 
-    title = _('Log Messages')
+    title = _("Log messages")
 
     def process_request(self, request):
         collector.clear_records()
diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py
@@ -123,7 +123,7 @@ class ProfilingPanel(Panel):
     """
     Panel that displays profiling information.
     """
-    title = _('Profiling')
+    title = _("Profiling")
 
     template = 'debug_toolbar/panels/profiling.html'
 
diff --git a/debug_toolbar/panels/redirects.py b/debug_toolbar/panels/redirects.py
@@ -19,7 +19,7 @@ def enabled(self):
 
     has_content = False
 
-    nav_title = _('Intercept redirects')
+    nav_title = _("Intercept redirects")
 
     def process_response(self, request, response):
         if 300 <= int(response.status_code) < 400:
diff --git a/debug_toolbar/panels/request.py b/debug_toolbar/panels/request.py
@@ -15,7 +15,7 @@ class RequestPanel(Panel):
     """
     template = 'debug_toolbar/panels/request.html'
 
-    title = _('Request')
+    title = _("Request")
 
     def process_response(self, request, response):
         self.record_stats({
@@ -24,7 +24,7 @@ def process_response(self, request, response):
             'cookies': [(k, request.COOKIES.get(k)) for k in sorted(request.COOKIES)],
         })
         view_info = {
-            'view_func': _('<no view>'),
+            'view_func': _("<no view>"),
             'view_args': 'None',
             'view_kwargs': 'None',
             'view_urlname': 'None',
@@ -36,7 +36,7 @@ def process_response(self, request, response):
             view_info['view_args'] = args
             view_info['view_kwargs'] = kwargs
             view_info['view_urlname'] = getattr(match, 'url_name',
-                                                _('<unavailable>'))
+                                                _("<unavailable>"))
         except Http404:
             pass
         self.record_stats(view_info)
diff --git a/debug_toolbar/panels/settings.py b/debug_toolbar/panels/settings.py
@@ -14,10 +14,10 @@ class SettingsPanel(Panel):
     """
     template = 'debug_toolbar/panels/settings.html'
 
-    nav_title = _('Settings')
+    nav_title = _("Settings")
 
     def title(self):
-        return _('Settings from <code>%s</code>') % settings.SETTINGS_MODULE
+        return _("Settings from <code>%s</code>") % settings.SETTINGS_MODULE
 
     def process_response(self, request, response):
         self.record_stats({
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
@@ -38,11 +38,11 @@ def nav_subtitle(self):
         # here we have to handle a double count translation, hence the
         # hard coding of one signal
         if num_signals == 1:
-            return ungettext('%(num_receivers)d receiver of 1 signal',
-                             '%(num_receivers)d receivers of 1 signal',
+            return ungettext("%(num_receivers)d receiver of 1 signal",
+                             "%(num_receivers)d receivers of 1 signal",
                              num_receivers) % {'num_receivers': num_receivers}
-        return ungettext('%(num_receivers)d receiver of %(num_signals)d signals',
-                         '%(num_receivers)d receivers of %(num_signals)d signals',
+        return ungettext("%(num_receivers)d receiver of %(num_signals)d signals",
+                         "%(num_receivers)d receivers of %(num_signals)d signals",
                          num_receivers) % {'num_receivers': num_receivers,
                                            'num_signals': num_signals}
 
diff --git a/debug_toolbar/panels/sql/panel.py b/debug_toolbar/panels/sql/panel.py
@@ -18,11 +18,11 @@ def get_isolation_level_display(engine, level):
     if engine == 'psycopg2':
         import psycopg2.extensions
         choices = {
-            psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT: _('Autocommit'),
-            psycopg2.extensions.ISOLATION_LEVEL_READ_UNCOMMITTED: _('Read uncommitted'),
-            psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED: _('Read committed'),
-            psycopg2.extensions.ISOLATION_LEVEL_REPEATABLE_READ: _('Repeatable read'),
-            psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE: _('Serializable'),
+            psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT: _("Autocommit"),
+            psycopg2.extensions.ISOLATION_LEVEL_READ_UNCOMMITTED: _("Read uncommitted"),
+            psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED: _("Read committed"),
+            psycopg2.extensions.ISOLATION_LEVEL_REPEATABLE_READ: _("Repeatable read"),
+            psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE: _("Serializable"),
         }
     else:
         raise ValueError(engine)
@@ -33,11 +33,11 @@ def get_transaction_status_display(engine, level):
     if engine == 'psycopg2':
         import psycopg2.extensions
         choices = {
-            psycopg2.extensions.TRANSACTION_STATUS_IDLE: _('Idle'),
-            psycopg2.extensions.TRANSACTION_STATUS_ACTIVE: _('Active'),
-            psycopg2.extensions.TRANSACTION_STATUS_INTRANS: _('In transaction'),
-            psycopg2.extensions.TRANSACTION_STATUS_INERROR: _('In error'),
-            psycopg2.extensions.TRANSACTION_STATUS_UNKNOWN: _('Unknown'),
+            psycopg2.extensions.TRANSACTION_STATUS_IDLE: _("Idle"),
+            psycopg2.extensions.TRANSACTION_STATUS_ACTIVE: _("Active"),
+            psycopg2.extensions.TRANSACTION_STATUS_INTRANS: _("In transaction"),
+            psycopg2.extensions.TRANSACTION_STATUS_INERROR: _("In error"),
+            psycopg2.extensions.TRANSACTION_STATUS_UNKNOWN: _("Unknown"),
         }
     else:
         raise ValueError(engine)
@@ -102,7 +102,7 @@ def record(self, alias, **kwargs):
 
     # Implement the Panel API
 
-    nav_title = _('SQL')
+    nav_title = _("SQL")
 
     @property
     def nav_subtitle(self):
diff --git a/debug_toolbar/panels/templates/panel.py b/debug_toolbar/panels/templates/panel.py
@@ -142,12 +142,12 @@ def _store_template_info(self, sender, **kwargs):
 
     # Implement the Panel API
 
-    nav_title = _('Templates')
+    nav_title = _("Templates")
 
     @property
     def title(self):
         num_templates = len(self.templates)
-        return _('Templates (%(num_templates)s rendered)') % {'num_templates': num_templates}
+        return _("Templates (%(num_templates)s rendered)") % {'num_templates': num_templates}
 
     template = 'debug_toolbar/panels/templates.html'
 
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
@@ -20,30 +20,30 @@ def nav_subtitle(self):
         if hasattr(self, '_start_rusage'):
             utime = self._end_rusage.ru_utime - self._start_rusage.ru_utime
             stime = self._end_rusage.ru_stime - self._start_rusage.ru_stime
-            return _('CPU: %(cum)0.2fms (%(total)0.2fms)') % {
+            return _("CPU: %(cum)0.2fms (%(total)0.2fms)") % {
                 'cum': (utime + stime) * 1000.0,
                 'total': stats['total_time']
             }
         elif 'total_time' in stats:
-            return _('TOTAL: %0.2fms') % stats['total_time']
+            return _("Total: %0.2fms") % stats['total_time']
         else:
             return ''
 
     has_content = resource is not None
 
-    title = _('Time')
+    title = _("Time")
 
     template = 'debug_toolbar/panels/timer.html'
 
     @property
     def content(self):
         stats = self.get_stats()
         rows = (
-            (_('User CPU time'), _('%(utime)0.3f msec') % stats),
-            (_('System CPU time'), _('%(stime)0.3f msec') % stats),
-            (_('Total CPU time'), _('%(total)0.3f msec') % stats),
-            (_('Elapsed time'), _('%(total_time)0.3f msec') % stats),
-            (_('Context switches'), _('%(vcsw)d voluntary, %(ivcsw)d involuntary') % stats),
+            (_("User CPU time"), _("%(utime)0.3f msec") % stats),
+            (_("System CPU time"), _("%(stime)0.3f msec") % stats),
+            (_("Total CPU time"), _("%(total)0.3f msec") % stats),
+            (_("Elapsed time"), _("%(total_time)0.3f msec") % stats),
+            (_("Context switches"), _("%(vcsw)d voluntary, %(ivcsw)d involuntary") % stats),
         )
         return render_to_string(self.template, {'rows': rows})
 
diff --git a/debug_toolbar/panels/versions.py b/debug_toolbar/panels/versions.py
@@ -19,7 +19,7 @@ class VersionsPanel(Panel):
     def nav_subtitle(self):
         return 'Django %s' % django.get_version()
 
-    title = _('Versions')
+    title = _("Versions")
 
     template = 'debug_toolbar/panels/versions.html'
 
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
@@ -14,7 +14,7 @@
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if toolbar.panels %}
-			<li><a id="djHideToolBarButton" href="#" title="{% trans "Hide Toolbar" %}">{% trans "Hide" %} &#187;</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="{% trans "Hide toolbar" %}">{% trans "Hide" %} &#187;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
@@ -42,7 +42,7 @@
 		</ul>
 	</div>
 	<div style="display:none;" id="djDebugToolbarHandle">
-		<span title="{% trans "Show Toolbar" %}" id="djShowToolBarButton">&#171;</span>
+		<span title="{% trans "Show toolbar" %}" id="djShowToolBarButton">&#171;</span>
 	</div>
 	{% for panel in toolbar.panels %}
 		{% if panel.has_content and panel.enabled %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -3,10 +3,10 @@ <h3>{% trans "Summary" %}</h3>
 <table>
 	<thead>
 	<tr>
-		<th>{% trans "Total Calls" %}</th>
-		<th>{% trans "Total Time" %}</th>
-		<th>{% trans "Cache Hits" %}</th>
-		<th>{% trans "Cache Misses" %}</th>
+		<th>{% trans "Total calls" %}</th>
+		<th>{% trans "Total time" %}</th>
+		<th>{% trans "Cache hits" %}</th>
+		<th>{% trans "Cache misses" %}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -42,8 +42,8 @@ <h3>{% trans "Calls" %}</h3>
 		<tr>
 			<th colspan="2">{% trans "Time (ms)" %}</th>
 			<th>{% trans "Type" %}</th>
-			<th>{% trans "args" %}</th>
-			<th>{% trans "kwargs" %}</th>
+			<th>{% trans "Arguments" %}</th>
+			<th>{% trans "Keyword arguments" %}</th>
 			<th>{% trans "Backend" %}</th>
 		</tr>
 	</thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<h4>{% trans "Request Headers" %}</h4>
+<h4>{% trans "Request headers" %}</h4>
 
 <table>
 	<thead>
@@ -19,7 +19,7 @@ <h4>{% trans "Request Headers" %}</h4>
 	</tbody>
 </table>
 
-<h4>{% trans "Response Headers" %}</h4>
+<h4>{% trans "Response headers" %}</h4>
 
 <table>
 	<thead>
@@ -40,7 +40,7 @@ <h4>{% trans "Response Headers" %}</h4>
 
 <h4>{% trans "WSGI environ" %}</h4>
 
-<p>{% trans "Since the WSGI environ inherits the environment of the server, only a subset is shown below." %}</p>
+<p>{% trans "Since the WSGI environ inherits the environment of the server, only a significant subset is shown below." %}</p>
 
 <table>
 	<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request.html b/debug_toolbar/templates/debug_toolbar/panels/request.html
@@ -1,13 +1,13 @@
 {% load i18n %}
 
-<h4>{% trans 'View information' %}</h4>
+<h4>{% trans "View information" %}</h4>
 <table>
 	<thead>
 		<tr>
-			<th>{% trans 'View Function' %}</th>
-			<th>{% trans 'Arguments' %}</th>
-			<th>{% trans 'Keyword Arguments' %}</th>
-			<th>{% trans 'URL Name' %}</th>
+			<th>{% trans "View function" %}</th>
+			<th>{% trans "Arguments" %}</th>
+			<th>{% trans "Keyword arguments" %}</th>
+			<th>{% trans "URL name" %}</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -21,7 +21,7 @@ <h4>{% trans 'View information' %}</h4>
 </table>
 
 {% if cookies %}
-	<h4>{% trans "COOKIES Variables" %}</h4>
+	<h4>{% trans "Cookies" %}</h4>
 	<table>
 		<colgroup>
 			<col style="width:20%"/>
@@ -43,11 +43,11 @@ <h4>{% trans "COOKIES Variables" %}</h4>
 		</tbody>
 	</table>
 {% else %}
-	<h4>{% trans "No COOKIE data" %}</h4>
+	<h4>{% trans "No cookies" %}</h4>
 {% endif %}
 
 {% if session %}
-	<h4>{% trans "SESSION Variables" %}</h4>
+	<h4>{% trans "Session data" %}</h4>
 	<table>
 		<colgroup>
 			<col style="width:20%"/>
@@ -69,11 +69,11 @@ <h4>{% trans "SESSION Variables" %}</h4>
 		</tbody>
 	</table>
 {% else %}
-	<h4>{% trans "No SESSION data" %}</h4>
+	<h4>{% trans "No session data" %}</h4>
 {% endif %}
 
 {% if get %}
-	<h4>{% trans "GET Variables" %}</h4>
+	<h4>{% trans "GET data" %}</h4>
 	<table>
 		<colgroup>
 			<col style="width:20%"/>
@@ -99,7 +99,7 @@ <h4>{% trans "No GET data" %}</h4>
 {% endif %}
 
 {% if post %}
-	<h4>{% trans "POST Variables" %}</h4>
+	<h4>{% trans "POST data" %}</h4>
 	<table>
 		<colgroup>
 			<col style="width:20%"/>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -2,9 +2,9 @@
 <table>
 	<thead>
 		<tr>
-			<th>{% trans 'Signal' %}</th>
-			<th>{% trans 'Providing Args' %}</th>
-			<th>{% trans 'Receivers' %}</th>
+			<th>{% trans "Signal" %}</th>
+			<th>{% trans "Providing" %}</th>
+			<th>{% trans "Receivers" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -15,9 +15,9 @@
 		<thead>
 			<tr>
 				<th class="color">&#160;</th>
-				<th class="query" colspan="2">{% trans 'Query' %}</th>
-				<th class="timeline">{% trans 'Timeline' %}</th>
-				<th class="time">{% trans 'Time (ms)' %}</th>
+				<th class="query" colspan="2">{% trans "Query" %}</th>
+				<th class="timeline">{% trans "Timeline" %}</th>
+				<th class="time">{% trans "Time (ms)" %}</th>
 				<th class="actions">{% trans "Action" %}</th>
 			</tr>
 		</thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href="">{% trans "Back" %}</a>
-	<h3>{% trans "SQL Explained" %}</h3>
+	<h3>{% trans "SQL explained" %}</h3>
 </div>
 <div class="djDebugPanelContent">
 	<div class="scroll">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
