use blocktrans trimmed to have better template formatting, simplify blocktrans to trans at some places

nsupdate/accounts/templates/accounts/delete_user.html

@@ -4,11 +4,11 @@
 {% block content %}
     <div class="row">
          <div class="col-lg-8">
-            <h3>{% blocktrans %}Delete your User Account{% endblocktrans %}</h3>
+            <h3>{% trans "Delete your User Account" %}</h3>
             <form action="" method="post">
                 {% csrf_token %}
                 <p>
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                     Are you sure you want to delete your user account and
                     all your data on this service? You can not undelete your data.
                     {% endblocktrans %}

nsupdate/accounts/templates/accounts/user_profile.html

@@ -34,7 +34,7 @@
     <div class="col-md-4">
         <h3>{% trans "Delete User Profile" %}</h3>
         <p>
-            {% blocktrans %}
+            {% blocktrans trimmed %}
             If you'ld like to stop using this service and delete this user profile and
             all your data (especially all hosts and all domains created by this user),
             you can do it here.

nsupdate/accounts/templates/registration/registration_form.html

@@ -17,31 +17,35 @@
         <li>{% trans "Password:" %} test</li>
     </ul>
     <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         <b>Note:</b> if that doesn't work, the service administrator did not set up
         the test account yet or discontinued offering it. In that case, you can
-        still just register a new account.{% endblocktrans %}
+        still just register a new account.
+        {% endblocktrans %}
     </p>
-    <h2>{% blocktrans %}test account is <b>only</b> for testing{% endblocktrans %}</h2>
+    <h2>{% trans "test account is <b>only</b> for testing" %}</h2>
     <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         Any data (hosts, domains, ...) entered using the test account might be removed
-        at any time and without prior notice.{% endblocktrans %}
+        at any time and without prior notice.
+        {% endblocktrans %}
     </p>
     <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         So if you'ld like your stuff to stay, please register for a regular account after
-        finishing your initial evaluation.{% endblocktrans %}
+        finishing your initial evaluation.
+        {% endblocktrans %}
     </p>
   </div>
   <div class="col-md-7">
     <h2>{% trans "Register new account" %}</h2>
     <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         Username: should be related to your <em>person or organisation</em>
         (not: to the host(s) you want to register).<br>
         E-Mail address: must be a <em>working</em> one, we'll send you an activation E-Mail there.<br>
-        Password: please use a sane one, we trust you.{% endblocktrans %}
+        Password: please use a sane one, we trust you.
+        {% endblocktrans %}
     </p>
     <br>
     <form class="form-horizontal jumbotron" role="form" method="post" action="">

nsupdate/login/templates/login.html

@@ -8,7 +8,7 @@
         <h2>{% trans "Login with a local Account" %}</h2>
         <hr />
         {% if form.errors %}
-        <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
+        <p>{% trans "Your username and password didn't match. Please try again." %}</p>
         {% endif %}
         <form class="form-horizontal" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
             {% csrf_token %}

nsupdate/main/templates/main/about.html

@@ -10,12 +10,16 @@
                 {% blocktrans %}{{ WWW_HOST }} is a <b>dynamic dns service</b>.{% endblocktrans %}
             </p>
             <p>
