diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
| commit | ea65e5512c236b81e7f4b8757521facadae4b3b8 (patch) | |
| tree | 739cdf40fb6a89de90c4189936d695288a82849f /chimere/templates/admin/base_site.html | |
| parent | 4b0f0777c434f5fa1366ca408c34d257d4833fad (diff) | |
| parent | a55f77a246f99764ff6289686f80825526654e2b (diff) | |
| download | Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.tar.bz2 Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'chimere/templates/admin/base_site.html')
| -rw-r--r-- | chimere/templates/admin/base_site.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chimere/templates/admin/base_site.html b/chimere/templates/admin/base_site.html index fa537ef..d0cf4bf 100644 --- a/chimere/templates/admin/base_site.html +++ b/chimere/templates/admin/base_site.html @@ -1,10 +1,10 @@ {% extends "admin/base.html" %} {% load i18n %} -{% block title %}{{ title }} | {% trans 'Administration de Chimère' %}{% endblock %} +{% block title %}{{ title }} | {% trans 'Chimère administration' %}{% endblock %} {% block branding %} -<h1 id="site-name">{% trans 'Administration de Chimère' %}</h1> +<h1 id="site-name">{% trans 'Chimère administration' %}</h1> {% endblock %} {% block nav-global %}{% endblock %} |