Added improvements about i18n for themes "basic", "haiku" and "scrolls" that Sphinx built-in. Closes #1120

10 files changed, 204 insertions, 122 deletions

diff --git a/babel.cfg b/babel.cfg
index 9688b8d05..4c1e71801 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,4 +1,21 @@
+# How setup this file
+# http://babel.edgewall.org/wiki/Documentation/setup.html
+# this file description:
+# http://babel.edgewall.org/wiki/Documentation/messages.html#extraction-method-mapping-and-configuration
+
+# Extraction from Python source files
 [python: **.py]
+encoding = utf-8
+
+# Extraction from Jinja2 HTML templates
 [jinja2: **/themes/**.html]
+encoding = utf-8
+ignore_tags = script,style
+include_attrs = alt title summary
+
+# Extraction from Jinja2 XML templates
 [jinja2: **/themes/**.xml]
+
+# Extraction from JavaScript files
 [javascript: **.js]
+[javascript: **.js_t]
diff --git a/sphinx/locale/sphinx.pot b/sphinx/locale/sphinx.pot
index b1d816f72..b88ca5e4a 100644
--- a/sphinx/locale/sphinx.pot
+++ b/sphinx/locale/sphinx.pot
@@ -1,14 +1,14 @@
 # Translations template for Sphinx.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2013 ORGANIZATION
 # This file is distributed under the same license as the Sphinx project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Sphinx 1.1pre/9523af9ba9aa+\n"
+"Project-Id-Version: Sphinx 1.2pre/a9793de7f892+\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-09-21 10:06+0200\n"
+"POT-Creation-Date: 2013-03-03 15:44-0530\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"
@@ -22,23 +22,23 @@ msgstr ""
 msgid "%s %s documentation"
 msgstr ""
 
-#: sphinx/environment.py:119 sphinx/writers/latex.py:190
-#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203
+#: sphinx/transforms.py:51 sphinx/writers/latex.py:202
+#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:217
 #, python-format
 msgid "%B %d, %Y"
 msgstr ""
 
-#: sphinx/environment.py:1625
+#: sphinx/environment.py:1507
 #, python-format
 msgid "see %s"
 msgstr ""
 
-#: sphinx/environment.py:1628
+#: sphinx/environment.py:1510
 #, python-format
 msgid "see also %s"
 msgstr ""
 
-#: sphinx/roles.py:175
+#: sphinx/roles.py:176
 #, python-format
 msgid "Python Enhancement Proposals; PEP %s"
 msgstr ""
@@ -51,24 +51,24 @@ msgstr ""
 msgid "Module level"
 msgstr ""
 
-#: sphinx/builders/html.py:274
+#: sphinx/builders/html.py:293
 #, python-format
 msgid "%b %d, %Y"
 msgstr ""
 
-#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30
+#: sphinx/builders/html.py:312 sphinx/themes/basic/defindex.html:30
 msgid "General Index"
 msgstr ""
 
-#: sphinx/builders/html.py:293
+#: sphinx/builders/html.py:312
 msgid "index"
 msgstr ""
 
-#: sphinx/builders/html.py:353
+#: sphinx/builders/html.py:372
 msgid "next"
 msgstr ""
 
-#: sphinx/builders/html.py:362
+#: sphinx/builders/html.py:381
 msgid "previous"
 msgstr ""
 
@@ -76,41 +76,38 @@ msgstr ""
 msgid " (in "
 msgstr ""
 
-#: sphinx/directives/other.py:136
+#: sphinx/directives/other.py:138
 msgid "Section author: "
 msgstr ""
 
-#: sphinx/directives/other.py:138
+#: sphinx/directives/other.py:140
 msgid "Module author: "
 msgstr ""
 
-#: sphinx/directives/other.py:140
+#: sphinx/directives/other.py:142
 msgid "Code author: "
 msgstr ""
 
-#: sphinx/directives/other.py:142
+#: sphinx/directives/other.py:144
 msgid "Author: "
 msgstr ""
 
-#: sphinx/directives/other.py:215
-msgid "See also"
-msgstr ""
-
 #: sphinx/domains/__init__.py:244
 #, python-format
 msgid "%s %s"
 msgstr ""
 
-#: sphinx/domains/c.py:51 sphinx/domains/python.py:95
+#: sphinx/domains/c.py:51 sphinx/domains/cpp.py:939 sphinx/domains/python.py:95
 msgid "Parameters"
 msgstr ""
 
-#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128
-#: sphinx/domains/python.py:107
+#: sphinx/domains/c.py:54 sphinx/domains/cpp.py:945
+#: sphinx/domains/javascript.py:128 sphinx/domains/python.py:107
 msgid "Returns"
 msgstr ""
 
-#: sphinx/domains/c.py:56 sphinx/domains/python.py:109
+#: sphinx/domains/c.py:56 sphinx/domains/javascript.py:130
+#: sphinx/domains/python.py:109
 msgid "Return type"
 msgstr ""
 
@@ -139,58 +136,58 @@ msgstr ""
 msgid "%s (C variable)"
 msgstr ""
 
-#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060
-#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559
+#: sphinx/domains/c.py:203 sphinx/domains/cpp.py:1207
+#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
 msgid "function"
 msgstr ""
 
-#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061
+#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1208
 msgid "member"
 msgstr ""
 
-#: sphinx/domains/c.py:206
+#: sphinx/domains/c.py:205
 msgid "macro"
 msgstr ""
 
-#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062
+#: sphinx/domains/c.py:206 sphinx/domains/cpp.py:1209
 msgid "type"
 msgstr ""
 
-#: sphinx/domains/c.py:208
+#: sphinx/domains/c.py:207
 msgid "variable"
 msgstr ""
 
-#: sphinx/domains/cpp.py:904
+#: sphinx/domains/cpp.py:1038
 #, python-format
 msgid "%s (C++ class)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:919
+#: sphinx/domains/cpp.py:1061
 #, python-format
 msgid "%s (C++ type)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:938
+#: sphinx/domains/cpp.py:1081
 #, python-format
 msgid "%s (C++ member)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:990
+#: sphinx/domains/cpp.py:1137
 #, python-format
 msgid "%s (C++ function)"
 msgstr ""
 
-#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163
-#: sphinx/domains/python.py:561
+#: sphinx/domains/cpp.py:1206 sphinx/domains/javascript.py:165
+#: sphinx/domains/python.py:562
 msgid "class"
 msgstr ""
 
-#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254
+#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:253
 #, python-format
 msgid "%s() (built-in function)"
 msgstr ""
 
-#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318
+#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:317
 #, python-format
 msgid "%s() (%s method)"
 msgstr ""
@@ -205,7 +202,7 @@ msgstr ""
 msgid "%s (global variable or constant)"
 msgstr ""
 
-#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356
+#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:355
 #, python-format
 msgid "%s (%s attribute)"
 msgstr ""
@@ -214,15 +211,15 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: sphinx/domains/javascript.py:125
+#: sphinx/domains/cpp.py:942 sphinx/domains/javascript.py:125
 msgid "Throws"
 msgstr ""
 
-#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560
+#: sphinx/domains/javascript.py:166 sphinx/domains/python.py:561
 msgid "data"
 msgstr ""
 
-#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566
+#: sphinx/domains/javascript.py:167 sphinx/domains/python.py:567
 msgid "attribute"
 msgstr ""
 
@@ -234,58 +231,58 @@ msgstr ""
 msgid "Raises"
 msgstr ""
 
-#: sphinx/domains/python.py:255 sphinx/domains/python.py:312
-#: sphinx/domains/python.py:324 sphinx/domains/python.py:337
+#: sphinx/domains/python.py:254 sphinx/domains/python.py:311
+#: sphinx/domains/python.py:323 sphinx/domains/python.py:336
 #, python-format
 msgid "%s() (in module %s)"
 msgstr ""
 
-#: sphinx/domains/python.py:258
+#: sphinx/domains/python.py:257
 #, python-format
 msgid "%s (built-in variable)"
 msgstr ""
 
-#: sphinx/domains/python.py:259 sphinx/domains/python.py:350
+#: sphinx/domains/python.py:258 sphinx/domains/python.py:349
 #, python-format
 msgid "%s (in module %s)"
 msgstr ""
 
-#: sphinx/domains/python.py:275
+#: sphinx/domains/python.py:274
 #, python-format
 msgid "%s (built-in class)"
 msgstr ""
 
-#: sphinx/domains/python.py:276
+#: sphinx/domains/python.py:275
 #, python-format
 msgid "%s (class in %s)"
 msgstr ""
 
-#: sphinx/domains/python.py:316
+#: sphinx/domains/python.py:315
 #, python-format
 msgid "%s() (%s.%s method)"
 msgstr ""
 
-#: sphinx/domains/python.py:328
+#: sphinx/domains/python.py:327
 #, python-format
 msgid "%s() (%s.%s static method)"
 msgstr ""
 
-#: sphinx/domains/python.py:331
+#: sphinx/domains/python.py:330
 #, python-format
 msgid "%s() (%s static method)"
 msgstr ""
 
-#: sphinx/domains/python.py:341
+#: sphinx/domains/python.py:340
 #, python-format
 msgid "%s() (%s.%s class method)"
 msgstr ""
 
-#: sphinx/domains/python.py:344
+#: sphinx/domains/python.py:343
 #, python-format
 msgid "%s() (%s class method)"
 msgstr ""
 
-#: sphinx/domains/python.py:354
+#: sphinx/domains/python.py:353
 #, python-format
 msgid "%s (%s.%s attribute)"
 msgstr ""
@@ -303,49 +300,49 @@ msgstr ""
 msgid "modules"
 msgstr ""
 
-#: sphinx/domains/python.py:537
+#: sphinx/domains/python.py:538
 msgid "Deprecated"
 msgstr ""
 
-#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179
+#: sphinx/domains/python.py:563 sphinx/locale/__init__.py:179
 msgid "exception"
 msgstr ""
 
-#: sphinx/domains/python.py:563
+#: sphinx/domains/python.py:564
 msgid "method"
 msgstr ""
 
-#: sphinx/domains/python.py:564
+#: sphinx/domains/python.py:565
 msgid "class method"
 msgstr ""
 
-#: sphinx/domains/python.py:565
+#: sphinx/domains/python.py:566
 msgid "static method"
 msgstr ""
 
-#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175
+#: sphinx/domains/python.py:568 sphinx/locale/__init__.py:175
 msgid "module"
 msgstr ""
 
-#: sphinx/domains/python.py:695
+#: sphinx/domains/python.py:696
 msgid " (deprecated)"
 msgstr ""
 
-#: sphinx/domains/rst.py:55
+#: sphinx/domains/rst.py:53
 #, python-format
 msgid "%s (directive)"
 msgstr ""
 
-#: sphinx/domains/rst.py:57
+#: sphinx/domains/rst.py:55
 #, python-format
 msgid "%s (role)"
 msgstr ""
 
-#: sphinx/domains/rst.py:106
+#: sphinx/domains/rst.py:104
 msgid "directive"
 msgstr ""
 
-#: sphinx/domains/rst.py:107
+#: sphinx/domains/rst.py:105
 msgid "role"
 msgstr ""
 
@@ -359,67 +356,94 @@ msgstr ""
 msgid "%scommand line option; %s"
 msgstr ""
 
-#: sphinx/domains/std.py:393
+#: sphinx/domains/std.py:414
 msgid "glossary term"
 msgstr ""
 
-#: sphinx/domains/std.py:394
+#: sphinx/domains/std.py:415
 msgid "grammar token"
 msgstr ""
 
-#: sphinx/domains/std.py:395
+#: sphinx/domains/std.py:416
 msgid "reference label"
 msgstr ""
 
-#: sphinx/domains/std.py:396
+#: sphinx/domains/std.py:418
 msgid "environment variable"
 msgstr ""
 
-#: sphinx/domains/std.py:397
+#: sphinx/domains/std.py:419
 msgid "program option"
 msgstr ""
 
-#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/domains/std.py:449 sphinx/themes/basic/genindex-single.html:32
+#: sphinx/themes/basic/genindex-single.html:57
 #: sphinx/themes/basic/genindex-split.html:11
 #: sphinx/themes/basic/genindex-split.html:14
 #: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35
-#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134
-#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456
+#: sphinx/themes/basic/genindex.html:68 sphinx/writers/latex.py:191
+#: sphinx/writers/texinfo.py:475
 msgid "Index"
 msgstr ""
 
-#: sphinx/domains/std.py:428
+#: sphinx/domains/std.py:450
 msgid "Module Index"
 msgstr ""
 
-#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25
+#: sphinx/domains/std.py:451 sphinx/themes/basic/defindex.html:25
 msgid "Search Page"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1002
+#: sphinx/ext/autodoc.py:1042
 #, python-format
 msgid "   Bases: %s"
 msgstr ""
 
-#: sphinx/ext/autodoc.py:1038
+#: sphinx/ext/autodoc.py:1078
 #, python-format
 msgid "alias of :class:`%s`"
 msgstr ""
 
-#: sphinx/ext/todo.py:41
+#: sphinx/ext/graphviz.py:301 sphinx/ext/graphviz.py:309
+#, python-format
+msgid "[graph: %s]"
+msgstr ""
+
+#: sphinx/ext/graphviz.py:303 sphinx/ext/graphviz.py:311
+msgid "[graph]"
+msgstr ""
+
+#: sphinx/ext/intersphinx.py:234
+#, python-format
+msgid "(in %s v%s)"
+msgstr ""
+
+#: sphinx/ext/refcounting.py:83
+msgid "Return value: Always NULL."
+msgstr ""
+
+#: sphinx/ext/refcounting.py:85
+msgid "Return value: New reference."
+msgstr ""
+
+#: sphinx/ext/refcounting.py:87
+msgid "Return value: Borrowed reference."
+msgstr ""
+
+#: sphinx/ext/todo.py:42
 msgid "Todo"
 msgstr ""
 
-#: sphinx/ext/todo.py:109
+#: sphinx/ext/todo.py:110
 #, python-format
 msgid "(The <<original entry>> is located in  %s, line %d.)"
 msgstr ""
 
-#: sphinx/ext/todo.py:117
+#: sphinx/ext/todo.py:119
 msgid "original entry"
 msgstr ""
 
-#: sphinx/ext/viewcode.py:70
+#: sphinx/ext/linkcode.py:66 sphinx/ext/viewcode.py:70
 msgid "[source]"
 msgstr ""
 
@@ -473,7 +497,7 @@ msgid "Note"
 msgstr ""
 
 #: sphinx/locale/__init__.py:162
-msgid "See Also"
+msgid "See also"
 msgstr ""
 
 #: sphinx/locale/__init__.py:163
@@ -519,25 +543,25 @@ msgstr ""
 msgid "built-in function"
 msgstr ""
 
-#: sphinx/themes/agogo/layout.html:45 sphinx/themes/basic/globaltoc.html:10
-#: sphinx/themes/basic/localtoc.html:11
+#: sphinx/themes/agogo/layout.html:46 sphinx/themes/basic/globaltoc.html:10
+#: sphinx/themes/basic/localtoc.html:11 sphinx/themes/scrolls/layout.html:35
 msgid "Table Of Contents"
 msgstr ""
 
-#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137
-#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20
+#: sphinx/themes/agogo/layout.html:50 sphinx/themes/basic/search.html:11
+#: sphinx/themes/basic/search.html:20 sphinx/themes/basic/searchresults.html:10
 msgid "Search"
 msgstr ""
 
-#: sphinx/themes/agogo/layout.html:52 sphinx/themes/basic/searchbox.html:15
+#: sphinx/themes/agogo/layout.html:53 sphinx/themes/basic/searchbox.html:15
 msgid "Go"
 msgstr ""
 
-#: sphinx/themes/agogo/layout.html:57 sphinx/themes/basic/searchbox.html:20
+#: sphinx/themes/agogo/layout.html:58 sphinx/themes/basic/searchbox.html:20
 msgid "Enter search terms or a module, class or function name."
 msgstr ""
 
-#: sphinx/themes/agogo/layout.html:78 sphinx/themes/basic/sourcelink.html:14
+#: sphinx/themes/agogo/layout.html:79 sphinx/themes/basic/sourcelink.html:14
 msgid "Show Source"
 msgstr ""
 
@@ -545,6 +569,18 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: sphinx/themes/basic/defindex.html:15
+msgid "Welcome! This is"
+msgstr ""
+
+#: sphinx/themes/basic/defindex.html:16
+msgid "the documentation for"
+msgstr ""
+
+#: sphinx/themes/basic/defindex.html:17
+msgid "last updated"
+msgstr ""
+
 #: sphinx/themes/basic/defindex.html:20
 msgid "Indices and tables:"
 msgstr ""
@@ -667,15 +703,16 @@ msgid ""
 "    containing fewer words won't appear in the result list."
 msgstr ""
 
-#: sphinx/themes/basic/search.html:36
+#: sphinx/themes/basic/search.html:36 sphinx/themes/basic/searchresults.html:17
 msgid "search"
 msgstr ""
 
-#: sphinx/themes/basic/search.html:40
+#: sphinx/themes/basic/search.html:40 sphinx/themes/basic/searchresults.html:21
+#: sphinx/themes/basic/static/searchtools.js_t:274
 msgid "Search Results"
 msgstr ""
 
-#: sphinx/themes/basic/search.html:42
+#: sphinx/themes/basic/search.html:42 sphinx/themes/basic/searchresults.html:23
 msgid "Your search did not match any results."
 msgstr ""
 
@@ -715,25 +752,48 @@ msgstr ""
 msgid "Other changes"
 msgstr ""
 
-#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504
-#: sphinx/writers/html.py:510
+#: sphinx/themes/basic/static/doctools.js:142 sphinx/writers/html.py:513
+#: sphinx/writers/html.py:519
 msgid "Permalink to this headline"
 msgstr ""
 
-#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92
+#: sphinx/themes/basic/static/doctools.js:148 sphinx/writers/html.py:97
 msgid "Permalink to this definition"
 msgstr ""
 
-#: sphinx/themes/basic/static/doctools.js:189
+#: sphinx/themes/basic/static/doctools.js:177
 msgid "Hide Search Matches"
 msgstr ""
 
-#: sphinx/themes/default/static/sidebar.js:69
+#: sphinx/themes/basic/static/searchtools.js_t:114
+msgid "Searching"
+msgstr ""
+
+#: sphinx/themes/basic/static/searchtools.js_t:119
+msgid "Preparing search..."
+msgstr ""
+
+#: sphinx/themes/basic/static/searchtools.js_t:276
+msgid ""
+"Your search did not match any documents. Please make sure that all words "
+"are spelled correctly and that you've selected enough categories."
+msgstr ""
+
+#: sphinx/themes/basic/static/searchtools.js_t:278
+#, python-format
+msgid "Search finished, found %s page(s) matching the search query."
+msgstr ""
+
+#: sphinx/themes/basic/static/searchtools.js_t:330
+msgid ", in "
+msgstr ""
+
+#: sphinx/themes/default/static/sidebar.js_t:83
 msgid "Expand sidebar"
 msgstr ""
 
-#: sphinx/themes/default/static/sidebar.js:82
-#: sphinx/themes/default/static/sidebar.js:110
+#: sphinx/themes/default/static/sidebar.js_t:96
+#: sphinx/themes/default/static/sidebar.js_t:124
 msgid "Collapse sidebar"
 msgstr ""
 
@@ -741,24 +801,29 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: sphinx/writers/latex.py:177
+#: sphinx/writers/latex.py:189
 msgid "Release"
 msgstr ""
 
-#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182
-#: sphinx/writers/texinfo.py:589
+#: sphinx/writers/latex.py:618 sphinx/writers/manpage.py:187
+#: sphinx/writers/texinfo.py:612
 msgid "Footnotes"
 msgstr ""
 
-#: sphinx/writers/latex.py:676
+#: sphinx/writers/latex.py:702
 msgid "continued from previous page"
 msgstr ""
 
-#: sphinx/writers/latex.py:681
+#: sphinx/writers/latex.py:708
 msgid "Continued on next page"
 msgstr ""
 
-#: sphinx/writers/text.py:437
+#: sphinx/writers/manpage.py:232 sphinx/writers/text.py:536
+#, python-format
+msgid "[image: %s]"
+msgstr ""
+
+#: sphinx/writers/manpage.py:233 sphinx/writers/text.py:537
 msgid "[image]"
 msgstr ""
 
diff --git a/sphinx/themes/basic/changes/frameset.html b/sphinx/themes/basic/changes/frameset.html
index 9d9af9eb5..75e0599cb 100644
--- a/sphinx/themes/basic/changes/frameset.html
+++ b/sphinx/themes/basic/changes/frameset.html
@@ -2,7 +2,7 @@
   "http://www.w3.org/TR/html4/frameset.dtd">
 <html>
   <head>
-    <title>{% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} &mdash; {{ docstitle }}{% endtrans %}</title>
+    <title>{% trans version=version|e, docstitle=docstitle|e %}{{ _('Changes in Version') }} {{ version }} &mdash; {{ docstitle }}{% endtrans %}</title>
   </head>
   <frameset cols="45%,*">
     <frame name="main" src="changes.html">
diff --git a/sphinx/themes/basic/changes/versionchanges.html b/sphinx/themes/basic/changes/versionchanges.html
index 09651bf1d..c51d395e2 100644
--- a/sphinx/themes/basic/changes/versionchanges.html
+++ b/sphinx/themes/basic/changes/versionchanges.html
@@ -9,12 +9,12 @@
   <head>
     <link rel="stylesheet" href="default.css">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>{% trans version=version|e, docstitle=docstitle|e %}Changes in Version {{ version }} &mdash; {{ docstitle }}{% endtrans %}</title>
+    <title>{% trans version=version|e, docstitle=docstitle|e %}{{ _('Changes in Version') }} {{ version }} &mdash; {{ docstitle }}{% endtrans %}</title>
   </head>
   <body>
     <div class="document">
       <div class="body">
-    <h1>{% trans version=version|e %}Automatically generated list of changes in version {{ version }}{% endtrans %}</h1>
+    <h1>{% trans version=version|e %}{{ _('Automatically generated list of changes in version') }} {{ version }}{% endtrans %}</h1>
     <h2>{{ _('Library changes') }}</h2>
     {% for modname, changes in libchanges %}
     <h4>{{ modname }}</h4>
diff --git a/sphinx/themes/basic/defindex.html b/sphinx/themes/basic/defindex.html
index 1ae9630de..c19da402b 100644
--- a/sphinx/themes/basic/defindex.html
+++ b/sphinx/themes/basic/defindex.html
@@ -12,9 +12,9 @@
 {% block body %}
   <h1>{{ docstitle|e }}</h1>
   <p>
-    Welcome! This is
-    {% block description %}the documentation for {{ project|e }}
-    {{ release|e }}{% if last_updated %}, last updated {{ last_updated|e }}{% endif %}{% endblock %}.
+    {{ _('Welcome! This is') }}
+    {% block description %}{{ _('the documentation for') }} {{ project|e }}
+    {{ release|e }}{% if last_updated %}, {{ _('last updated') }} {{ last_updated|e }}{% endif %}{% endblock %}.
   </p>
   {% block tables %}
   <p><strong>{{ _('Indices and tables:') }}</strong></p>
diff --git a/sphinx/themes/basic/genindex-single.html b/sphinx/themes/basic/genindex-single.html
index e79212516..a06714886 100644
--- a/sphinx/themes/basic/genindex-single.html
+++ b/sphinx/themes/basic/genindex-single.html
@@ -54,7 +54,7 @@
 {% endblock %}
 
 {% block sidebarrel %}
-   <h4>Index</h4>
+   <h4>{{ _('Index') }}</h4>
    <p>{% for key, dummy in genindexentries -%}
    <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
      {% if not loop.last %}| {% endif %}
diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index 9e4e39a18..15ea75ebb 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -192,10 +192,10 @@
       {%- endif %}
     {%- endif %}
     {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+      {% trans last_updated=last_updated|e %}{{ _('Last updated on') }} {{ last_updated }}.{% endtrans %}
     {%- endif %}
     {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+      {% trans sphinx_version=sphinx_version|e %}{{ _('Created using') }} <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     {%- endif %}
     </div>
 {%- endblock %}
diff --git a/sphinx/themes/basic/searchresults.html b/sphinx/themes/basic/searchresults.html
index 5c42fbaeb..125338ac1 100644
--- a/sphinx/themes/basic/searchresults.html
+++ b/sphinx/themes/basic/searchresults.html
@@ -7,20 +7,20 @@
     :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
-<h1 id="search-documentation">Search</h1>
+<h1 id="search-documentation">{{ _('Search') }}</h1>
 <p>
   From here you can search these documents. Enter your search
   words into the box below and click "search".
 </p>
 <form action="" method="get">
   <input type="text" name="q" value="" />
-  <input type="submit" value="search" />
+  <input type="submit" value="{{ _('search') }}" />
   <span id="search-progress" style="padding-left: 10px"></span>
 </form>
 {%- if search_performed %}
-  <h2>Search Results</h2>
+  <h2>{{ _('Search Results') }}</h2>
   {%- if not search_results %}
-  <p>Your search did not match any results.</p>
+  <p>{{ _('Your search did not match any results.') }}</p>
   {%- endif %}
 {%- endif %}
 <div id="search-results">
diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html
index edbda50b2..337d0ca24 100644
--- a/sphinx/themes/haiku/layout.html
+++ b/sphinx/themes/haiku/layout.html
@@ -56,7 +56,7 @@
       <div class="content">
         {#{%- if display_toc %}
         <div id="toc">
-          <h3>Table Of Contents</h3>
+          <h3>{{ _('Table Of Contents') }}</h3>
           {{ toc }}
         </div>
         {%- endif %}#}
diff --git a/sphinx/themes/scrolls/layout.html b/sphinx/themes/scrolls/layout.html
index 97f7ca1db..48e5e4e46 100644
--- a/sphinx/themes/scrolls/layout.html
+++ b/sphinx/themes/scrolls/layout.html
@@ -32,7 +32,7 @@
       <div id="contentwrapper">
         {%- if display_toc %}
         <div id="toc">
-          <h3>Table Of Contents</h3>
+          <h3>{{ _('Table Of Contents') }}</h3>
           {{ toc }}
         </div>
         {%- endif %}