-                {% blocktrans %}You usually need it so your router (or other dyndns2-compatible
+                {% blocktrans trimmed %}
+                You usually need it so your router (or other dyndns2-compatible
                 client) can update a hostname, so you don't need to know or find
-                out your current IP address.{% endblocktrans %}
+                out your current IP address.
+                {% endblocktrans %}
             </p>
             <p>
-                {% blocktrans %}{{ WWW_HOST }} is <b>simple, usable, free, friendly, secure and respects your privacy</b>.{% endblocktrans %}
+                {% blocktrans trimmed %}
+                {{ WWW_HOST }} is <b>simple, usable, free, friendly, secure and respects your privacy</b>.
+                {% endblocktrans %}
             </p>
         </div>
         <div class="col-md-4">
@@ -27,8 +31,11 @@
                 <li>{% trans "nagging its users to make a paid subscription" %}</li>
                 <li>{% trans "annoying its users with advertisements or spam" %}</li>
                 <li>{% trans "cancelling hosts or accounts after a short period of non-usage" %}</li>
-                <li>{% blocktrans %}hiding the few free features almost undiscoverably
+                <li>
-                    between a ton of commercial-only features{% endblocktrans %}</li>
+                    {% blocktrans trimmed %}
+                    hiding the few free features almost undiscoverably between a ton of commercial-only features
+                    {% endblocktrans %}
+                </li>
             </ul>
         </div>
         <div class="col-md-4">
@@ -37,14 +44,19 @@
                 {% trans "You can just try it using the test account (see Register page)." %}
             </p>
             <p>
-                {% blocktrans %}Also, we have
+                {% blocktrans trimmed %}
+                Also, we have
                 <a href="http://nsupdateinfo.readthedocs.org/"
                    title="Open docs in new window" target="_blank">documentation</a> &mdash;
                 there might be some interesting stuff for you in it that is
-                not visible or obvious on the user interface.{% endblocktrans %}
+                not visible or obvious on the user interface.
+                {% endblocktrans %}
             </p>
-            <p>{% blocktrans %}If you are interested in the software project, have a look at the
+            <p>
-                <a href="https://github.com/nsupdate-info/nsupdate.info">nsupdate.info project on GitHub</a>.{% endblocktrans %}
+                {% blocktrans trimmed %}
+                If you are interested in the software project, have a look at the
+                <a href="https://github.com/nsupdate-info/nsupdate.info">nsupdate.info project on GitHub</a>.
+                {% endblocktrans %}
             </p>
         </div>
     </div>
@@ -63,8 +75,10 @@
                 <li>{% trans "Don't spam us via e-mail." %}</li>
             </ul>
             <p>
-                {% blocktrans %}We reserve the right to remove any account or hostname(s) that are
+                {% blocktrans trimmed %}
-                related to unfair use of the service - at any time and without prior notice.{% endblocktrans %}
+                We reserve the right to remove any account or hostname(s) that are
+                related to unfair use of the service - at any time and without prior notice.
+                {% endblocktrans %}
             </p>
         </div>
         <div class="col-md-4">
@@ -86,8 +100,10 @@
             </p>
             <h2>{% trans "Software Project Contact" %}</h2>
             <p>
-                {% blocktrans %}Visit the
+                {% blocktrans trimmed %}
-                <a href="https://github.com/nsupdate-info/nsupdate.info">nsupdate.info project on GitHub</a> to:{% endblocktrans %}
+                Visit the
+                <a href="https://github.com/nsupdate-info/nsupdate.info">nsupdate.info project on GitHub</a> to:
+                {% endblocktrans %}
             </p>
             <ul>
                 <li>{% trans "file issues on the issue tracker for bugs, ideas, patches." %}</li>

nsupdate/main/templates/main/domain.html

@@ -8,8 +8,10 @@
             <h3>{% trans "Edit Domain" %}</h3>
             <p>{% trans "You can't change the domain name. If you want to have another domain name, you have to delete this domain and create a new one." %}</p>
             <p>
-                {% blocktrans %}Please note that update algorithm and update secret need to match.
+                {% blocktrans trimmed %}
-                Just create a new secret after submitting this form with a changed update algorithm.{% endblocktrans %}
+                Please note that update algorithm and update secret need to match.
+                Just create a new secret after submitting this form with a changed update algorithm.
+                {% endblocktrans %}
             </p>
             <form method="post" action="">
                 {% csrf_token %}
@@ -20,12 +22,16 @@
         <div class="col-md-4">
             <h3>{% trans "Show Configuration" %}</h3>
             <p>
-                {% blocktrans %}We'll generate a ready-to-use configuration for your name server,
+                {% blocktrans trimmed %}
-                filled out with all values (including a new secret).{% endblocktrans %}
+                We'll generate a ready-to-use configuration for your name server,
+                filled out with all values (including a new secret).
+                {% endblocktrans %}
             </p>
             <p class="text-warning">
-                {% blocktrans %}We'll create a new shared secret - if you had one before, it will become invalid.
+                {% blocktrans trimmed %}
-                You have to use the new secret in your name server configuration.{% endblocktrans %}
+                We'll create a new shared secret - if you had one before, it will become invalid.
+                You have to use the new secret in your name server configuration.
+                {% endblocktrans %}
             </p>
             <form action="{% url 'generate_ns_secret_view' domain.pk %}" method="get">
                 <button type="submit" class="btn btn-primary btn-warning">{% trans "Show Configuration" %}</button>

nsupdate/main/templates/main/domain_add.html

@@ -17,12 +17,16 @@
             <div class="well well-sm">
                 <h3>{% trans "Help" %}</h3>
                 <p>
-                   {% blocktrans %}Here you can add new domains (zones) which you control (and this is only useful if you
+                   {% blocktrans trimmed %}
-                   have some own zone which you can update automatically).{% endblocktrans %}
+                   Here you can add new domains (zones) which you control (and this is only useful if you
+                   have some own zone which you can update automatically).
+                   {% endblocktrans %}
                 </p>
                 <p>
-                   {% blocktrans %}You need to be able to configure the primary master nameserver of the zone so it accepts
+                   {% blocktrans trimmed %}
-                   dynamic updates (via RFC 2136 "dynamic update" protocol) if the correct update secret is presented.{% endblocktrans %}
+                   You need to be able to configure the primary master nameserver of the zone so it accepts
+                   dynamic updates (via RFC 2136 "dynamic update" protocol) if the correct update secret is presented.
+                   {% endblocktrans %}
                 </p>
                 <p>
                    {% trans "We'll show you configuration examples after you add a domain." %}

nsupdate/main/templates/main/generate_secret.html

@@ -6,7 +6,13 @@
         <div class="col-lg-4">
             <div class="well">
                 <h3>{% trans "Host Secret Generated" %}</h3>
-                <p>{% blocktrans %}New secret generated for you. We store it hashed, so save it now, or you have to generate a new one again. Everytime you visit this page a new secret will be generated and the old one becomes invalid.{% endblocktrans %}</p>
+                <p>
+                    {% blocktrans trimmed %}
+                    New secret generated for you.
+                    We store it hashed, so save it now, or you have to generate a new one again.
+                    Everytime you visit this page a new secret will be generated and the old one becomes invalid.
+                    {% endblocktrans %}
+                </p>
                 <p>{% trans "Secret:" %} <b>{{ update_secret }}</b></p>
             </div>
         </div>

nsupdate/main/templates/main/home.html

@@ -42,8 +42,10 @@
             <h1><i class="fa fa-heart-o fa-3x"></i></h1>
             <h3>{% trans "Awesome Code" %}</h3>
             <p>
-                {% blocktrans %}Empowered by Python and Django,<br>
+                {% blocktrans trimmed %}
-                we love to write clean and secure code.{% endblocktrans %}
+                Empowered by Python and Django,<br>
+                we love to write clean and secure code.
+                {% endblocktrans %}
             </p>
         </div>
     </div>

nsupdate/main/templates/main/host.html

@@ -22,20 +22,26 @@
         <div  class="col-md-4">
             <h3>{% trans "Show Configuration" %}</h3>
             <p>
-                {% blocktrans %}We'll generate a ready-to-use configuration for your router / update
+                {% blocktrans trimmed %}
-                client, filled out with all values (including a new secret).{% endblocktrans %}
+                We'll generate a ready-to-use configuration for your router / update
+                client, filled out with all values (including a new secret).
+                {% endblocktrans %}
             </p>
             <p class="text-warning">
-                {% blocktrans %}We'll create a new secret - if you had one before, it will become invalid.
+                {% blocktrans trimmed %}
-                You have to use the new secret in your router / update client configuration.{% endblocktrans %}
+                We'll create a new secret - if you had one before, it will become invalid.
+                You have to use the new secret in your router / update client configuration.
+                {% endblocktrans %}
             </p>
             <form action="{% url 'generate_secret_view' host.pk %}" method="get">
                 <button type="submit" class="btn btn-primary btn-warning">{% trans "Show Configuration" %}</button>
             </form>
             <h3>{% trans "Related Hosts" %}</h3>
             <p>
-                {% blocktrans %}We can update additional host records (for other hosts in same network)
+                {% blocktrans trimmed %}
-                when we receive an update for this host.{% endblocktrans %}
+                We can update additional host records (for other hosts in same network)
+                when we receive an update for this host.
+                {% endblocktrans %}
             </p>
             <form action="{% url 'related_host_overview' host.pk %}" method="get">
                 <button type="submit" class="btn btn-primary">{% trans "Configure related Hosts" %}</button>
@@ -48,8 +54,11 @@
         </div>
         <div  class="col-md-4">
             <h3>{% trans "Update Nameserver Records" %}</h3>
-            <p>{% blocktrans %}Usually you configure your router to follow the dyndns2 protocol.
+            <p>
-               But if you know what you are doing, and you want to update manually, you can do it here.{% endblocktrans %}
+                {% blocktrans trimmed %}
+                Usually you configure your router to follow the dyndns2 protocol.
+                But if you know what you are doing, and you want to update manually, you can do it here.
+                {% endblocktrans %}
                <br>
                {% trans "We populated the input fields for the new addresses with your currently detected remote addresses." %}
             </p>

nsupdate/main/templates/main/host_add.html

@@ -18,13 +18,18 @@
                 <h3>{% trans "Help" %}</h3>
                 <p>{% trans "Here you can add new hosts (like routers, PCs, servers, ...)." %}
                 </p>
-                <p>{% blocktrans %}You need to be able to configure one of your machines so it sends dyndns2 compatible
+                <p>
-                   updates to us when your IP changes. Routers usually have some builtin software that does
+                    {% blocktrans trimmed %}
-                   this, but you can also use some software on another system (like a PC or server).{% endblocktrans %}
+                    You need to be able to configure one of your machines so it sends dyndns2 compatible
+                    updates to us when your IP changes. Routers usually have some builtin software that does
+                    this, but you can also use some software on another system (like a PC or server).
+                    {% endblocktrans %}
                 </p>
                 <p>
-                   {% blocktrans %}Just make sure your update client either is customizable well enough or has specific
+                    {% blocktrans trimmed %}
-                   support for our service.{% endblocktrans %}
+                    Just make sure your update client either is customizable well enough or has specific
+                    support for our service.
+                    {% endblocktrans %}
                 </p>
                 <p>
                    {% trans "We'll show you configuration examples after you add a host." %}

nsupdate/main/templates/main/includes/tabbed_router_configuration.html

@@ -15,24 +15,28 @@
     <div class="tab-pane active" id="generic">
         <h4>{% trans "General configuration hints" %}</h4>
         <p>
-            {% blocktrans %}
+            {% blocktrans trimmed %}
             Usually, you should configure one system on your network to update the DNS.
             This can be either your router or a host on your network and it will run some software
-            called the update client.{% endblocktrans %}
+            called the update client.
+            {% endblocktrans %}
         </p>
         <p>
-            {% blocktrans %}
+            {% blocktrans trimmed %}
             We have some specific configuration hints for some devices and update clients,
-            please see the tabs above. If you don't find yours there, use the generic hints below.{% endblocktrans %}
+            please see the tabs above. If you don't find yours there, use the generic hints below.
+            {% endblocktrans %}
         </p>
         <p>
-            {% blocktrans %}
+            {% blocktrans trimmed %}
             <b>Important note about security and compatibility</b>:
             For update URLs, we always give the https (not: http) URL as that will use an encrypted connection
             to transfer your data (including your update secret). Depending on your update client (router firmware or
             PC software) <em>and</em> the specific nsupdate.info-based service, https might be not supported.
             So, if it does not work, you have the choice of using a different update client and/or a different service,
-            or transmitting your data using an unencrypted connection (using http: instead of https:).<br>{% endblocktrans %}
+            or transmitting your data using an unencrypted connection (using http: instead of https:).
+            {% endblocktrans %}
+            <br>
             <b>On {{ WWW_HOST }} https is {% if not WE_HAVE_TLS %}not {% endif %}supported.</b>
         </p>
         <hr>
@@ -47,9 +51,10 @@
         <div class="well well-sm">
             <a href="https://{{ host.get_fqdn|default:'&lt;your fqdn&gt;' }}:{{ update_secret|default:'&lt;your secret&gt;' }}@{{ WWW_IPV6_HOST }}/nic/update">https://{{ host.get_fqdn|default:'&lt;your fqdn&gt;' }}:{{ update_secret|default:'&lt;your secret&gt;' }}@{{ WWW_IPV6_HOST }}/nic/update</a>
         </div>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         The IPs will be determined automatically using the remote address our service is seeing
-        (see below for more details).{% endblocktrans %}
+        (see below for more details).
+        {% endblocktrans %}
         <hr>
         <p>
             {% trans "Your update client has to do the following steps:" %}
@@ -78,10 +83,13 @@
             </li>
             <li>{% trans "Optionally, we support some URL arguments:" %}
                 <ul>
-                    <li>{% blocktrans %}myip=127.0.0.1 or myip=::1  (by default, we autodetect the IP. If the autodetected IP is not
+                    <li>
-                        the one you want to put into DNS, you need to give the wanted one explicitly using myip=...){% endblocktrans %}
+                        {% blocktrans trimmed %}
+                        myip=127.0.0.1 or myip=::1  (by default, we autodetect the IP. If the autodetected IP is not
+                        the one you want to put into DNS, you need to give the wanted one explicitly using myip=...)
+                        {% endblocktrans %}
                     </li>
-                    <li>hostname={{ host.get_fqdn|default:"&lt;your fqdn&gt;" }} {% blocktrans %}(if not given: autodetect from http basic auth){% endblocktrans %}</li>
+                    <li>hostname={{ host.get_fqdn|default:"&lt;your fqdn&gt;" }} {% trans "(if not given: autodetect from http basic auth)" %}</li>
                 </ul>
             </li>
             <li>{% trans "The response status and content will be:" %}
@@ -239,7 +247,8 @@ config service "ipv4ddns"
         <h4>pfSense</h4>
         <p>Homepage: <a href="https://www.pfsense.org/">https://www.pfsense.org</a></p>
         <p>
-            {% blocktrans %}Please note: if the pfSense WAN interface does not have
+            {% blocktrans trimmed %}
+            Please note: if the pfSense WAN interface does not have
             your public IP and does not notice your public IP changing, the
             update will be done delayed (default: daily at 01:01). You can
             tweak this by editing /etc/crontab from where it invokes
@@ -264,49 +273,53 @@ config service "ipv4ddns"
     </div>
     <div class="tab-pane" id="browser">
         <h4>{% trans "Browser-based update client" %}</h4>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         These URLs invoke the built-in update client, which is intended for temporary and adhoc scenarios only.
-        It periodically checks your IP and updates DNS if it changes.{% endblocktrans %}
+        It periodically checks your IP and updates DNS if it changes.
+        {% endblocktrans %}
         <ul>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/update">{% blocktrans %}update DNS to point to remote IPv4 or IPv6 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/update">{% trans "update DNS to point to remote IPv4 or IPv6 address" %}</a></li>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/update">{% blocktrans %}similar, IPv4 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/update">{% trans "similar, IPv4 only" %}</a></li>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/update">{% blocktrans %}similar, IPv6 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/update">{% trans "similar, IPv6 only" %}</a></li>
         </ul>
         <h4>{% trans "URLs for browser / http user agent use" %}</h4>
         {% trans "Important: Do not send an update if your IP did not change since last update!" %}
         {% trans "Check your current IP:" %}
         <ul>
-            <li><a href="https://{{ WWW_IPV4_HOST }}/myip">{% blocktrans %}to get your current IPv4 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_IPV4_HOST }}/myip">{% trans "to get your current IPv4 address" %}</a></li>
-            <li><a href="https://{{ WWW_IPV6_HOST }}/myip">{% blocktrans %}to get your current IPv6 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_IPV6_HOST }}/myip">{% trans "to get your current IPv6 address" %}</a></li>
-            <li><a href="https://{{ WWW_HOST }}/myip">{% blocktrans %}to get your current IPv4 or IPv6 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_HOST }}/myip">{% trans "to get your current IPv4 or IPv6 address" %}</a></li>
         </ul>
         {% trans "Interactive - will ask for username (give your hostname) and password (give your secret):" %}
         <ul>
