diff --git a/grappelli/templates/admin/delete_selected_confirmation.html b/grappelli/templates/admin/delete_selected_confirmation.html index b053b380f..36a6b611c 100644 --- a/grappelli/templates/admin/delete_selected_confirmation.html +++ b/grappelli/templates/admin/delete_selected_confirmation.html @@ -19,7 +19,7 @@ {% if perms_lacking or protected %}
{% if perms_lacking %} -

{% blocktrans %}Deleting the {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

+

{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

{% else %}
-

{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}

+

{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}

{% for deleteable_object in deletable_objects %}
    {{ deleteable_object|unordered_list }}
diff --git a/grappelli/templates/admin/edit_inline/stacked.html b/grappelli/templates/admin/edit_inline/stacked.html index 72c6c4260..58d192f88 100644 --- a/grappelli/templates/admin/edit_inline/stacked.html +++ b/grappelli/templates/admin/edit_inline/stacked.html @@ -21,7 +21,7 @@

{% if inline_admin_formset.opts.title %}{{ inline_a id="{{ inline_admin_formset.formset.prefix }}{% if forloop.last %}-empty{% else %}{{ forloop.counter0 }}{% endif %}">

{{ inline_admin_formset.opts.verbose_name|title }}  {% if inline_admin_form.original %}{{ inline_admin_form.original }}{% endif %}

    - {% if inline_admin_form.show_url %}
    • {% endif %} + {% if inline_admin_form.show_url %}
    • {% endif %} {% if inline_admin_formset.opts.sortable_field_name %}
    • {% endif %} diff --git a/grappelli/templates/admin/edit_inline/tabular.html b/grappelli/templates/admin/edit_inline/tabular.html index ad83fc921..967aae3fa 100644 --- a/grappelli/templates/admin/edit_inline/tabular.html +++ b/grappelli/templates/admin/edit_inline/tabular.html @@ -61,7 +61,7 @@

    {{ inline_admin_formset.opts.verbose_name|title }}
    {% spaceless %}
      - {% if inline_admin_form.show_url %}
      • {% endif %} + {% if inline_admin_form.show_url %}
      • {% endif %} {% if inline_admin_formset.opts.sortable_field_name %}
      • {% endif %} diff --git a/grappelli/templates/admin/index.html b/grappelli/templates/admin/index.html index 139c6c047..5c4c63166 100644 --- a/grappelli/templates/admin/index.html +++ b/grappelli/templates/admin/index.html @@ -36,7 +36,7 @@

      {% trans app.name %}

    {% endfor %} {% else %} -

    {% trans "You don´t have permission to edit anything." %}

    +

    {% trans "You don't have permission to edit anything." %}

    {% endif %}

diff --git a/grappelli/templates/registration/password_change_form.html b/grappelli/templates/registration/password_change_form.html index 0d59a3d21..4f6aab1ae 100644 --- a/grappelli/templates/registration/password_change_form.html +++ b/grappelli/templates/registration/password_change_form.html @@ -24,7 +24,7 @@

{% trans 'Password change' %}

-

{% trans "Please enter your old password, for securitys sake, and then enter your new password twice so we can verify you typed it in correctly." %}

+

{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

{% csrf_token %}
diff --git a/grappelli/templates/registration/password_reset_done.html b/grappelli/templates/registration/password_reset_done.html index a009281f6..0e58766d2 100644 --- a/grappelli/templates/registration/password_reset_done.html +++ b/grappelli/templates/registration/password_reset_done.html @@ -7,5 +7,5 @@ {% block content %}

{% trans 'Password reset successful' %}

-

{% trans "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." %}

+

{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}

{% endblock %} diff --git a/grappelli/templates/registration/password_reset_email.html b/grappelli/templates/registration/password_reset_email.html index 1e53caae1..203a1ca86 100644 --- a/grappelli/templates/registration/password_reset_email.html +++ b/grappelli/templates/registration/password_reset_email.html @@ -1,7 +1,6 @@ {% load url from future %} {% load i18n %}{% autoescape off %} -{% trans "You're receiving this e-mail because you requested a password reset" %} -{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. +{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new password:" %} {% block reset_link %} diff --git a/grappelli/templates/registration/password_reset_form.html b/grappelli/templates/registration/password_reset_form.html index 79332803a..2d8b62f0f 100644 --- a/grappelli/templates/registration/password_reset_form.html +++ b/grappelli/templates/registration/password_reset_form.html @@ -7,7 +7,7 @@ {% block content %}

{% trans "Password reset" %}

-

{% trans "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." %}

+

{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}

{% csrf_token %} {% if form.email.errors %}{{ form.email.errors }}{% endif %}

{{ form.email }}