From 590a41164e558fec8b54399d296c67dfffce6970 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Sun, 2 Jun 2013 00:32:29 -0400
Subject: [PATCH] Fixed admindoc template errors introduced by 02fd87c821.

Also regenerated the affected translation template.

Refs #20540.
---
 .../admindocs/locale/en/LC_MESSAGES/django.po | 49 ++++++++++---------
 .../admindocs/templates/admin_doc/index.html  | 10 ++--
 .../templates/admin_doc/view_detail.html      |  2 +-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index f1e851462dc..5a4dcd0872d 100644
--- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 12:08+0200\n"
+"POT-Creation-Date: 2013-06-02 00:30-0400\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:8
+#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:29
 msgid "Bookmarklets"
 msgstr ""
 
@@ -152,16 +152,32 @@ msgstr ""
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
+#: templates/admin_doc/index.html:17
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr ""
+
 #: templates/admin_doc/index.html:18
 msgid "List of all the template tags and their functions."
 msgstr ""
 
+#: templates/admin_doc/index.html:20
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr ""
+
 #: templates/admin_doc/index.html:21
 msgid ""
 "Filters are actions which can be applied to variables in a template to alter "
 "the output."
 msgstr ""
 
+#: templates/admin_doc/index.html:23 templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+#: templates/admin_doc/model_index.html:14
+msgid "Models"
+msgstr ""
+
 #: templates/admin_doc/index.html:24
 msgid ""
 "Models are descriptions of all the objects in the system and their "
@@ -169,6 +185,12 @@ msgid ""
 "template variables"
 msgstr ""
 
+#: templates/admin_doc/index.html:26 templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+#: templates/admin_doc/view_index.html:12
+msgid "Views"
+msgstr ""
+
 #: templates/admin_doc/index.html:27
 msgid ""
 "Each page on the public site is generated by a view. The view defines which "
@@ -197,12 +219,6 @@ msgid ""
 "Please ask your administrators to install <a href=\"%(link)s\">docutils</a>."
 msgstr ""
 
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/model_index.html:14
-msgid "Models"
-msgstr ""
-
 #: templates/admin_doc/model_detail.html:21
 #, python-format
 msgid "Model: %(name)s"
@@ -259,10 +275,6 @@ msgstr ""
 msgid "Back to Documentation"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:9
-msgid "Filters"
-msgstr ""
-
 #: templates/admin_doc/template_filter_index.html:12
 msgid "Template filters"
 msgstr ""
@@ -283,10 +295,6 @@ msgid ""
 "using the filter."
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:9
-msgid "Tags"
-msgstr ""
-
 #: templates/admin_doc/template_tag_index.html:12
 msgid "Template tags"
 msgstr ""
@@ -307,14 +315,9 @@ msgid ""
 "the tag."
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
-#: templates/admin_doc/view_index.html:12
-msgid "Views"
-msgstr ""
-
 #: templates/admin_doc/view_detail.html:12
-msgid "View: {{ name }}"
+#, python-format
+msgid "View: %(name)s"
 msgstr ""
 
 #: templates/admin_doc/view_detail.html:23
diff --git a/django/contrib/admindocs/templates/admin_doc/index.html b/django/contrib/admindocs/templates/admin_doc/index.html
index e80c62ea3ac..2af43d78c8c 100644
--- a/django/contrib/admindocs/templates/admin_doc/index.html
+++ b/django/contrib/admindocs/templates/admin_doc/index.html
@@ -14,19 +14,19 @@
 <h1>{% trans 'Documentation' %}</h1>
 
 <div id="content-main">
-  <h3><a href="tags/">{% trans 'Tags</a></h3>
+  <h3><a href="tags/">{% trans 'Tags' %}</a></h3>
   <p>{% trans 'List of all the template tags and their functions.' %}</p>
 
-  <h3><a href="filters/">{% trans 'Filters</a></h3>
+  <h3><a href="filters/">{% trans 'Filters' %}</a></h3>
   <p>{% trans 'Filters are actions which can be applied to variables in a template to alter the output.' %}</p>
 
-  <h3><a href="models/">{% trans 'Models</a></h3>
+  <h3><a href="models/">{% trans 'Models' %}</a></h3>
   <p>{% trans 'Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables' %}.</p>
 
-  <h3><a href="views/">{% trans 'Views</a></h3>
+  <h3><a href="views/">{% trans 'Views' %}</a></h3>
   <p>{% trans 'Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.' %}</p>
 
-  <h3><a href="bookmarklets/">{% trans 'Bookmarklets</a></h3>
+  <h3><a href="bookmarklets/">{% trans 'Bookmarklets' %}</a></h3>
   <p>{% trans 'Tools for your browser to quickly access admin functionality.' %}</p>
 </div>
 
diff --git a/django/contrib/admindocs/templates/admin_doc/view_detail.html b/django/contrib/admindocs/templates/admin_doc/view_detail.html
index 698f3078432..050e6c800bd 100644
--- a/django/contrib/admindocs/templates/admin_doc/view_detail.html
+++ b/django/contrib/admindocs/templates/admin_doc/view_detail.html
@@ -9,7 +9,7 @@
 &rsaquo; {{ name }}
 </div>
 {% endblock %}
-{% block title %}{% trans 'View: {{ name }}' %}{% endblock %}
+{% block title %}{% blocktrans %}View: {{ name }}{% endblocktrans %}{% endblock %}
 
 {% block content %}