-            <li><a href="https://{{ WWW_HOST }}/nic/update">{% blocktrans %}update DNS to point to remote IPv4 or IPv6 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_HOST }}/nic/update">{% trans "update DNS to point to remote IPv4 or IPv6 address" %}</a></li>
-            <li><a href="https://{{ WWW_IPV4_HOST }}/nic/update">{% blocktrans %}similar, IPv4 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_IPV4_HOST }}/nic/update">{% trans "similar, IPv4 only" %}</a></li>
-            <li><a href="https://{{ WWW_IPV6_HOST }}/nic/update">{% blocktrans %}similar, IPv6 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ WWW_IPV6_HOST }}/nic/update">{% trans "similar, IPv6 only" %}</a></li>
         </ul>
         {% trans "Giving the http basic auth username and password in the URL:" %}
         <ul>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update">{% blocktrans %}update DNS to point to remote IPv4 or IPv6 address{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update">{% trans "update DNS to point to remote IPv4 or IPv6 address" %}</a></li>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/nic/update">{% blocktrans %}similar, IPv4 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV4_HOST }}/nic/update">{% trans "similar, IPv4 only" %}</a></li>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/nic/update">{% blocktrans %}similar, IPv6 only{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_IPV6_HOST }}/nic/update">{% trans "similar, IPv6 only" %}</a></li>
         </ul>
         {% trans "As above, but manually specifying the IP address:" %}
         <ul>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=127.0.0.1">{% blocktrans %}update DNS to point to IPv4 127.0.0.1{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=127.0.0.1">{% trans "update DNS to point to IPv4 127.0.0.1" %}</a></li>
