Split translation block

Author: ewjoachim

readthedocs/templates/account/email/email_confirmation_message.html

@@ -3,19 +3,16 @@
 {% load i18n %}
 
 {% block content %}
-  {% blocktrans %}
     <p>
-      To complete setting up your account, please verify this email address by
-      going to:
+      {% trans "To verify your email address and finish setting up your account, please go to:" %}
     </p>
 
     <p>
       <a href="{{ activate_url }}">{{ activate_url }}</a>
     </p>
 
     <p>
-      If you did not sign up for an account with Read the Docs, you can
-      disregard this email.
+      {% trans "If you did not sign up for an account with Read the Docs, you can disregard this email." %}
     </p>
-  {% endblocktrans %}
 {% endblock %}
+

readthedocs/templates/account/email/email_confirmation_message.txt

@@ -2,12 +2,10 @@
 
 {% load i18n %}
 
-{% block content %}{% blocktrans %}
-To verify your email address and finish setting up your account, please
-go to:
+{% block content %}
+{% trans "To verify your email address and finish setting up your account, please go to:" %}
 
 {{ activate_url }}
 
-If you did not sign up for an account with Read the Docs, you can
-disregard this email.
-{% endblocktrans %}{% endblock %}
+{% trans "If you did not sign up for an account with Read the Docs, you can disregard this email." %}
+{% endblock %}

readthedocs/templates/account/email/password_reset_key_message.html

@@ -3,18 +3,16 @@
 {% load i18n %}
 
 {% block content %}
-  {% blocktrans %}
     <p>
-      A request has been made to reset your Read the Docs password. To confirm
-      this reset request, please go to:
+      {% trans "A request has been made to reset your Read the Docs password. To confirm
+this reset request, please go to:" %}
     </p>
 
     <p>
       <a href="{{ password_reset_url }}">{{ password_reset_url }}</a>
     </p>
 
     <p>
-      If you did not request to reset you password, you can disregard this email.
+      {% trans "If you did not request to reset you password, you can disregard this email." %}
     </p>
-  {% endblocktrans %}
 {% endblock %}

readthedocs/templates/account/email/password_reset_key_message.txt

@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block content %}{% blocktrans %}
-A request has been made to reset your Read the Docs password. To confirm
-this reset request, please go to:
+{% block content %}
+{% trans "A request has been made to reset your Read the Docs password. To confirm
+this reset request, please go to:" %}
 
 {{ password_reset_url }}
 
-If you did not request to reset you password, you can disregard this email.
-{% endblocktrans %}{% endblock %}
+{% trans "If you did not request to reset you password, you can disregard this email." %}
+{% endblock %}