Fix various nav text, update locales

diff --git a/telemeta/locale b/telemeta/locale
index e7fd56599e9e22eddf92c1063419fec6ab82e15e..a2a9b18a25bfc47a1c19974ed6bc1fde23f92448 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e
+Subproject commit a2a9b18a25bfc47a1c19974ed6bc1fde23f92448

diff --git a/telemeta/pages b/telemeta/pages
index 6bd28050dc7e96a8a226ea928a8e7b09b130be93..ec1e758bf72b617e8f2bc9f98c293ad17014c096 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit 6bd28050dc7e96a8a226ea928a8e7b09b130be93
+Subproject commit ec1e758bf72b617e8f2bc9f98c293ad17014c096

diff --git a/telemeta/templates/telemeta/inc/nav.html b/telemeta/templates/telemeta/inc/nav.html
index 1670dc28b7fdc115a69985893192c850496c637f..c4e501a0c3a5640992f06e0e61504596de9b166c 100644 (file)
--- a/telemeta/templates/telemeta/inc/nav.html
+++ b/telemeta/templates/telemeta/inc/nav.html
@@ -31,12 +31,12 @@
                                     <ul>
                                         <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
                                         <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
-                                        <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument (vernaculare)" %}</a></li>
+                                        <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instruments (vernacular)" %}</a></li>
                                     </ul>
                                 {% else %}
                                     <ul>
                                         <li><a href="{% url "telemeta-instruments" %}">{% trans "Instruments" %}</a>
-                                        <li><a href="{% url "telemeta-instrument-alias" %}">{% trans "Instruments (vernaculare)" %}</a></li>
+                                        <li><a href="{% url "telemeta-instrument-alias" %}">{% trans "Instruments (vernacular)" %}</a></li>
                                         {% for enu in menu %}
                                             <li>
                                                 <a href="{% url "telemeta-enumeration" enu.id %}">{{ enu.name |capfirst }}</a>

diff --git a/telemeta/templates/telemeta/instrument_alias.html b/telemeta/templates/telemeta/instrument_alias.html
index 360f563f38711e2c56f26925f151da21c7d5f73b..827983733ce19323b95a28d9445c244dfb55607f 100644 (file)
--- a/telemeta/templates/telemeta/instrument_alias.html
+++ b/telemeta/templates/telemeta/instrument_alias.html
@@ -1,10 +1,10 @@
 {% extends "telemeta/admin.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Instruments (vernaculare)" %} - {{ block.super }}{% endblock %}
+{% block head_title %}{% trans "Instruments (vernacular)" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<h1><img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" />  {% trans "Instruments (vernaculare)" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" />  {% trans "Instruments (vernacular)" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}

diff --git a/telemeta/templates/telemeta/instrument_alias_edit.html b/telemeta/templates/telemeta/instrument_alias_edit.html
index ddfbf3ec6b2e6310c145f0a88ed34db9a39f9bcc..d8bf356a61a38d6f850ab3dafecbf349102c94ae 100644 (file)
--- a/telemeta/templates/telemeta/instrument_alias_edit.html
+++ b/telemeta/templates/telemeta/instrument_alias_edit.html
@@ -1,10 +1,10 @@
 {% extends "telemeta/admin.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Instruments (vernaculare)" %} - {{ block.super }}{% endblock %}
+{% block head_title %}{% trans "Instruments (vernacular)" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Instruments (vernaculare)" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Instruments (vernacular)" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}