-            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=::1">{% blocktrans %}update DNS to point to IPv6 ::1{% endblocktrans %}</a></li>
+            <li><a href="https://{{ host.get_fqdn|default:"&lt;your hostname&gt;" }}:{{ update_secret|default:"&lt;your secret&gt;" }}@{{ WWW_HOST }}/nic/update?myip=::1">{% trans "update DNS to point to IPv6 ::1" %}</a></li>
         </ul>
         {% trans "Explanation of parameters:" %}
         <ul>
             {% if not host %}
-                <li>&lt;your hostname&gt;: {% blocktrans %}your fully qualified hostname, something like example.{{ WWW_HOST }}{% endblocktrans %}</li>
+                <li>&lt;your hostname&gt;: {% blocktrans trimmed %}your fully qualified hostname, something like example.{{ WWW_HOST }}{% endblocktrans %}</li>
             {% endif %}
             {% if not update_secret %}
-                <li>&lt;your secret&gt;: {% blocktrans %}the secret you have configured for this hostname{% endblocktrans %}</li>
+                <li>&lt;your secret&gt;: {% trans "the secret you have configured for this hostname" %}</li>
             {% endif %}
-            <li>{% blocktrans %}IP addresses: we use the v4 and v6 localhost addresses in the examples, but
+            <li>
-                of course you need to use your real public IP instead of that.{% endblocktrans %}
+                {% blocktrans trimmed %}
+                IP addresses: we use the v4 and v6 localhost addresses in the examples, but
+                of course you need to use your real public IP instead of that.
+                {% endblocktrans %}
             </li>
         </ul>
     </div>

