From 3c44a8b930b3bbeebd61a2d69407a6315011b975 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Sat, 6 Jul 2013 15:00:08 +0200 Subject: [PATCH] Changed inconsistent use of "login/logout" --- djadmin2/locale/de/LC_MESSAGES/django.po | 17 ++++++----------- djadmin2/locale/en/LC_MESSAGES/django.po | 18 ++++++------------ djadmin2/locale/es/LC_MESSAGES/django.po | 17 ++++++----------- djadmin2/locale/fr/LC_MESSAGES/django.po | 19 +++++++------------ .../admin2/bootstrap/auth/login.html | 2 +- .../admin2/bootstrap/auth/logout.html | 2 +- 6 files changed, 27 insertions(+), 48 deletions(-) diff --git a/djadmin2/locale/de/LC_MESSAGES/django.po b/djadmin2/locale/de/LC_MESSAGES/django.po index 02a1db0..d926136 100644 --- a/djadmin2/locale/de/LC_MESSAGES/django.po +++ b/djadmin2/locale/de/LC_MESSAGES/django.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: django-admin2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 14:47+0200\n" +"POT-Creation-Date: 2013-07-06 15:02+0200\n" "PO-Revision-Date: 2013-07-06 14:47+0200\n" "Last-Translator: Danilo Bargen \n" -"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/de/\n" +"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/" +"de/\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,6 +94,7 @@ msgid "Change password" msgstr "" #: templates/admin2/bootstrap/base.html:42 +#: templates/admin2/bootstrap/auth/logout.html:11 msgid "Log out" msgstr "" @@ -179,7 +181,8 @@ msgid "" msgstr "" #: templates/admin2/bootstrap/auth/login.html:15 -msgid "Login" +#: templates/admin2/bootstrap/auth/login.html:52 +msgid "Log in" msgstr "" #: templates/admin2/bootstrap/auth/login.html:27 @@ -189,14 +192,6 @@ msgid_plural "Please correct the errors below." msgstr[0] "" msgstr[1] "" -#: templates/admin2/bootstrap/auth/login.html:52 -msgid "Log in" -msgstr "" - -#: templates/admin2/bootstrap/auth/logout.html:11 -msgid "Logout" -msgstr "" - #: templates/admin2/bootstrap/auth/logout.html:17 msgid "Thanks for spending some quality time with the Web site today." msgstr "" diff --git a/djadmin2/locale/en/LC_MESSAGES/django.po b/djadmin2/locale/en/LC_MESSAGES/django.po index 542e9b9..c2c09dd 100644 --- a/djadmin2/locale/en/LC_MESSAGES/django.po +++ b/djadmin2/locale/en/LC_MESSAGES/django.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: django-admin2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 13:16+0200\n" +"POT-Creation-Date: 2013-07-06 15:02+0200\n" "PO-Revision-Date: 2013-07-06 13:27+0200\n" "Last-Translator: NotSqrt \n" "Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: actions.py:26 msgid "" @@ -96,6 +96,7 @@ msgid "Change password" msgstr "Change password" #: templates/admin2/bootstrap/base.html:42 +#: templates/admin2/bootstrap/auth/logout.html:11 msgid "Log out" msgstr "Log out" @@ -186,8 +187,9 @@ msgstr "" "following items will be deleted:" #: templates/admin2/bootstrap/auth/login.html:15 -msgid "Login" -msgstr "Login" +#: templates/admin2/bootstrap/auth/login.html:52 +msgid "Log in" +msgstr "Log in" #: templates/admin2/bootstrap/auth/login.html:27 #: templates/admin2/bootstrap/auth/password_change_form.html:24 @@ -196,14 +198,6 @@ msgid_plural "Please correct the errors below." msgstr[0] "Please correct the error below." msgstr[1] "Please correct the errors below." -#: templates/admin2/bootstrap/auth/login.html:52 -msgid "Log in" -msgstr "Log in" - -#: templates/admin2/bootstrap/auth/logout.html:11 -msgid "Logout" -msgstr "Logout" - #: templates/admin2/bootstrap/auth/logout.html:17 msgid "Thanks for spending some quality time with the Web site today." msgstr "Thanks for spending some quality time with the Web site today." diff --git a/djadmin2/locale/es/LC_MESSAGES/django.po b/djadmin2/locale/es/LC_MESSAGES/django.po index cdb6b24..b75ade1 100644 --- a/djadmin2/locale/es/LC_MESSAGES/django.po +++ b/djadmin2/locale/es/LC_MESSAGES/django.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: django-admin2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 14:47+0200\n" +"POT-Creation-Date: 2013-07-06 15:02+0200\n" "PO-Revision-Date: 2013-07-06 14:47+0200\n" "Last-Translator: Danilo Bargen \n" -"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/es/\n" +"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/" +"es/\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,6 +94,7 @@ msgid "Change password" msgstr "" #: templates/admin2/bootstrap/base.html:42 +#: templates/admin2/bootstrap/auth/logout.html:11 msgid "Log out" msgstr "" @@ -179,7 +181,8 @@ msgid "" msgstr "" #: templates/admin2/bootstrap/auth/login.html:15 -msgid "Login" +#: templates/admin2/bootstrap/auth/login.html:52 +msgid "Log in" msgstr "" #: templates/admin2/bootstrap/auth/login.html:27 @@ -189,14 +192,6 @@ msgid_plural "Please correct the errors below." msgstr[0] "" msgstr[1] "" -#: templates/admin2/bootstrap/auth/login.html:52 -msgid "Log in" -msgstr "" - -#: templates/admin2/bootstrap/auth/logout.html:11 -msgid "Logout" -msgstr "" - #: templates/admin2/bootstrap/auth/logout.html:17 msgid "Thanks for spending some quality time with the Web site today." msgstr "" diff --git a/djadmin2/locale/fr/LC_MESSAGES/django.po b/djadmin2/locale/fr/LC_MESSAGES/django.po index 55416ff..13d7b76 100644 --- a/djadmin2/locale/fr/LC_MESSAGES/django.po +++ b/djadmin2/locale/fr/LC_MESSAGES/django.po @@ -6,15 +6,16 @@ msgid "" msgstr "" "Project-Id-Version: django-admin2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 13:16+0200\n" +"POT-Creation-Date: 2013-07-06 15:02+0200\n" "PO-Revision-Date: 2013-07-06 13:27+0200\n" "Last-Translator: NotSqrt \n" -"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/fr/\n" +"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/" +"fr/\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" #: actions.py:26 msgid "" @@ -98,6 +99,7 @@ msgid "Change password" msgstr "Modifier votre mot de passe" #: templates/admin2/bootstrap/base.html:42 +#: templates/admin2/bootstrap/auth/logout.html:11 msgid "Log out" msgstr "Déconnexion" @@ -188,7 +190,8 @@ msgstr "" "Les éléments suivants seront supprimés :" #: templates/admin2/bootstrap/auth/login.html:15 -msgid "Login" +#: templates/admin2/bootstrap/auth/login.html:52 +msgid "Log in" msgstr "Connexion" #: templates/admin2/bootstrap/auth/login.html:27 @@ -198,14 +201,6 @@ msgid_plural "Please correct the errors below." msgstr[0] "Corrigez l'erreur suivante." msgstr[1] "Corrigez les erreurs suivantes." -#: templates/admin2/bootstrap/auth/login.html:52 -msgid "Log in" -msgstr "Connexion" - -#: templates/admin2/bootstrap/auth/logout.html:11 -msgid "Logout" -msgstr "Déconnexion" - #: templates/admin2/bootstrap/auth/logout.html:17 msgid "Thanks for spending some quality time with the Web site today." msgstr "Merci pour le temps que vous avez accordé à ce site aujourd'hui." diff --git a/djadmin2/templates/admin2/bootstrap/auth/login.html b/djadmin2/templates/admin2/bootstrap/auth/login.html index c055c15..36421dc 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/login.html +++ b/djadmin2/templates/admin2/bootstrap/auth/login.html @@ -12,7 +12,7 @@ {% block breacrumbs %}{% endblock breacrumbs %} {% block class_page_title %}span12 login-title{% endblock class_page_title %} -{% block page_title %}{% trans "Site administration" %} - {% trans "Login" %}{% endblock page_title %} +{% block page_title %}{% trans "Site administration" %} - {% trans "Log in" %}{% endblock page_title %} {% block content %}
diff --git a/djadmin2/templates/admin2/bootstrap/auth/logout.html b/djadmin2/templates/admin2/bootstrap/auth/logout.html index 7da8675..97974ca 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/logout.html +++ b/djadmin2/templates/admin2/bootstrap/auth/logout.html @@ -8,7 +8,7 @@ {% trans "Home" %} / -
  • {% trans "Logout" %}
    • +
  • {% trans "Log out" %}
    • {% endblock breadcrumbs %} {% block content %}