- Fixed trans difference between HTML and plaintext email body.

- Dont display password explanation if including passwords in emails is off #23

templates/_email/users/activation/none_html.html

@@ -12,5 +12,7 @@
   <p {{ style_p|safe }}><b>{% trans %}E-mail{% endtrans %}:</b><br>{{ user.email }}</p>{% if settings.password_in_email %}
   <p {{ style_p|safe }}><b>{% trans %}Password{% endtrans %}:</b><br>{{ password }}</p>{% endif %}
 </div>
+{% if settings.password_in_email %}
 <p {{ style_p|safe }}>{% trans %}This is only time you will receive your current password. For security reasons we don't store members passwords as they are entered on registration, instead we encrypt them in unreversible manner to keep them safe.{% endtrans %}</p>
+{% endif %}
 {% endblock %}

templates/_email/users/activation/none_plain.html

@@ -13,5 +13,6 @@ Your Account Data
 {% trans %}E-mail{% endtrans %}:    {{ user.email }}{% if settings.password_in_email %}
 {% trans %}Password{% endtrans %}:    {{ password }}{% endif %}
 
-{% trans %}This is only time you will receive your current password. Due to security reasons we dont store members passwords as they are entered on registration, instead we encrypt those password in un-reversible manner to keep them safe.{% endtrans %}{% block activation_instructions %}{% endblock %}
+{% trans %}This is only time you will receive your current password. Due to security reasons we don't store members passwords as they are entered on registration, instead we encrypt those password in un-reversible manner to keep them safe.{% endtrans %}{% block activation_instructions %}{% endblock %}
+{% endif %}
 {% endblock %}