nsupdate/main/templates/main/related_host.html

@@ -21,9 +21,12 @@
         </div>
         <div class="col-md-6">
             <h3>{% trans "Help" %}</h3>
-                <p>{% blocktrans %}When we receive an update for your main host, we compute your network address
+                <p>
-                   from it. To compute your related host's IPs, we just add the interface ID to the network address.
+                    {% blocktrans trimmed %}
-                   Then we update the DNS records for the related host with these addresses.{% endblocktrans %}
+                    When we receive an update for your main host, we compute your network address
+                    from it. To compute your related host's IPs, we just add the interface ID to the network address.
+                    Then we update the DNS records for the related host with these addresses.
+                    {% endblocktrans %}
                 </p>
         </div>
     </div>

nsupdate/main/templates/main/related_host_add.html

@@ -18,9 +18,12 @@
                 <h3>{% trans "Help" %}</h3>
                 <p>{% trans "Here you can add related hosts (e.g. other machines on same LAN)." %}
                 </p>
-                <p>{% blocktrans %}When we receive an update for your main host, we compute your network address
+                <p>
-                   from it. To compute your related host's IPs, we just add the interface ID to the network address.
+                    {% blocktrans trimmed %}
-                   Then we update the DNS records for the related host with these addresses.{% endblocktrans %}
+                    When we receive an update for your main host, we compute your network address
+                    from it. To compute your related host's IPs, we just add the interface ID to the network address.
+                    Then we update the DNS records for the related host with these addresses.
+                    {% endblocktrans %}
                 </p>
             </div>
         </div>

