From 60471c9600ec3db670e6a8a206bdae0d74edfe65 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 10 Oct 2015 14:51:38 +0200
Subject: [PATCH] [1.9.x] Simplified translatable string in admindocs template

---
 .../contrib/admindocs/locale/en/LC_MESSAGES/django.po  |  9 ++++-----
 .../admindocs/templates/admin_doc/bookmarklets.html    | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index 4b7e8489a8..f1f9cb77d9 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: 2015-10-09 17:42+0200\n"
+"POT-Creation-Date: 2015-10-10 14:49+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -57,10 +57,9 @@ msgstr ""
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:15
 msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.</p>\n"
+"To install bookmarklets, drag the link to your bookmarks toolbar, or right-"
+"click the link and add it to your bookmarks. Now you can select the "
+"bookmarklet from any page in the site."
 msgstr ""
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
diff --git a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html
index bb5e8b442d..6bba2f2d12 100644
--- a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html
+++ b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html
@@ -12,11 +12,11 @@
 
 {% block content %}
 
-{% blocktrans %}
-<p class="help">To install bookmarklets, drag the link to your bookmarks
-toolbar, or right-click the link and add it to your bookmarks. Now you can
-select the bookmarklet from any page in the site.</p>
-{% endblocktrans %}
+<p class="help">{% blocktrans trimmed %}
+To install bookmarklets, drag the link to your bookmarks toolbar, or right-click
+the link and add it to your bookmarks. Now you can select the bookmarklet
+from any page in the site.
+{% endblocktrans %}</p>
 
 <div id="content-main">
     <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('HEAD',location.href,false);x.send(null);try{view=x.getResponseHeader('x-view');}catch(e){alert('No view found for this page');return;}if(view=='undefined'){alert('No view found for this page');}document.location='{% url 'django-admindocs-views-index' %}'+view+'/';})()">{% trans "Documentation for this page" %}</a></h3>