nsupdate/main/templates/main/update.html

@@ -5,7 +5,9 @@
     <div class="jumbotron">
         <h2>{% trans "Browser-based Updater" %}</h2>
         <p>
-            {% blocktrans %}Host {{ hostname }} will get automatically updated as long as you keep this window open.{% endblocktrans %}
+            {% blocktrans trimmed %}
+            Host {{ hostname }} will get automatically updated as long as you keep this window open.
+            {% endblocktrans %}
         </p>
         <noscript>
             <p class="text-danger">

nsupdate/main/templates/main/updater_hostconfig.html

@@ -23,15 +23,20 @@
             <div class="well well-sm">
                 <h3>{% trans "Help" %}</h3>
                 <p>
-                    {% blocktrans with servicename=object.service.name %}Here you can edit the configuration of the "{{ servicename }}" updater.{% endblocktrans %}
+                    {% blocktrans trimmed with servicename=object.service.name %}
+                    Here you can edit the configuration of the "{{ servicename }}" updater.
+                    {% endblocktrans %}
                 </p>
                 <p>
-                   {% blocktrans %}The values you need here are the same ones as you would usually enter in your router
+                    {% blocktrans trimmed %}
-                   or update client.{% endblocktrans %}
+                    The values you need here are the same ones as you would usually enter in your router or update client.
+                    {% endblocktrans %}
                 </p>
                 <p>
-                   {% blocktrans %}You get these values after registering with the "{{ object.service.name }}" service
+                    {% blocktrans trimmed %}
-                   and (likely) configuring that service to accept updates.{% endblocktrans %}
+                    You get these values after registering with the "{{ object.service.name }}" service
+                    and (likely) configuring that service to accept updates.
+                    {% endblocktrans %}
                 </p>
             </div>
         </div>

nsupdate/templates/base.html

@@ -107,11 +107,15 @@
                                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                                 {% trans "Your (http) connection is unencrypted and thus insecure." %}
                                 {% if WE_HAVE_TLS %}
-                                    {% blocktrans %}Please use our <a href="https://{{ WWW_HOST }}/">secure https site</a>.{% endblocktrans %}
+                                    {% blocktrans trimmed %}
+                                    Please use our <a href="https://{{ WWW_HOST }}/">secure https site</a>.
+                                    {% endblocktrans %}
                                 {% endif %}
                                 {% if COOKIE_SECURE %}
-                                    {% blocktrans %}At least some of the required cookies will only work on the secure https site,
+                                    {% blocktrans trimmed %}
-                                    expect malfunctioning on the http site.{% endblocktrans %}
+                                    At least some of the required cookies will only work on the secure https site,
+                                    expect malfunctioning on the http site.
+                                    {% endblocktrans %}
                                 {% endif %}
                             </div>
                         {% endif %}