From 5e631922cdd0ebc9b4e6f1d7fb0195a1c1d62c70 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 27 Nov 2014 10:47:01 +0100
Subject: [PATCH] add some contexts to locales, fix login style, change edit
 tab order

---
 example/sandbox/settings.py                   |   2 +-
 telemeta/locale/de/LC_MESSAGES/django.mo      | Bin 24178 -> 24178 bytes
 telemeta/locale/de/LC_MESSAGES/django.po      | 481 +++++++++---------
 telemeta/locale/es/LC_MESSAGES/django.mo      | Bin 420 -> 420 bytes
 telemeta/locale/es/LC_MESSAGES/django.po      | 454 +++++++++--------
 telemeta/locale/fr/LC_MESSAGES/django.mo      | Bin 20832 -> 21282 bytes
 telemeta/locale/fr/LC_MESSAGES/django.po      | 478 ++++++++---------
 telemeta/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 22680 -> 22680 bytes
 telemeta/locale/zh_CN/LC_MESSAGES/django.po   | 478 ++++++++---------
 telemeta/templates/telemeta/base.html         |   2 +-
 .../templates/telemeta/collection_detail.html |   6 +-
 .../templates/telemeta/collection_list.html   |   6 +-
 .../templates/telemeta/inc/children_list.html |   2 +-
 telemeta/templates/telemeta/login.html        |  23 +-
 .../templates/telemeta/mediaitem_edit.html    |   6 +-
 15 files changed, 1012 insertions(+), 926 deletions(-)

diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py
index 1ecd79da..3d850bb1 100644
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@ -172,7 +172,7 @@ EMAIL_HOST = 'localhost'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 
 TIMESIDE_DEFAULT_GRAPHER_ID = 'waveform_centroid'
-TIMESIDE_AUTO_ZOOM = True
+TIMESIDE_AUTO_ZOOM = False
 
 # Settings for django-bootstrap3
 BOOTSTRAP3 = {
diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 905cb9dfbee1b23489a1a30378dc7bf1f7362914..e609078c37d52241c457e9fffa55076a2f1277cf 100644
GIT binary patch
delta 22
ecmeyghw;-M#tm&Y?B)uF2397<n|p1ZDgpp*YzVUe

delta 22
ecmeyghw;-M#tm&Y>;?*k7FGs^n|p1ZDgpp*I0&u)

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index 3e2cdb7f..e868cda8 100644
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-20 18:01+0100\n"
+"POT-Creation-Date: 2014-11-27 10:43+0100\n"
 "PO-Revision-Date: 2012-12-22 21:24+0100\n"
 "Last-Translator: Patrik Tschudin <patsch@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,6 @@ msgstr "Bandgeschwindigkeit (cm/s)"
 
 #: models/enum.py:218
 #, fuzzy
-#| msgid "tape vendor"
 msgid "tape brand"
 msgstr "Bandmarke"
 
@@ -139,7 +138,6 @@ msgstr "Medientyp"
 
 #: models/enum.py:282 models/media.py:254
 #, fuzzy
-#| msgid "original location"
 msgid "original format"
 msgstr "Herkunftsort"
 
@@ -424,6 +422,7 @@ msgid "recording year (from)"
 msgstr "Aufnahmejahr (ab)"
 
 #: models/media.py:211 models/media.py:212 models/media.py:213
+#: models/media.py:781 models/media.py:782
 msgid "YYYY"
 msgstr ""
 
@@ -449,7 +448,6 @@ msgstr "Seriennummer von HerausgeberIn"
 
 #: models/media.py:224
 #, fuzzy
-#| msgid "author"
 msgid "booklet author"
 msgstr "AutorIn"
 
@@ -494,7 +492,7 @@ msgstr "abgeschlossene Elemente"
 msgid "recordist identical to depositor"
 msgstr "TonmeisterIn ist identisch mit HinterlegerIn"
 
-#: models/media.py:247 templates/telemeta/collection_detail.html:95
+#: models/media.py:247
 msgid "published"
 msgstr "publiziert"
 
@@ -504,7 +502,6 @@ msgstr "Konservierungsort"
 
 #: models/media.py:252
 #, fuzzy
-#| msgid "computed duration"
 msgid "estimated duration"
 msgstr "berechnete Dauer"
 
@@ -530,7 +527,6 @@ msgstr "berechnete Dauer"
 
 #: models/media.py:330
 #, fuzzy
-#| msgid "collections"
 msgid "collection size"
 msgstr "Sammlungen"
 
@@ -571,12 +567,12 @@ msgstr "Kulturraum"
 msgid "language"
 msgstr "Sprache"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:251
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
 #, fuzzy
 msgid "Language (ISO norm)"
 msgstr "Sprache"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:255
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
 #, fuzzy
 msgid "Ethnographic context"
 msgstr "Kommentare / ethnographischer Kontext"
@@ -672,7 +668,6 @@ msgstr "Instrumente"
 
 #: models/media.py:515
 #, fuzzy
-#| msgid "collections"
 msgid "item size"
 msgstr "Sammlungen"
 
@@ -755,7 +750,6 @@ msgstr "Sammlungen"
 
 #: models/media.py:802 models/media.py:837
 #, fuzzy
-#| msgid "computed duration"
 msgid "total available duration"
 msgstr "berechnete Dauer"
 
@@ -968,9 +962,9 @@ msgstr "g:i A,M j,n/j/y"
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:388
+#: templates/telemeta/mediaitem_detail.html:387
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:116
+#: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "löschen"
@@ -1128,7 +1122,7 @@ msgid "Administration"
 msgstr "Verwaltung"
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/collection_edit.html:36
 #: templates/telemeta/mediaitem_edit.html:87
 #: templates/telemeta/resource_edit.html:38
 msgid "General"
@@ -1140,6 +1134,9 @@ msgid "Enumerations"
 msgstr "Aufzählung"
 
 #: templates/telemeta/admin_enumerations.html:13
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:116
+#: templates/telemeta/search_results.html:53
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:8
 #: templates/telemeta/inc/collection_related.html:21
@@ -1148,8 +1145,6 @@ msgstr "Aufzählung"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:74 templates/telemeta/search_criteria.html:91
-#: templates/telemeta/search_results.html:53
 msgid "Title"
 msgstr "Titel"
 
@@ -1180,7 +1175,7 @@ msgstr "Hilfe"
 msgid "Sign out"
 msgstr "abmelden"
 
-#: templates/telemeta/base.html:74 templates/telemeta/login.html:41
+#: templates/telemeta/base.html:74 templates/telemeta/login.html:42
 msgid "Sign in"
 msgstr "anmelden"
 
@@ -1207,8 +1202,8 @@ msgstr "Sammlungen"
 
 #: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7
 #: templates/telemeta/collection_detail.html:84
-#: templates/telemeta/inc/breadcrumbs.html:8
 #: templates/telemeta/mediaitem_list.html:11
+#: templates/telemeta/inc/breadcrumbs.html:8
 msgid "Items"
 msgstr "Elemente"
 
@@ -1224,6 +1219,12 @@ msgstr "erweiterte Suche"
 msgid "Admin"
 msgstr "Verwaltung"
 
+#: templates/telemeta/base.html:119
+#, fuzzy
+msgctxt "admin"
+msgid "General"
+msgstr "allgemein"
+
 #: templates/telemeta/base.html:121
 #: templates/telemeta/instrument_alias_edit_value.html:24
 #: templates/telemeta/instrument_edit.html:4
@@ -1298,22 +1299,22 @@ msgstr "Sammlung"
 
 #: templates/telemeta/collection_detail.html:45
 #: templates/telemeta/lists.html:60
-#: templates/telemeta/mediaitem_detail.html:107
+#: templates/telemeta/mediaitem_detail.html:106
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:45
+#: templates/telemeta/resource_detail.html:44
 msgid "Edit"
 msgstr "bearbeiten"
 
 #: templates/telemeta/collection_detail.html:50
-#: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:50
+#: templates/telemeta/mediaitem_detail.html:111
+#: templates/telemeta/resource_detail.html:49
 msgid "Copy"
 msgstr "kopieren"
 
 #: templates/telemeta/collection_detail.html:57
 #: templates/telemeta/geo_continents.html:26
-#: templates/telemeta/mediaitem_detail.html:119
-#: templates/telemeta/resource_detail.html:57
+#: templates/telemeta/mediaitem_detail.html:118
+#: templates/telemeta/resource_detail.html:56
 msgid "List"
 msgstr "Liste"
 
@@ -1331,37 +1332,42 @@ msgstr ""
 
 #: templates/telemeta/collection_detail.html:91
 #, fuzzy
-#| msgid "Documentation"
 msgid "Document status"
 msgstr "Dokumentation"
 
 #: templates/telemeta/collection_detail.html:93
 #, fuzzy
-#| msgid "Unpublished"
+msgctxt "collection"
 msgid "unpublished"
 msgstr "unveröffentlicht"
 
+#: templates/telemeta/collection_detail.html:95
+#, fuzzy
+msgctxt "collection"
+msgid "published"
+msgstr "publiziert"
+
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/inc/collection_list.html:12
 #: templates/telemeta/lists.html:78
+#: templates/telemeta/inc/collection_list.html:12
 msgid "Recording period"
 msgstr "Aufnahmeperiode"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:235
+#: templates/telemeta/mediaitem_detail.html:234
 #, fuzzy
 msgid "Access type"
 msgstr "Status"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Geographic and cultural informations"
 msgstr "geographische und kulturelle Informationen"
 
 #: templates/telemeta/collection_detail.html:138
+#: templates/telemeta/lists.html:77
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "TonmeisterIn"
 
@@ -1370,7 +1376,7 @@ msgid "Bibliographic references"
 msgstr "bibliographische Referenzen"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:306
+#: templates/telemeta/mediaitem_detail.html:305
 msgid "Archiving data"
 msgstr "Archivdaten"
 
@@ -1379,24 +1385,23 @@ msgid "Related documentation"
 msgstr "damit zusammenhängende Dokumentation"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:350
+#: templates/telemeta/mediaitem_detail.html:349
 msgid "Comments"
 msgstr "Kommentare"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:86
+#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "Letzte Änderung"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:330
+#: templates/telemeta/mediaitem_detail.html:329
 msgid "Technical data"
 msgstr "technische Daten"
 
 #: templates/telemeta/collection_detail.html:209
 #, fuzzy
-#| msgid "Collections"
 msgid "Collection size"
 msgstr "Sammlungen"
 
@@ -1441,11 +1446,11 @@ msgid "Save"
 msgstr "speichern"
 
 #: templates/telemeta/collection_edit.html:37
+#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/resource_edit.html:39
 #: templates/telemeta/inc/collection_related.html:6
 #: templates/telemeta/inc/mediaitem_related.html:6
 #: templates/telemeta/inc/resource_related.html:6
-#: templates/telemeta/mediaitem_edit.html:88
-#: templates/telemeta/resource_edit.html:39
 msgid "Related media"
 msgstr "damit zusammenhängende Medien"
 
@@ -1468,21 +1473,19 @@ msgid "All"
 msgstr "Alles"
 
 #: templates/telemeta/collection_list.html:29
-#: templates/telemeta/mediaitem_list.html:28
+#, fuzzy
+msgctxt "collection list"
 msgid "Unpublished"
 msgstr "unveröffentlicht"
 
 #: templates/telemeta/collection_list.html:30
-#: templates/telemeta/mediaitem_list.html:29
+#, fuzzy
+msgctxt "collection list"
 msgid "Published"
 msgstr "veröffentlicht"
 
 #: templates/telemeta/collection_list.html:31
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_list.html:9
-#: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:9
-#: templates/telemeta/mediaitem_list.html:30
+msgctxt "collection list"
 msgid "Digitized"
 msgstr ""
 
@@ -1495,11 +1498,11 @@ msgid "Add"
 msgstr "hinzufügen"
 
 #: templates/telemeta/collection_related_edit.html:25
+#: templates/telemeta/mediaitem_related_edit.html:24
+#: templates/telemeta/resource_related_edit.html:24
 #: templates/telemeta/inc/collection_related.html:12
 #: templates/telemeta/inc/mediaitem_related.html:12
 #: templates/telemeta/inc/resource_related.html:12
-#: templates/telemeta/mediaitem_related_edit.html:24
-#: templates/telemeta/resource_related_edit.html:24
 msgid "Media"
 msgstr "Medien"
 
@@ -1524,7 +1527,7 @@ msgstr "Eintrag hinzufügen"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:191
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Wert"
@@ -1617,111 +1620,6 @@ msgstr "GeoNavigation öffnen"
 msgid "Partners"
 msgstr "Partners"
 
-#: templates/telemeta/inc/children_list.html:8
-#, python-format
-msgid ""
-"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
-"on %(hits)s"
-msgstr ""
-"%(resource.children_type|capitalize)s %(first_on_page)s bis %(last_on_page)s "
-"von %(hits)s"
-
-#: templates/telemeta/inc/children_list.html:18
-#: templates/telemeta/inc/collection_list.html:13
-#: templates/telemeta/inc/mediaitem_list.html:17
-#: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:76
-msgid "Code"
-msgstr "Code"
-
-#: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:31
-msgid "No resource"
-msgstr "keine Ressource"
-
-#: templates/telemeta/inc/collection_list.html:43
-msgid "No collection"
-msgstr "keine Sammlung"
-
-#: templates/telemeta/inc/collection_related.html:13
-#: templates/telemeta/inc/mediaitem_related.html:13
-#: templates/telemeta/inc/resource_related.html:13
-msgid "Preview"
-msgstr "Vorschau"
-
-#: templates/telemeta/inc/collection_related.html:41
-#: templates/telemeta/inc/mediaitem_related.html:41
-#: templates/telemeta/inc/resource_related.html:41
-msgid "Credits"
-msgstr "Mithilfe"
-
-#: templates/telemeta/inc/collection_related.html:45
-#: templates/telemeta/inc/mediaitem_related.html:45
-#: templates/telemeta/inc/resource_related.html:45
-#, fuzzy
-msgid "Download"
-msgstr "herunterladen:"
-
-#: templates/telemeta/inc/dublincore.html:4
-msgid "Dublin Core Metadata"
-msgstr "Dublin Core Metadata"
-
-#: templates/telemeta/inc/mediaitem_list.html:12
-#: templates/telemeta/mediaitem_detail.html:245
-msgid "Location"
-msgstr "Aufnahmeort"
-
-#: templates/telemeta/inc/mediaitem_list.html:14
-msgid "Country/Continent"
-msgstr "Land / Kontinent"
-
-#: templates/telemeta/inc/mediaitem_list.html:16
-#: templates/telemeta/search_criteria.html:107
-#: templates/telemeta/search_results.html:56
-msgid "Year of recording"
-msgstr "Aufnahmejahr"
-
-#: templates/telemeta/inc/mediaitem_list.html:53
-msgid "No item"
-msgstr "kein Element"
-
-#: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:75
-msgid "Type"
-msgstr "Typus"
-
-#: templates/telemeta/inc/module_revisions.html:19
-#: templates/telemeta/inc/user_list.html:6
-msgid "User"
-msgstr "BenutzerIn"
-
-#: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:97
-msgid "deleted"
-msgstr "gelöscht"
-
-#: templates/telemeta/inc/module_searches.html:13
-msgid "Criteria"
-msgstr "Kriterium"
-
-#: templates/telemeta/inc/user_list.html:7
-#: templates/telemeta/profile_detail.html:39
-msgid "First Name"
-msgstr "Vorname"
-
-#: templates/telemeta/inc/user_list.html:8
-#: templates/telemeta/profile_detail.html:40
-msgid "Last Name"
-msgstr "Nachname"
-
-#: templates/telemeta/inc/user_list.html:9
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: templates/telemeta/inc/user_list.html:10
-msgid "Groups"
-msgstr "Gruppen"
-
 #: templates/telemeta/instrument_alias_edit.html:16
 #: templates/telemeta/instrument_alias_edit.html:30
 #: templates/telemeta/instrument_alias_edit_value.html:30
@@ -1740,12 +1638,28 @@ msgstr "Diese Instrumentenliste ist leer"
 msgid "My playlists"
 msgstr "Meine Wiedergabeliste"
 
-#: templates/telemeta/lists.html:79
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
+#: templates/telemeta/lists.html:75
+#: templates/telemeta/inc/module_revisions.html:18
+msgid "Type"
+msgstr "Typus"
+
+#: templates/telemeta/lists.html:76
+#: templates/telemeta/inc/children_list.html:18
+#: templates/telemeta/inc/collection_list.html:13
+#: templates/telemeta/inc/mediaitem_list.html:17
+#: templates/telemeta/inc/resource_list.html:11
+msgid "Code"
+msgstr "Code"
+
+#: templates/telemeta/lists.html:79 templates/telemeta/search_results.html:70
 msgid "Sound"
 msgstr "Ton"
 
+#: templates/telemeta/lists.html:97
+#: templates/telemeta/inc/module_revisions.html:40
+msgid "deleted"
+msgstr "gelöscht"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "Authentifizierung"
@@ -1754,43 +1668,43 @@ msgstr "Authentifizierung"
 msgid "Your username and password didn't match. Please try again."
 msgstr "Name und Passwort passten nicht zusammen. Versuchen Sie es nochmals."
 
-#: templates/telemeta/login.html:45
+#: templates/telemeta/login.html:44
 msgid "Password forgotten"
 msgstr "Passwort vergessen."
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:895
+#: views/item.py:934
 msgid "Item"
 msgstr "Element"
 
-#: templates/telemeta/mediaitem_detail.html:181
+#: templates/telemeta/mediaitem_detail.html:180
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marken"
 
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Eigenschaft"
 
-#: templates/telemeta/mediaitem_detail.html:193
+#: templates/telemeta/mediaitem_detail.html:192
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Einheit"
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 #, fuzzy
 msgid "Please contact the administrators to get more rights."
@@ -1798,31 +1712,35 @@ msgstr ""
 "Bitte loggen Sie sich ein oder kontaktieren Sie den Administrator der "
 "Website, um einen privaten Zugang zu erhalten."
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:233
+#: templates/telemeta/mediaitem_detail.html:232
 msgid "Recording date"
 msgstr "Aufnahmedatum"
 
-#: templates/telemeta/mediaitem_detail.html:266
+#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/inc/mediaitem_list.html:12
+msgid "Location"
+msgstr "Aufnahmeort"
+
+#: templates/telemeta/mediaitem_detail.html:265
 #, fuzzy
 msgid "Musical informations"
 msgstr "physisches Format"
 
-#: templates/telemeta/mediaitem_detail.html:314
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Published references"
 msgstr "publizierte Referenzen"
 
-#: templates/telemeta/mediaitem_detail.html:317
+#: templates/telemeta/mediaitem_detail.html:316
 msgid "Remarks"
 msgstr "Bemerkungen"
 
-#: templates/telemeta/mediaitem_detail.html:338
+#: templates/telemeta/mediaitem_detail.html:337
 #, fuzzy
-#| msgid "collections"
 msgid "Item size"
 msgstr "Sammlungen"
 
@@ -1830,16 +1748,16 @@ msgstr "Sammlungen"
 msgid "No such item"
 msgstr "kein solches Element"
 
-#: templates/telemeta/mediaitem_edit.html:89
+#: templates/telemeta/mediaitem_edit.html:88
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: templates/telemeta/mediaitem_edit.html:90
+#: templates/telemeta/mediaitem_edit.html:89
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "Aufführung"
 
-#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/mediaitem_edit.html:93
 #, fuzzy
 msgid "Format"
 msgstr "Format"
@@ -1862,6 +1780,23 @@ msgstr "Schlüsselwort"
 msgid "Media Items"
 msgstr "Medienelemente"
 
+#: templates/telemeta/mediaitem_list.html:28
+msgid "Unpublished"
+msgstr "unveröffentlicht"
+
+#: templates/telemeta/mediaitem_list.html:29
+msgid "Published"
+msgstr "veröffentlicht"
+
+#: templates/telemeta/mediaitem_list.html:30
+#: templates/telemeta/search_criteria.html:168
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_list.html:9
+#: templates/telemeta/inc/mediaitem_list.html:9
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr ""
+
 #: templates/telemeta/paginator.html:5
 msgid "Previous"
 msgstr "vorhergehend"
@@ -1882,6 +1817,16 @@ msgstr "Profil"
 msgid "Playlists"
 msgstr "Wiedergabelisten"
 
+#: templates/telemeta/profile_detail.html:39
+#: templates/telemeta/inc/user_list.html:7
+msgid "First Name"
+msgstr "Vorname"
+
+#: templates/telemeta/profile_detail.html:40
+#: templates/telemeta/inc/user_list.html:8
+msgid "Last Name"
+msgstr "Nachname"
+
 #: templates/telemeta/profile_detail.html:41
 msgid "Email"
 msgstr "Email"
@@ -1922,6 +1867,130 @@ msgstr "anwenden"
 msgid "Change password"
 msgstr "Passwort ändern"
 
+#: templates/telemeta/resource_confirm_delete.html:20
+msgid "Delete the resource permanently?"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:26
+msgid "No"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:28
+msgid "Yes"
+msgstr ""
+
+#: templates/telemeta/resource_detail.html:120
+#: templates/telemeta/resource_detail_dc.html:22
+msgid "No such resource"
+msgstr "keine solche Ressource"
+
+#: templates/telemeta/search_criteria.html:5
+#: templates/telemeta/search_criteria.html:85
+msgid "Advanced Search"
+msgstr "erweiterte Suche"
+
+#: templates/telemeta/search_criteria.html:132
+#: templates/telemeta/search_results.html:56
+#: templates/telemeta/inc/mediaitem_list.html:16
+msgid "Year of recording"
+msgstr "Aufnahmejahr"
+
+#: templates/telemeta/search_criteria.html:139
+#: templates/telemeta/search_criteria.html:158
+#: templates/telemeta/search_results.html:58
+#: templates/telemeta/search_results.html:65
+msgid "to"
+msgstr "bis"
+
+#: templates/telemeta/search_criteria.html:151
+#: templates/telemeta/search_results.html:63
+msgid "Year of publication"
+msgstr "Publikationsjahr"
+
+#: templates/telemeta/search_criteria.html:176
+msgid "Search"
+msgstr "Suche"
+
+#: templates/telemeta/search_results.html:6
+#: templates/telemeta/search_results.html:11
+msgid "Search Results"
+msgstr "Suchergebnis"
+
+#: templates/telemeta/search_results.html:23
+#: templates/telemeta/search_results.html:27
+msgid "Sounds"
+msgstr "Töne"
+
+#: templates/telemeta/search_results.html:35
+msgid "Search pattern"
+msgstr "Suchmuster"
+
+#: templates/telemeta/inc/children_list.html:8
+#, python-format
+msgid ""
+"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
+"on %(hits)s"
+msgstr ""
+"%(resource.children_type|capitalize)s %(first_on_page)s bis %(last_on_page)s "
+"von %(hits)s"
+
+#: templates/telemeta/inc/children_list.html:39
+#: templates/telemeta/inc/resource_list.html:31
+msgid "No resource"
+msgstr "keine Ressource"
+
+#: templates/telemeta/inc/collection_list.html:43
+msgid "No collection"
+msgstr "keine Sammlung"
+
+#: templates/telemeta/inc/collection_related.html:13
+#: templates/telemeta/inc/mediaitem_related.html:13
+#: templates/telemeta/inc/resource_related.html:13
+msgid "Preview"
+msgstr "Vorschau"
+
+#: templates/telemeta/inc/collection_related.html:41
+#: templates/telemeta/inc/mediaitem_related.html:41
+#: templates/telemeta/inc/resource_related.html:41
+msgid "Credits"
+msgstr "Mithilfe"
+
+#: templates/telemeta/inc/collection_related.html:45
+#: templates/telemeta/inc/mediaitem_related.html:45
+#: templates/telemeta/inc/resource_related.html:45
+#, fuzzy
+msgid "Download"
+msgstr "herunterladen:"
+
+#: templates/telemeta/inc/dublincore.html:4
+msgid "Dublin Core Metadata"
+msgstr "Dublin Core Metadata"
+
+#: templates/telemeta/inc/mediaitem_list.html:14
+msgid "Country/Continent"
+msgstr "Land / Kontinent"
+
+#: templates/telemeta/inc/mediaitem_list.html:53
+msgid "No item"
+msgstr "kein Element"
+
+#: templates/telemeta/inc/module_revisions.html:19
+#: templates/telemeta/inc/user_list.html:6
+msgid "User"
+msgstr "BenutzerIn"
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
+msgstr "Kriterium"
+
+#: templates/telemeta/inc/user_list.html:9
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: templates/telemeta/inc/user_list.html:10
+msgid "Groups"
+msgstr "Gruppen"
+
 #: templates/telemeta/registration/logged_out.html:6
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Besten Dank für Ihren Besuch auf der Website!"
@@ -2091,58 +2160,6 @@ msgstr "E-Mail-Adresse:"
 msgid "Reset my password"
 msgstr "Mein Passwort zurücksetzen"
 
-#: templates/telemeta/resource_confirm_delete.html:20
-msgid "Delete the resource permanently?"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:26
-msgid "No"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:28
-msgid "Yes"
-msgstr ""
-
-#: templates/telemeta/resource_detail.html:121
-#: templates/telemeta/resource_detail_dc.html:22
-msgid "No such resource"
-msgstr "keine solche Ressource"
-
-#: templates/telemeta/search_criteria.html:5
-#: templates/telemeta/search_criteria.html:63
-msgid "Advanced Search"
-msgstr "erweiterte Suche"
-
-#: templates/telemeta/search_criteria.html:114
-#: templates/telemeta/search_criteria.html:133
-#: templates/telemeta/search_results.html:58
-#: templates/telemeta/search_results.html:65
-msgid "to"
-msgstr "bis"
-
-#: templates/telemeta/search_criteria.html:126
-#: templates/telemeta/search_results.html:63
-msgid "Year of publication"
-msgstr "Publikationsjahr"
-
-#: templates/telemeta/search_criteria.html:151
-msgid "Search"
-msgstr "Suche"
-
-#: templates/telemeta/search_results.html:6
-#: templates/telemeta/search_results.html:11
-msgid "Search Results"
-msgstr "Suchergebnis"
-
-#: templates/telemeta/search_results.html:23
-#: templates/telemeta/search_results.html:27
-msgid "Sounds"
-msgstr "Töne"
-
-#: templates/telemeta/search_results.html:35
-msgid "Search pattern"
-msgstr "Suchmuster"
-
 #: templatetags/telemeta_utils.py:259
 #, python-format
 msgid "%(count)d item"
@@ -2183,7 +2200,7 @@ msgid "Access not allowed"
 msgstr "Zugang verboten"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:896 views/profile.py:70
+#: views/item.py:935 views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2206,12 +2223,16 @@ msgstr "Listen"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:894
+#: views/item.py:933
 #, fuzzy
-#| msgid "Access not allowed"
 msgid "Access not allowed."
 msgstr "Zugang verboten"
 
+#, fuzzy
+#~ msgctxt "edit"
+#~ msgid "General"
+#~ msgstr "allgemein"
+
 #~ msgid "Add to playlist"
 #~ msgstr "zu Wiedergabeliste hinzufügen"
 
diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index bb661b5ffc7389422093120555d784020708ddc3..0cacfcec3c98e76232ba058ad4b52bc715cf2d0c 100644
GIT binary patch
delta 18
ZcmZ3&yo7ne1a@-;Ljx-l<BijK838o~1tkCg

delta 18
ZcmZ3&yo7ne1a<=jLklYd!;RB<838ob1t0(b

diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po
index 766c590f..9bafa347 100644
--- a/telemeta/locale/es/LC_MESSAGES/django.po
+++ b/telemeta/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-20 18:01+0100\n"
+"POT-Creation-Date: 2014-11-27 10:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -415,6 +415,7 @@ msgid "recording year (from)"
 msgstr ""
 
 #: models/media.py:211 models/media.py:212 models/media.py:213
+#: models/media.py:781 models/media.py:782
 msgid "YYYY"
 msgstr ""
 
@@ -482,7 +483,7 @@ msgstr ""
 msgid "recordist identical to depositor"
 msgstr ""
 
-#: models/media.py:247 templates/telemeta/collection_detail.html:95
+#: models/media.py:247
 msgid "published"
 msgstr ""
 
@@ -555,11 +556,11 @@ msgstr ""
 msgid "language"
 msgstr ""
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:251
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
 msgid "Language (ISO norm)"
 msgstr ""
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:255
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
 msgid "Ethnographic context"
 msgstr ""
 
@@ -936,9 +937,9 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:388
+#: templates/telemeta/mediaitem_detail.html:387
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:116
+#: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr ""
@@ -1090,7 +1091,7 @@ msgid "Administration"
 msgstr ""
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/collection_edit.html:36
 #: templates/telemeta/mediaitem_edit.html:87
 #: templates/telemeta/resource_edit.html:38
 msgid "General"
@@ -1102,6 +1103,9 @@ msgid "Enumerations"
 msgstr ""
 
 #: templates/telemeta/admin_enumerations.html:13
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:116
+#: templates/telemeta/search_results.html:53
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:8
 #: templates/telemeta/inc/collection_related.html:21
@@ -1110,8 +1114,6 @@ msgstr ""
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:74 templates/telemeta/search_criteria.html:91
-#: templates/telemeta/search_results.html:53
 msgid "Title"
 msgstr ""
 
@@ -1142,7 +1144,7 @@ msgstr ""
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta/base.html:74 templates/telemeta/login.html:41
+#: templates/telemeta/base.html:74 templates/telemeta/login.html:42
 msgid "Sign in"
 msgstr ""
 
@@ -1169,8 +1171,8 @@ msgstr ""
 
 #: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7
 #: templates/telemeta/collection_detail.html:84
-#: templates/telemeta/inc/breadcrumbs.html:8
 #: templates/telemeta/mediaitem_list.html:11
+#: templates/telemeta/inc/breadcrumbs.html:8
 msgid "Items"
 msgstr ""
 
@@ -1186,6 +1188,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: templates/telemeta/base.html:119
+msgctxt "admin"
+msgid "General"
+msgstr ""
+
 #: templates/telemeta/base.html:121
 #: templates/telemeta/instrument_alias_edit_value.html:24
 #: templates/telemeta/instrument_edit.html:4
@@ -1257,22 +1264,22 @@ msgstr ""
 
 #: templates/telemeta/collection_detail.html:45
 #: templates/telemeta/lists.html:60
-#: templates/telemeta/mediaitem_detail.html:107
+#: templates/telemeta/mediaitem_detail.html:106
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:45
+#: templates/telemeta/resource_detail.html:44
 msgid "Edit"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:50
-#: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:50
+#: templates/telemeta/mediaitem_detail.html:111
+#: templates/telemeta/resource_detail.html:49
 msgid "Copy"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:57
 #: templates/telemeta/geo_continents.html:26
-#: templates/telemeta/mediaitem_detail.html:119
-#: templates/telemeta/resource_detail.html:57
+#: templates/telemeta/mediaitem_detail.html:118
+#: templates/telemeta/resource_detail.html:56
 msgid "List"
 msgstr ""
 
@@ -1293,29 +1300,35 @@ msgid "Document status"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:93
+msgctxt "collection"
 msgid "unpublished"
 msgstr ""
 
+#: templates/telemeta/collection_detail.html:95
+msgctxt "collection"
+msgid "published"
+msgstr ""
+
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/inc/collection_list.html:12
 #: templates/telemeta/lists.html:78
+#: templates/telemeta/inc/collection_list.html:12
 msgid "Recording period"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:235
+#: templates/telemeta/mediaitem_detail.html:234
 msgid "Access type"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Geographic and cultural informations"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:138
+#: templates/telemeta/lists.html:77
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr ""
 
@@ -1324,7 +1337,7 @@ msgid "Bibliographic references"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:306
+#: templates/telemeta/mediaitem_detail.html:305
 msgid "Archiving data"
 msgstr ""
 
@@ -1333,18 +1346,18 @@ msgid "Related documentation"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:350
+#: templates/telemeta/mediaitem_detail.html:349
 msgid "Comments"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:86
+#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:330
+#: templates/telemeta/mediaitem_detail.html:329
 msgid "Technical data"
 msgstr ""
 
@@ -1393,11 +1406,11 @@ msgid "Save"
 msgstr ""
 
 #: templates/telemeta/collection_edit.html:37
+#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/resource_edit.html:39
 #: templates/telemeta/inc/collection_related.html:6
 #: templates/telemeta/inc/mediaitem_related.html:6
 #: templates/telemeta/inc/resource_related.html:6
-#: templates/telemeta/mediaitem_edit.html:88
-#: templates/telemeta/resource_edit.html:39
 msgid "Related media"
 msgstr ""
 
@@ -1419,21 +1432,17 @@ msgid "All"
 msgstr ""
 
 #: templates/telemeta/collection_list.html:29
-#: templates/telemeta/mediaitem_list.html:28
+msgctxt "collection list"
 msgid "Unpublished"
 msgstr ""
 
 #: templates/telemeta/collection_list.html:30
-#: templates/telemeta/mediaitem_list.html:29
+msgctxt "collection list"
 msgid "Published"
 msgstr ""
 
 #: templates/telemeta/collection_list.html:31
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_list.html:9
-#: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:9
-#: templates/telemeta/mediaitem_list.html:30
+msgctxt "collection list"
 msgid "Digitized"
 msgstr ""
 
@@ -1446,11 +1455,11 @@ msgid "Add"
 msgstr ""
 
 #: templates/telemeta/collection_related_edit.html:25
+#: templates/telemeta/mediaitem_related_edit.html:24
+#: templates/telemeta/resource_related_edit.html:24
 #: templates/telemeta/inc/collection_related.html:12
 #: templates/telemeta/inc/mediaitem_related.html:12
 #: templates/telemeta/inc/resource_related.html:12
-#: templates/telemeta/mediaitem_related_edit.html:24
-#: templates/telemeta/resource_related_edit.html:24
 msgid "Media"
 msgstr ""
 
@@ -1475,7 +1484,7 @@ msgstr ""
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:191
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr ""
@@ -1566,108 +1575,6 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
-#: templates/telemeta/inc/children_list.html:8
-#, python-format
-msgid ""
-"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
-"on %(hits)s"
-msgstr ""
-
-#: templates/telemeta/inc/children_list.html:18
-#: templates/telemeta/inc/collection_list.html:13
-#: templates/telemeta/inc/mediaitem_list.html:17
-#: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:76
-msgid "Code"
-msgstr ""
-
-#: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:31
-msgid "No resource"
-msgstr ""
-
-#: templates/telemeta/inc/collection_list.html:43
-msgid "No collection"
-msgstr ""
-
-#: templates/telemeta/inc/collection_related.html:13
-#: templates/telemeta/inc/mediaitem_related.html:13
-#: templates/telemeta/inc/resource_related.html:13
-msgid "Preview"
-msgstr ""
-
-#: templates/telemeta/inc/collection_related.html:41
-#: templates/telemeta/inc/mediaitem_related.html:41
-#: templates/telemeta/inc/resource_related.html:41
-msgid "Credits"
-msgstr ""
-
-#: templates/telemeta/inc/collection_related.html:45
-#: templates/telemeta/inc/mediaitem_related.html:45
-#: templates/telemeta/inc/resource_related.html:45
-msgid "Download"
-msgstr ""
-
-#: templates/telemeta/inc/dublincore.html:4
-msgid "Dublin Core Metadata"
-msgstr ""
-
-#: templates/telemeta/inc/mediaitem_list.html:12
-#: templates/telemeta/mediaitem_detail.html:245
-msgid "Location"
-msgstr ""
-
-#: templates/telemeta/inc/mediaitem_list.html:14
-msgid "Country/Continent"
-msgstr ""
-
-#: templates/telemeta/inc/mediaitem_list.html:16
-#: templates/telemeta/search_criteria.html:107
-#: templates/telemeta/search_results.html:56
-msgid "Year of recording"
-msgstr ""
-
-#: templates/telemeta/inc/mediaitem_list.html:53
-msgid "No item"
-msgstr ""
-
-#: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:75
-msgid "Type"
-msgstr ""
-
-#: templates/telemeta/inc/module_revisions.html:19
-#: templates/telemeta/inc/user_list.html:6
-msgid "User"
-msgstr ""
-
-#: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:97
-msgid "deleted"
-msgstr ""
-
-#: templates/telemeta/inc/module_searches.html:13
-msgid "Criteria"
-msgstr ""
-
-#: templates/telemeta/inc/user_list.html:7
-#: templates/telemeta/profile_detail.html:39
-msgid "First Name"
-msgstr ""
-
-#: templates/telemeta/inc/user_list.html:8
-#: templates/telemeta/profile_detail.html:40
-msgid "Last Name"
-msgstr ""
-
-#: templates/telemeta/inc/user_list.html:9
-msgid "E-mail"
-msgstr ""
-
-#: templates/telemeta/inc/user_list.html:10
-msgid "Groups"
-msgstr ""
-
 #: templates/telemeta/instrument_alias_edit.html:16
 #: templates/telemeta/instrument_alias_edit.html:30
 #: templates/telemeta/instrument_alias_edit_value.html:30
@@ -1686,12 +1593,28 @@ msgstr ""
 msgid "My playlists"
 msgstr ""
 
-#: templates/telemeta/lists.html:79
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
+#: templates/telemeta/lists.html:75
+#: templates/telemeta/inc/module_revisions.html:18
+msgid "Type"
+msgstr ""
+
+#: templates/telemeta/lists.html:76
+#: templates/telemeta/inc/children_list.html:18
+#: templates/telemeta/inc/collection_list.html:13
+#: templates/telemeta/inc/mediaitem_list.html:17
+#: templates/telemeta/inc/resource_list.html:11
+msgid "Code"
+msgstr ""
+
+#: templates/telemeta/lists.html:79 templates/telemeta/search_results.html:70
 msgid "Sound"
 msgstr ""
 
+#: templates/telemeta/lists.html:97
+#: templates/telemeta/inc/module_revisions.html:40
+msgid "deleted"
+msgstr ""
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr ""
@@ -1700,69 +1623,74 @@ msgstr ""
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 
-#: templates/telemeta/login.html:45
+#: templates/telemeta/login.html:44
 msgid "Password forgotten"
 msgstr ""
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:895
+#: views/item.py:934
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:181
+#: templates/telemeta/mediaitem_detail.html:180
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:193
+#: templates/telemeta/mediaitem_detail.html:192
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:233
+#: templates/telemeta/mediaitem_detail.html:232
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:266
+#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/inc/mediaitem_list.html:12
+msgid "Location"
+msgstr ""
+
+#: templates/telemeta/mediaitem_detail.html:265
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:314
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Published references"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:317
+#: templates/telemeta/mediaitem_detail.html:316
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:338
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Item size"
 msgstr ""
 
@@ -1770,16 +1698,16 @@ msgstr ""
 msgid "No such item"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:89
+#: templates/telemeta/mediaitem_edit.html:88
 msgid "Keywords"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:90
+#: templates/telemeta/mediaitem_edit.html:89
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/mediaitem_edit.html:93
 msgid "Format"
 msgstr ""
 
@@ -1799,6 +1727,23 @@ msgstr ""
 msgid "Media Items"
 msgstr ""
 
+#: templates/telemeta/mediaitem_list.html:28
+msgid "Unpublished"
+msgstr ""
+
+#: templates/telemeta/mediaitem_list.html:29
+msgid "Published"
+msgstr ""
+
+#: templates/telemeta/mediaitem_list.html:30
+#: templates/telemeta/search_criteria.html:168
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_list.html:9
+#: templates/telemeta/inc/mediaitem_list.html:9
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr ""
+
 #: templates/telemeta/paginator.html:5
 msgid "Previous"
 msgstr ""
@@ -1819,6 +1764,16 @@ msgstr ""
 msgid "Playlists"
 msgstr ""
 
+#: templates/telemeta/profile_detail.html:39
+#: templates/telemeta/inc/user_list.html:7
+msgid "First Name"
+msgstr ""
+
+#: templates/telemeta/profile_detail.html:40
+#: templates/telemeta/inc/user_list.html:8
+msgid "Last Name"
+msgstr ""
+
 #: templates/telemeta/profile_detail.html:41
 msgid "Email"
 msgstr ""
@@ -1859,6 +1814,127 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
+#: templates/telemeta/resource_confirm_delete.html:20
+msgid "Delete the resource permanently?"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:26
+msgid "No"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:28
+msgid "Yes"
+msgstr ""
+
+#: templates/telemeta/resource_detail.html:120
+#: templates/telemeta/resource_detail_dc.html:22
+msgid "No such resource"
+msgstr ""
+
+#: templates/telemeta/search_criteria.html:5
+#: templates/telemeta/search_criteria.html:85
+msgid "Advanced Search"
+msgstr ""
+
+#: templates/telemeta/search_criteria.html:132
+#: templates/telemeta/search_results.html:56
+#: templates/telemeta/inc/mediaitem_list.html:16
+msgid "Year of recording"
+msgstr ""
+
+#: templates/telemeta/search_criteria.html:139
+#: templates/telemeta/search_criteria.html:158
+#: templates/telemeta/search_results.html:58
+#: templates/telemeta/search_results.html:65
+msgid "to"
+msgstr ""
+
+#: templates/telemeta/search_criteria.html:151
+#: templates/telemeta/search_results.html:63
+msgid "Year of publication"
+msgstr ""
+
+#: templates/telemeta/search_criteria.html:176
+msgid "Search"
+msgstr ""
+
+#: templates/telemeta/search_results.html:6
+#: templates/telemeta/search_results.html:11
+msgid "Search Results"
+msgstr ""
+
+#: templates/telemeta/search_results.html:23
+#: templates/telemeta/search_results.html:27
+msgid "Sounds"
+msgstr ""
+
+#: templates/telemeta/search_results.html:35
+msgid "Search pattern"
+msgstr ""
+
+#: templates/telemeta/inc/children_list.html:8
+#, python-format
+msgid ""
+"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
+"on %(hits)s"
+msgstr ""
+
+#: templates/telemeta/inc/children_list.html:39
+#: templates/telemeta/inc/resource_list.html:31
+msgid "No resource"
+msgstr ""
+
+#: templates/telemeta/inc/collection_list.html:43
+msgid "No collection"
+msgstr ""
+
+#: templates/telemeta/inc/collection_related.html:13
+#: templates/telemeta/inc/mediaitem_related.html:13
+#: templates/telemeta/inc/resource_related.html:13
+msgid "Preview"
+msgstr ""
+
+#: templates/telemeta/inc/collection_related.html:41
+#: templates/telemeta/inc/mediaitem_related.html:41
+#: templates/telemeta/inc/resource_related.html:41
+msgid "Credits"
+msgstr ""
+
+#: templates/telemeta/inc/collection_related.html:45
+#: templates/telemeta/inc/mediaitem_related.html:45
+#: templates/telemeta/inc/resource_related.html:45
+msgid "Download"
+msgstr ""
+
+#: templates/telemeta/inc/dublincore.html:4
+msgid "Dublin Core Metadata"
+msgstr ""
+
+#: templates/telemeta/inc/mediaitem_list.html:14
+msgid "Country/Continent"
+msgstr ""
+
+#: templates/telemeta/inc/mediaitem_list.html:53
+msgid "No item"
+msgstr ""
+
+#: templates/telemeta/inc/module_revisions.html:19
+#: templates/telemeta/inc/user_list.html:6
+msgid "User"
+msgstr ""
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
+msgstr ""
+
+#: templates/telemeta/inc/user_list.html:9
+msgid "E-mail"
+msgstr ""
+
+#: templates/telemeta/inc/user_list.html:10
+msgid "Groups"
+msgstr ""
+
 #: templates/telemeta/registration/logged_out.html:6
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
@@ -2012,58 +2088,6 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: templates/telemeta/resource_confirm_delete.html:20
-msgid "Delete the resource permanently?"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:26
-msgid "No"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:28
-msgid "Yes"
-msgstr ""
-
-#: templates/telemeta/resource_detail.html:121
-#: templates/telemeta/resource_detail_dc.html:22
-msgid "No such resource"
-msgstr ""
-
-#: templates/telemeta/search_criteria.html:5
-#: templates/telemeta/search_criteria.html:63
-msgid "Advanced Search"
-msgstr ""
-
-#: templates/telemeta/search_criteria.html:114
-#: templates/telemeta/search_criteria.html:133
-#: templates/telemeta/search_results.html:58
-#: templates/telemeta/search_results.html:65
-msgid "to"
-msgstr ""
-
-#: templates/telemeta/search_criteria.html:126
-#: templates/telemeta/search_results.html:63
-msgid "Year of publication"
-msgstr ""
-
-#: templates/telemeta/search_criteria.html:151
-msgid "Search"
-msgstr ""
-
-#: templates/telemeta/search_results.html:6
-#: templates/telemeta/search_results.html:11
-msgid "Search Results"
-msgstr ""
-
-#: templates/telemeta/search_results.html:23
-#: templates/telemeta/search_results.html:27
-msgid "Sounds"
-msgstr ""
-
-#: templates/telemeta/search_results.html:35
-msgid "Search pattern"
-msgstr ""
-
 #: templatetags/telemeta_utils.py:259
 #, python-format
 msgid "%(count)d item"
@@ -2104,7 +2128,7 @@ msgid "Access not allowed"
 msgstr ""
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:896 views/profile.py:70
+#: views/item.py:935 views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2125,6 +2149,6 @@ msgstr ""
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:894
+#: views/item.py:933
 msgid "Access not allowed."
 msgstr ""
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index dc8891b06a073ddc61ba6f80ee4c4cdf0e828f0e..132af2fa5b3d5f9bf0102a8aedcd06f67fa18d41 100644
GIT binary patch
delta 8621
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
LZUz-sAJF^1M+KCz

delta 8228
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

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 6b76479f..16758b20 100644
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-20 18:01+0100\n"
+"POT-Creation-Date: 2014-11-27 10:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -414,6 +414,7 @@ msgid "recording year (from)"
 msgstr "année d'enregistrement (depuis)"
 
 #: models/media.py:211 models/media.py:212 models/media.py:213
+#: models/media.py:781 models/media.py:782
 msgid "YYYY"
 msgstr "AAAA"
 
@@ -481,7 +482,7 @@ msgstr "fiches items faites"
 msgid "recordist identical to depositor"
 msgstr "collecteur identique au déposant"
 
-#: models/media.py:247 templates/telemeta/collection_detail.html:95
+#: models/media.py:247
 msgid "published"
 msgstr "édité"
 
@@ -554,11 +555,11 @@ msgstr "aire culturelle"
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:251
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
 msgid "Language (ISO norm)"
 msgstr "Langue (norme ISO)"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:255
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
 msgid "Ethnographic context"
 msgstr "Contexte ethnographique"
 
@@ -575,10 +576,8 @@ msgid "depositor"
 msgstr "déposant"
 
 #: models/media.py:387
-#, fuzzy
-#| msgid "CollectionCode-ItemCode"
 msgid "CollectionCode_ItemCode"
-msgstr "CodeCollection-CodeItem"
+msgstr "CodeCollection_CodeItem"
 
 #: models/media.py:389
 msgid "item number"
@@ -938,9 +937,9 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:388
+#: templates/telemeta/mediaitem_detail.html:387
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:116
+#: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "Supprimer"
@@ -1092,11 +1091,11 @@ msgid "Administration"
 msgstr "Administration"
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/collection_edit.html:36
 #: templates/telemeta/mediaitem_edit.html:87
 #: templates/telemeta/resource_edit.html:38
 msgid "General"
-msgstr "Générale"
+msgstr "Général"
 
 #: templates/telemeta/admin_enumerations.html:6
 #: templates/telemeta/base.html:120 templates/telemeta/enumeration_edit.html:7
@@ -1104,6 +1103,9 @@ msgid "Enumerations"
 msgstr "Énumérations"
 
 #: templates/telemeta/admin_enumerations.html:13
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:116
+#: templates/telemeta/search_results.html:53
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:8
 #: templates/telemeta/inc/collection_related.html:21
@@ -1112,8 +1114,6 @@ msgstr "Énumérations"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:74 templates/telemeta/search_criteria.html:91
-#: templates/telemeta/search_results.html:53
 msgid "Title"
 msgstr "Titre"
 
@@ -1144,7 +1144,7 @@ msgstr "Aide"
 msgid "Sign out"
 msgstr "Déconnexion"
 
-#: templates/telemeta/base.html:74 templates/telemeta/login.html:41
+#: templates/telemeta/base.html:74 templates/telemeta/login.html:42
 msgid "Sign in"
 msgstr "Connexion"
 
@@ -1171,8 +1171,8 @@ msgstr "Collections"
 
 #: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7
 #: templates/telemeta/collection_detail.html:84
-#: templates/telemeta/inc/breadcrumbs.html:8
 #: templates/telemeta/mediaitem_list.html:11
+#: templates/telemeta/inc/breadcrumbs.html:8
 msgid "Items"
 msgstr "Items"
 
@@ -1188,6 +1188,11 @@ msgstr "Recherche avancée"
 msgid "Admin"
 msgstr "Admin"
 
+#: templates/telemeta/base.html:119
+msgctxt "admin"
+msgid "General"
+msgstr "Générale"
+
 #: templates/telemeta/base.html:121
 #: templates/telemeta/instrument_alias_edit_value.html:24
 #: templates/telemeta/instrument_edit.html:4
@@ -1261,22 +1266,22 @@ msgstr "Collection"
 
 #: templates/telemeta/collection_detail.html:45
 #: templates/telemeta/lists.html:60
-#: templates/telemeta/mediaitem_detail.html:107
+#: templates/telemeta/mediaitem_detail.html:106
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:45
+#: templates/telemeta/resource_detail.html:44
 msgid "Edit"
 msgstr "Editer"
 
 #: templates/telemeta/collection_detail.html:50
-#: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:50
+#: templates/telemeta/mediaitem_detail.html:111
+#: templates/telemeta/resource_detail.html:49
 msgid "Copy"
 msgstr "Copier"
 
 #: templates/telemeta/collection_detail.html:57
 #: templates/telemeta/geo_continents.html:26
-#: templates/telemeta/mediaitem_detail.html:119
-#: templates/telemeta/resource_detail.html:57
+#: templates/telemeta/mediaitem_detail.html:118
+#: templates/telemeta/resource_detail.html:56
 msgid "List"
 msgstr "Lister"
 
@@ -1297,29 +1302,35 @@ msgid "Document status"
 msgstr "Statut du document"
 
 #: templates/telemeta/collection_detail.html:93
+msgctxt "collection"
 msgid "unpublished"
-msgstr "inédites"
+msgstr "inédite"
+
+#: templates/telemeta/collection_detail.html:95
+msgctxt "collection"
+msgid "published"
+msgstr "éditée"
 
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/inc/collection_list.html:12
 #: templates/telemeta/lists.html:78
+#: templates/telemeta/inc/collection_list.html:12
 msgid "Recording period"
 msgstr "Période d'enregistrement"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:235
+#: templates/telemeta/mediaitem_detail.html:234
 msgid "Access type"
 msgstr "Type d'accès"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
 #: templates/telemeta/collection_detail.html:138
+#: templates/telemeta/lists.html:77
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "Collecteur"
 
@@ -1328,7 +1339,7 @@ msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:306
+#: templates/telemeta/mediaitem_detail.html:305
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
@@ -1337,18 +1348,18 @@ msgid "Related documentation"
 msgstr "Documentation associée"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:350
+#: templates/telemeta/mediaitem_detail.html:349
 msgid "Comments"
 msgstr "Commentaires"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:86
+#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "Dernière modification de la fiche"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:330
+#: templates/telemeta/mediaitem_detail.html:329
 msgid "Technical data"
 msgstr "Données techniques"
 
@@ -1397,11 +1408,11 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: templates/telemeta/collection_edit.html:37
+#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/resource_edit.html:39
 #: templates/telemeta/inc/collection_related.html:6
 #: templates/telemeta/inc/mediaitem_related.html:6
 #: templates/telemeta/inc/resource_related.html:6
-#: templates/telemeta/mediaitem_edit.html:88
-#: templates/telemeta/resource_edit.html:39
 msgid "Related media"
 msgstr "Média associés"
 
@@ -1423,23 +1434,19 @@ msgid "All"
 msgstr "Tous"
 
 #: templates/telemeta/collection_list.html:29
-#: templates/telemeta/mediaitem_list.html:28
+msgctxt "collection list"
 msgid "Unpublished"
-msgstr "Inédits"
+msgstr "Inédites"
 
 #: templates/telemeta/collection_list.html:30
-#: templates/telemeta/mediaitem_list.html:29
+msgctxt "collection list"
 msgid "Published"
-msgstr "Édités"
+msgstr "Éditées"
 
 #: templates/telemeta/collection_list.html:31
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_list.html:9
-#: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:9
-#: templates/telemeta/mediaitem_list.html:30
+msgctxt "collection list"
 msgid "Digitized"
-msgstr "Numérisé"
+msgstr "Numérisées"
 
 #: templates/telemeta/collection_list.html:37
 #: templates/telemeta/enumeration_edit.html:23
@@ -1450,11 +1457,11 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: templates/telemeta/collection_related_edit.html:25
+#: templates/telemeta/mediaitem_related_edit.html:24
+#: templates/telemeta/resource_related_edit.html:24
 #: templates/telemeta/inc/collection_related.html:12
 #: templates/telemeta/inc/mediaitem_related.html:12
 #: templates/telemeta/inc/resource_related.html:12
-#: templates/telemeta/mediaitem_related_edit.html:24
-#: templates/telemeta/resource_related_edit.html:24
 msgid "Media"
 msgstr "Média"
 
@@ -1479,7 +1486,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:191
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Valeur"
@@ -1570,110 +1577,6 @@ msgstr "Accéder au navigateur géographique"
 msgid "Partners"
 msgstr "Partenaires"
 
-#: templates/telemeta/inc/children_list.html:8
-#, python-format
-msgid ""
-"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
-"on %(hits)s"
-msgstr ""
-"%(resource.children_type|capitalize)s %(first_on_page)s à %(last_on_page)s "
-"sur %(hits)s"
-
-#: templates/telemeta/inc/children_list.html:18
-#: templates/telemeta/inc/collection_list.html:13
-#: templates/telemeta/inc/mediaitem_list.html:17
-#: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:76
-msgid "Code"
-msgstr "Cote"
-
-#: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:31
-msgid "No resource"
-msgstr "Aucune ressource"
-
-#: templates/telemeta/inc/collection_list.html:43
-msgid "No collection"
-msgstr "Aucune collection"
-
-#: templates/telemeta/inc/collection_related.html:13
-#: templates/telemeta/inc/mediaitem_related.html:13
-#: templates/telemeta/inc/resource_related.html:13
-msgid "Preview"
-msgstr "Prévisualisation"
-
-#: templates/telemeta/inc/collection_related.html:41
-#: templates/telemeta/inc/mediaitem_related.html:41
-#: templates/telemeta/inc/resource_related.html:41
-msgid "Credits"
-msgstr "Crédits"
-
-#: templates/telemeta/inc/collection_related.html:45
-#: templates/telemeta/inc/mediaitem_related.html:45
-#: templates/telemeta/inc/resource_related.html:45
-msgid "Download"
-msgstr "Télécharger"
-
-#: templates/telemeta/inc/dublincore.html:4
-msgid "Dublin Core Metadata"
-msgstr "Métadonnées Dublin Core"
-
-#: templates/telemeta/inc/mediaitem_list.html:12
-#: templates/telemeta/mediaitem_detail.html:245
-msgid "Location"
-msgstr "Lieu"
-
-#: templates/telemeta/inc/mediaitem_list.html:14
-msgid "Country/Continent"
-msgstr "Etat/Continent"
-
-#: templates/telemeta/inc/mediaitem_list.html:16
-#: templates/telemeta/search_criteria.html:107
-#: templates/telemeta/search_results.html:56
-msgid "Year of recording"
-msgstr "Année d'enregistrement"
-
-#: templates/telemeta/inc/mediaitem_list.html:53
-msgid "No item"
-msgstr "Aucun item"
-
-#: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:75
-msgid "Type"
-msgstr "Type"
-
-#: templates/telemeta/inc/module_revisions.html:19
-#: templates/telemeta/inc/user_list.html:6
-msgid "User"
-msgstr "Utilisateur"
-
-#: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:97
-msgid "deleted"
-msgstr "supprimé"
-
-#: templates/telemeta/inc/module_searches.html:13
-msgid "Criteria"
-msgstr "Critères"
-
-#: templates/telemeta/inc/user_list.html:7
-#: templates/telemeta/profile_detail.html:39
-msgid "First Name"
-msgstr "Prénom"
-
-#: templates/telemeta/inc/user_list.html:8
-#: templates/telemeta/profile_detail.html:40
-msgid "Last Name"
-msgstr "Nom"
-
-#: templates/telemeta/inc/user_list.html:9
-msgid "E-mail"
-msgstr "Courriel"
-
-#: templates/telemeta/inc/user_list.html:10
-msgid "Groups"
-msgstr "Groupes"
-
 #: templates/telemeta/instrument_alias_edit.html:16
 #: templates/telemeta/instrument_alias_edit.html:30
 #: templates/telemeta/instrument_alias_edit_value.html:30
@@ -1692,12 +1595,28 @@ msgstr "Cette énumération est vide"
 msgid "My playlists"
 msgstr "Mes listes de lecture"
 
-#: templates/telemeta/lists.html:79
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
+#: templates/telemeta/lists.html:75
+#: templates/telemeta/inc/module_revisions.html:18
+msgid "Type"
+msgstr "Type"
+
+#: templates/telemeta/lists.html:76
+#: templates/telemeta/inc/children_list.html:18
+#: templates/telemeta/inc/collection_list.html:13
+#: templates/telemeta/inc/mediaitem_list.html:17
+#: templates/telemeta/inc/resource_list.html:11
+msgid "Code"
+msgstr "Cote"
+
+#: templates/telemeta/lists.html:79 templates/telemeta/search_results.html:70
 msgid "Sound"
 msgstr "Sonore"
 
+#: templates/telemeta/lists.html:97
+#: templates/telemeta/inc/module_revisions.html:40
+msgid "deleted"
+msgstr "supprimé"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "Identification"
@@ -1707,69 +1626,74 @@ msgid "Your username and password didn't match. Please try again."
 msgstr ""
 "Vos nom d'utilisateur et/ou mot de passe sont incorrects. Essayez à nouveau."
 
-#: templates/telemeta/login.html:45
+#: templates/telemeta/login.html:44
 msgid "Password forgotten"
 msgstr "Mot de passe oublié"
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:895
+#: views/item.py:934
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta/mediaitem_detail.html:181
+#: templates/telemeta/mediaitem_detail.html:180
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr "Fichier"
 
-#: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta/mediaitem_detail.html:193
+#: templates/telemeta/mediaitem_detail.html:192
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr "Vous n'avez pas accès aux médias de cet item."
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr "Contactez les administrateurs du site pour obtenir plus de droits."
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "Cliquez ici"
 
-#: templates/telemeta/mediaitem_detail.html:233
+#: templates/telemeta/mediaitem_detail.html:232
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta/mediaitem_detail.html:266
+#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/inc/mediaitem_list.html:12
+msgid "Location"
+msgstr "Lieu"
+
+#: templates/telemeta/mediaitem_detail.html:265
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta/mediaitem_detail.html:314
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Published references"
 msgstr "Références éditées"
 
-#: templates/telemeta/mediaitem_detail.html:317
+#: templates/telemeta/mediaitem_detail.html:316
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta/mediaitem_detail.html:338
+#: templates/telemeta/mediaitem_detail.html:337
 msgid "Item size"
 msgstr "Taille de l'item"
 
@@ -1777,16 +1701,16 @@ msgstr "Taille de l'item"
 msgid "No such item"
 msgstr "Item introuvable"
 
-#: templates/telemeta/mediaitem_edit.html:89
+#: templates/telemeta/mediaitem_edit.html:88
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: templates/telemeta/mediaitem_edit.html:90
+#: templates/telemeta/mediaitem_edit.html:89
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "Voix / Instruments"
 
-#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/mediaitem_edit.html:93
 msgid "Format"
 msgstr "Format"
 
@@ -1806,6 +1730,23 @@ msgstr "Mot-clé"
 msgid "Media Items"
 msgstr "Items"
 
+#: templates/telemeta/mediaitem_list.html:28
+msgid "Unpublished"
+msgstr "Inédits"
+
+#: templates/telemeta/mediaitem_list.html:29
+msgid "Published"
+msgstr "Édités"
+
+#: templates/telemeta/mediaitem_list.html:30
+#: templates/telemeta/search_criteria.html:168
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_list.html:9
+#: templates/telemeta/inc/mediaitem_list.html:9
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr "Numérisé"
+
 #: templates/telemeta/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
@@ -1826,6 +1767,16 @@ msgstr "Profil utilisateur"
 msgid "Playlists"
 msgstr "Listes de lecture"
 
+#: templates/telemeta/profile_detail.html:39
+#: templates/telemeta/inc/user_list.html:7
+msgid "First Name"
+msgstr "Prénom"
+
+#: templates/telemeta/profile_detail.html:40
+#: templates/telemeta/inc/user_list.html:8
+msgid "Last Name"
+msgstr "Nom"
+
 #: templates/telemeta/profile_detail.html:41
 msgid "Email"
 msgstr "Courriel"
@@ -1866,6 +1817,129 @@ msgstr "Appliquer"
 msgid "Change password"
 msgstr ""
 
+#: templates/telemeta/resource_confirm_delete.html:20
+msgid "Delete the resource permanently?"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:26
+msgid "No"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:28
+msgid "Yes"
+msgstr ""
+
+#: templates/telemeta/resource_detail.html:120
+#: templates/telemeta/resource_detail_dc.html:22
+msgid "No such resource"
+msgstr "Aucune ressource de ce type"
+
+#: templates/telemeta/search_criteria.html:5
+#: templates/telemeta/search_criteria.html:85
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: templates/telemeta/search_criteria.html:132
+#: templates/telemeta/search_results.html:56
+#: templates/telemeta/inc/mediaitem_list.html:16
+msgid "Year of recording"
+msgstr "Année d'enregistrement"
+
+#: templates/telemeta/search_criteria.html:139
+#: templates/telemeta/search_criteria.html:158
+#: templates/telemeta/search_results.html:58
+#: templates/telemeta/search_results.html:65
+msgid "to"
+msgstr "à"
+
+#: templates/telemeta/search_criteria.html:151
+#: templates/telemeta/search_results.html:63
+msgid "Year of publication"
+msgstr "Année de publication"
+
+#: templates/telemeta/search_criteria.html:176
+msgid "Search"
+msgstr "Recherche"
+
+#: templates/telemeta/search_results.html:6
+#: templates/telemeta/search_results.html:11
+msgid "Search Results"
+msgstr "Résultats de recherche"
+
+#: templates/telemeta/search_results.html:23
+#: templates/telemeta/search_results.html:27
+msgid "Sounds"
+msgstr "Sonores"
+
+#: templates/telemeta/search_results.html:35
+msgid "Search pattern"
+msgstr "Mots clés"
+
+#: templates/telemeta/inc/children_list.html:8
+#, python-format
+msgid ""
+"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
+"on %(hits)s"
+msgstr ""
+"%(resource.children_type|capitalize)s %(first_on_page)s à %(last_on_page)s "
+"sur %(hits)s"
+
+#: templates/telemeta/inc/children_list.html:39
+#: templates/telemeta/inc/resource_list.html:31
+msgid "No resource"
+msgstr "Aucune ressource"
+
+#: templates/telemeta/inc/collection_list.html:43
+msgid "No collection"
+msgstr "Aucune collection"
+
+#: templates/telemeta/inc/collection_related.html:13
+#: templates/telemeta/inc/mediaitem_related.html:13
+#: templates/telemeta/inc/resource_related.html:13
+msgid "Preview"
+msgstr "Prévisualisation"
+
+#: templates/telemeta/inc/collection_related.html:41
+#: templates/telemeta/inc/mediaitem_related.html:41
+#: templates/telemeta/inc/resource_related.html:41
+msgid "Credits"
+msgstr "Crédits"
+
+#: templates/telemeta/inc/collection_related.html:45
+#: templates/telemeta/inc/mediaitem_related.html:45
+#: templates/telemeta/inc/resource_related.html:45
+msgid "Download"
+msgstr "Télécharger"
+
+#: templates/telemeta/inc/dublincore.html:4
+msgid "Dublin Core Metadata"
+msgstr "Métadonnées Dublin Core"
+
+#: templates/telemeta/inc/mediaitem_list.html:14
+msgid "Country/Continent"
+msgstr "Etat/Continent"
+
+#: templates/telemeta/inc/mediaitem_list.html:53
+msgid "No item"
+msgstr "Aucun item"
+
+#: templates/telemeta/inc/module_revisions.html:19
+#: templates/telemeta/inc/user_list.html:6
+msgid "User"
+msgstr "Utilisateur"
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
+msgstr "Critères"
+
+#: templates/telemeta/inc/user_list.html:9
+msgid "E-mail"
+msgstr "Courriel"
+
+#: templates/telemeta/inc/user_list.html:10
+msgid "Groups"
+msgstr "Groupes"
+
 #: templates/telemeta/registration/logged_out.html:6
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
@@ -2021,58 +2095,6 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: templates/telemeta/resource_confirm_delete.html:20
-msgid "Delete the resource permanently?"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:26
-msgid "No"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:28
-msgid "Yes"
-msgstr ""
-
-#: templates/telemeta/resource_detail.html:121
-#: templates/telemeta/resource_detail_dc.html:22
-msgid "No such resource"
-msgstr "Aucune ressource de ce type"
-
-#: templates/telemeta/search_criteria.html:5
-#: templates/telemeta/search_criteria.html:63
-msgid "Advanced Search"
-msgstr "Recherche avancée"
-
-#: templates/telemeta/search_criteria.html:114
-#: templates/telemeta/search_criteria.html:133
-#: templates/telemeta/search_results.html:58
-#: templates/telemeta/search_results.html:65
-msgid "to"
-msgstr "à"
-
-#: templates/telemeta/search_criteria.html:126
-#: templates/telemeta/search_results.html:63
-msgid "Year of publication"
-msgstr "Année de publication"
-
-#: templates/telemeta/search_criteria.html:151
-msgid "Search"
-msgstr "Recherche"
-
-#: templates/telemeta/search_results.html:6
-#: templates/telemeta/search_results.html:11
-msgid "Search Results"
-msgstr "Résultats de recherche"
-
-#: templates/telemeta/search_results.html:23
-#: templates/telemeta/search_results.html:27
-msgid "Sounds"
-msgstr "Sonores"
-
-#: templates/telemeta/search_results.html:35
-msgid "Search pattern"
-msgstr "Mots clés"
-
 #: templatetags/telemeta_utils.py:259
 #, python-format
 msgid "%(count)d item"
@@ -2113,7 +2135,7 @@ msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:896 views/profile.py:70
+#: views/item.py:935 views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
@@ -2136,12 +2158,14 @@ msgstr "Listes"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:894
-#, fuzzy
-#| msgid "Access not allowed"
+#: views/item.py:933
 msgid "Access not allowed."
 msgstr "Accès non autorisé"
 
+#~ msgctxt "edit"
+#~ msgid "General"
+#~ msgstr "Général"
+
 #~ msgid "Add to playlist"
 #~ msgstr "Ajouter à la liste"
 
diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index 394ae1f1973aa96e5202bb0970709897529b3cec..2992fb989ac04f22254af8a98beb62c0f7344ddf 100644
GIT binary patch
delta 22
dcmbQSk#WXG#tlMt?B)uF2397<n<ee)r2th32ABW<

delta 22
dcmbQSk#WXG#tlMt>;?*k7FGs^n<ee)r2tga29p2)

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
index a0fad6fc..65637de9 100644
--- a/telemeta/locale/zh_CN/LC_MESSAGES/django.po
+++ b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Telemeta 1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-20 18:01+0100\n"
+"POT-Creation-Date: 2014-11-27 10:43+0100\n"
 "PO-Revision-Date: 2014-09-02 16:18+2\n"
 "Last-Translator: Zaichao XIA <xiazaichao@gmail.com>\n"
 "Language-Team: zh_CN <LL@li.org>\n"
@@ -107,7 +107,6 @@ msgstr "录音带转速（厘米/秒）"
 
 #: models/enum.py:218
 #, fuzzy
-#| msgid "tape vendor"
 msgid "tape brand"
 msgstr "录音带卖主"
 
@@ -139,7 +138,6 @@ msgstr "媒体类型"
 
 #: models/enum.py:282 models/media.py:254
 #, fuzzy
-#| msgid "original location"
 msgid "original format"
 msgstr "原始位置"
 
@@ -363,7 +361,6 @@ msgstr "私有数据"
 
 #: models/media.py:109 models/media.py:214 models/media.py:364
 #, fuzzy
-#| msgid "access status"
 msgid "access type"
 msgstr "访问状态"
 
@@ -425,6 +422,7 @@ msgid "recording year (from)"
 msgstr "录音年份（起）"
 
 #: models/media.py:211 models/media.py:212 models/media.py:213
+#: models/media.py:781 models/media.py:782
 msgid "YYYY"
 msgstr ""
 
@@ -450,7 +448,6 @@ msgstr "出版序列号"
 
 #: models/media.py:224
 #, fuzzy
-#| msgid "author"
 msgid "booklet author"
 msgstr "作者"
 
@@ -495,7 +492,7 @@ msgstr "已完成项"
 msgid "recordist identical to depositor"
 msgstr "录音者与寄存者相同"
 
-#: models/media.py:247 templates/telemeta/collection_detail.html:95
+#: models/media.py:247
 msgid "published"
 msgstr "已出版的"
 
@@ -505,7 +502,6 @@ msgstr "保存网站"
 
 #: models/media.py:252
 #, fuzzy
-#| msgid "computed duration"
 msgid "estimated duration"
 msgstr "计算估计时长"
 
@@ -531,7 +527,6 @@ msgstr "计算估计时长"
 
 #: models/media.py:330
 #, fuzzy
-#| msgid "collections"
 msgid "collection size"
 msgstr "选集"
 
@@ -572,13 +567,12 @@ msgstr "文化区域"
 msgid "language"
 msgstr "语言"
 
-#: models/media.py:371 templates/telemeta/mediaitem_detail.html:251
+#: models/media.py:371 templates/telemeta/mediaitem_detail.html:250
 #, fuzzy
-#| msgid "Language ISO"
 msgid "Language (ISO norm)"
 msgstr "ISO语言"
 
-#: models/media.py:373 templates/telemeta/mediaitem_detail.html:255
+#: models/media.py:373 templates/telemeta/mediaitem_detail.html:254
 msgid "Ethnographic context"
 msgstr "人种文本"
 
@@ -673,7 +667,6 @@ msgstr "仪器"
 
 #: models/media.py:515
 #, fuzzy
-#| msgid "collections"
 msgid "item size"
 msgstr "选集"
 
@@ -755,7 +748,6 @@ msgstr "选集"
 
 #: models/media.py:802 models/media.py:837
 #, fuzzy
-#| msgid "computed duration"
 msgid "total available duration"
 msgstr "计算估计时长"
 
@@ -967,9 +959,9 @@ msgstr ""
 #: templates/telemeta/collection_detail.html:249
 #: templates/telemeta/collection_detail_dc.html:25
 #: templates/telemeta/lists.html:63
-#: templates/telemeta/mediaitem_detail.html:388
+#: templates/telemeta/mediaitem_detail.html:387
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:116
+#: templates/telemeta/resource_detail.html:115
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "删除"
@@ -1123,7 +1115,7 @@ msgid "Administration"
 msgstr "管理"
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/collection_edit.html:36
 #: templates/telemeta/mediaitem_edit.html:87
 #: templates/telemeta/resource_edit.html:38
 msgid "General"
@@ -1135,6 +1127,9 @@ msgid "Enumerations"
 msgstr "计数/列举"
 
 #: templates/telemeta/admin_enumerations.html:13
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:116
+#: templates/telemeta/search_results.html:53
 #: templates/telemeta/inc/children_list.html:15
 #: templates/telemeta/inc/collection_list.html:8
 #: templates/telemeta/inc/collection_related.html:21
@@ -1143,8 +1138,6 @@ msgstr "计数/列举"
 #: templates/telemeta/inc/module_revisions.html:17
 #: templates/telemeta/inc/resource_list.html:8
 #: templates/telemeta/inc/resource_related.html:21
-#: templates/telemeta/lists.html:74 templates/telemeta/search_criteria.html:91
-#: templates/telemeta/search_results.html:53
 msgid "Title"
 msgstr "标题"
 
@@ -1175,7 +1168,7 @@ msgstr "帮助"
 msgid "Sign out"
 msgstr "注销"
 
-#: templates/telemeta/base.html:74 templates/telemeta/login.html:41
+#: templates/telemeta/base.html:74 templates/telemeta/login.html:42
 msgid "Sign in"
 msgstr "登陆"
 
@@ -1202,8 +1195,8 @@ msgstr "选集"
 
 #: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7
 #: templates/telemeta/collection_detail.html:84
-#: templates/telemeta/inc/breadcrumbs.html:8
 #: templates/telemeta/mediaitem_list.html:11
+#: templates/telemeta/inc/breadcrumbs.html:8
 msgid "Items"
 msgstr "项"
 
@@ -1219,6 +1212,12 @@ msgstr "高级搜索"
 msgid "Admin"
 msgstr "管理员"
 
+#: templates/telemeta/base.html:119
+#, fuzzy
+msgctxt "admin"
+msgid "General"
+msgstr "通用"
+
 #: templates/telemeta/base.html:121
 #: templates/telemeta/instrument_alias_edit_value.html:24
 #: templates/telemeta/instrument_edit.html:4
@@ -1290,22 +1289,22 @@ msgstr "选集"
 
 #: templates/telemeta/collection_detail.html:45
 #: templates/telemeta/lists.html:60
-#: templates/telemeta/mediaitem_detail.html:107
+#: templates/telemeta/mediaitem_detail.html:106
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:45
+#: templates/telemeta/resource_detail.html:44
 msgid "Edit"
 msgstr "编辑"
 
 #: templates/telemeta/collection_detail.html:50
-#: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:50
+#: templates/telemeta/mediaitem_detail.html:111
+#: templates/telemeta/resource_detail.html:49
 msgid "Copy"
 msgstr "复制"
 
 #: templates/telemeta/collection_detail.html:57
 #: templates/telemeta/geo_continents.html:26
-#: templates/telemeta/mediaitem_detail.html:119
-#: templates/telemeta/resource_detail.html:57
+#: templates/telemeta/mediaitem_detail.html:118
+#: templates/telemeta/resource_detail.html:56
 msgid "List"
 msgstr "列表"
 
@@ -1323,38 +1322,42 @@ msgstr ""
 
 #: templates/telemeta/collection_detail.html:91
 #, fuzzy
-#| msgid "Documentation"
 msgid "Document status"
 msgstr "文献"
 
 #: templates/telemeta/collection_detail.html:93
 #, fuzzy
-#| msgid "Unpublished"
+msgctxt "collection"
 msgid "unpublished"
 msgstr "未出版的"
 
+#: templates/telemeta/collection_detail.html:95
+#, fuzzy
+msgctxt "collection"
+msgid "published"
+msgstr "已出版的"
+
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/inc/collection_list.html:12
 #: templates/telemeta/lists.html:78
+#: templates/telemeta/inc/collection_list.html:12
 msgid "Recording period"
 msgstr "录音时段"
 
 #: templates/telemeta/collection_detail.html:108
-#: templates/telemeta/mediaitem_detail.html:235
+#: templates/telemeta/mediaitem_detail.html:234
 #, fuzzy
-#| msgid "access status"
 msgid "Access type"
 msgstr "访问状态"
 
 #: templates/telemeta/collection_detail.html:120
-#: templates/telemeta/mediaitem_detail.html:243
+#: templates/telemeta/mediaitem_detail.html:242
 msgid "Geographic and cultural informations"
 msgstr "地理和文化信息"
 
 #: templates/telemeta/collection_detail.html:138
+#: templates/telemeta/lists.html:77
 #: templates/telemeta/inc/collection_list.html:11
 #: templates/telemeta/inc/mediaitem_list.html:10
-#: templates/telemeta/lists.html:77
 msgid "Recordist"
 msgstr "录音员"
 
@@ -1363,7 +1366,7 @@ msgid "Bibliographic references"
 msgstr "参考文献"
 
 #: templates/telemeta/collection_detail.html:165
-#: templates/telemeta/mediaitem_detail.html:306
+#: templates/telemeta/mediaitem_detail.html:305
 msgid "Archiving data"
 msgstr "存档数据"
 
@@ -1372,24 +1375,23 @@ msgid "Related documentation"
 msgstr "相关文献"
 
 #: templates/telemeta/collection_detail.html:183
-#: templates/telemeta/mediaitem_detail.html:350
+#: templates/telemeta/mediaitem_detail.html:349
 msgid "Comments"
 msgstr "注解"
 
 #: templates/telemeta/collection_detail.html:187
-#: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:86
+#: templates/telemeta/mediaitem_detail.html:319
+#: templates/telemeta/resource_detail.html:85
 msgid "Last modification"
 msgstr "上次修改"
 
 #: templates/telemeta/collection_detail.html:201
-#: templates/telemeta/mediaitem_detail.html:330
+#: templates/telemeta/mediaitem_detail.html:329
 msgid "Technical data"
 msgstr "专业数据"
 
 #: templates/telemeta/collection_detail.html:209
 #, fuzzy
-#| msgid "Collections"
 msgid "Collection size"
 msgstr "选集"
 
@@ -1434,11 +1436,11 @@ msgid "Save"
 msgstr "保存"
 
 #: templates/telemeta/collection_edit.html:37
+#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/resource_edit.html:39
 #: templates/telemeta/inc/collection_related.html:6
 #: templates/telemeta/inc/mediaitem_related.html:6
 #: templates/telemeta/inc/resource_related.html:6
-#: templates/telemeta/mediaitem_edit.html:88
-#: templates/telemeta/resource_edit.html:39
 msgid "Related media"
 msgstr "相关媒体"
 
@@ -1461,21 +1463,19 @@ msgid "All"
 msgstr "所有"
 
 #: templates/telemeta/collection_list.html:29
-#: templates/telemeta/mediaitem_list.html:28
+#, fuzzy
+msgctxt "collection list"
 msgid "Unpublished"
 msgstr "未出版的"
 
 #: templates/telemeta/collection_list.html:30
-#: templates/telemeta/mediaitem_list.html:29
+#, fuzzy
+msgctxt "collection list"
 msgid "Published"
 msgstr "已出版的"
 
 #: templates/telemeta/collection_list.html:31
-#: templates/telemeta/inc/children_list.html:16
-#: templates/telemeta/inc/collection_list.html:9
-#: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:9
-#: templates/telemeta/mediaitem_list.html:30
+msgctxt "collection list"
 msgid "Digitized"
 msgstr ""
 
@@ -1488,11 +1488,11 @@ msgid "Add"
 msgstr "添加"
 
 #: templates/telemeta/collection_related_edit.html:25
+#: templates/telemeta/mediaitem_related_edit.html:24
+#: templates/telemeta/resource_related_edit.html:24
 #: templates/telemeta/inc/collection_related.html:12
 #: templates/telemeta/inc/mediaitem_related.html:12
 #: templates/telemeta/inc/resource_related.html:12
-#: templates/telemeta/mediaitem_related_edit.html:24
-#: templates/telemeta/resource_related_edit.html:24
 msgid "Media"
 msgstr "媒体"
 
@@ -1517,7 +1517,7 @@ msgstr "添加记录"
 #: templates/telemeta/enumeration_edit.html:17
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
-#: templates/telemeta/mediaitem_detail.html:192
+#: templates/telemeta/mediaitem_detail.html:191
 #: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "价值"
@@ -1608,108 +1608,6 @@ msgstr "打开地图导航"
 msgid "Partners"
 msgstr "合作伙伴"
 
-#: templates/telemeta/inc/children_list.html:8
-#, python-format
-msgid ""
-"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
-"on %(hits)s"
-msgstr ""
-
-#: templates/telemeta/inc/children_list.html:18
-#: templates/telemeta/inc/collection_list.html:13
-#: templates/telemeta/inc/mediaitem_list.html:17
-#: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:76
-msgid "Code"
-msgstr "密码"
-
-#: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:31
-msgid "No resource"
-msgstr "无资源"
-
-#: templates/telemeta/inc/collection_list.html:43
-msgid "No collection"
-msgstr "无选集"
-
-#: templates/telemeta/inc/collection_related.html:13
-#: templates/telemeta/inc/mediaitem_related.html:13
-#: templates/telemeta/inc/resource_related.html:13
-msgid "Preview"
-msgstr "预览"
-
-#: templates/telemeta/inc/collection_related.html:41
-#: templates/telemeta/inc/mediaitem_related.html:41
-#: templates/telemeta/inc/resource_related.html:41
-msgid "Credits"
-msgstr "工作人员"
-
-#: templates/telemeta/inc/collection_related.html:45
-#: templates/telemeta/inc/mediaitem_related.html:45
-#: templates/telemeta/inc/resource_related.html:45
-msgid "Download"
-msgstr "下载"
-
-#: templates/telemeta/inc/dublincore.html:4
-msgid "Dublin Core Metadata"
-msgstr "都柏林核心元数据"
-
-#: templates/telemeta/inc/mediaitem_list.html:12
-#: templates/telemeta/mediaitem_detail.html:245
-msgid "Location"
-msgstr "位置"
-
-#: templates/telemeta/inc/mediaitem_list.html:14
-msgid "Country/Continent"
-msgstr "国家/洲"
-
-#: templates/telemeta/inc/mediaitem_list.html:16
-#: templates/telemeta/search_criteria.html:107
-#: templates/telemeta/search_results.html:56
-msgid "Year of recording"
-msgstr "录音年份"
-
-#: templates/telemeta/inc/mediaitem_list.html:53
-msgid "No item"
-msgstr "无项目"
-
-#: templates/telemeta/inc/module_revisions.html:18
-#: templates/telemeta/lists.html:75
-msgid "Type"
-msgstr "类型"
-
-#: templates/telemeta/inc/module_revisions.html:19
-#: templates/telemeta/inc/user_list.html:6
-msgid "User"
-msgstr "用户"
-
-#: templates/telemeta/inc/module_revisions.html:40
-#: templates/telemeta/lists.html:97
-msgid "deleted"
-msgstr "已删除"
-
-#: templates/telemeta/inc/module_searches.html:13
-msgid "Criteria"
-msgstr "标准"
-
-#: templates/telemeta/inc/user_list.html:7
-#: templates/telemeta/profile_detail.html:39
-msgid "First Name"
-msgstr "名"
-
-#: templates/telemeta/inc/user_list.html:8
-#: templates/telemeta/profile_detail.html:40
-msgid "Last Name"
-msgstr "姓"
-
-#: templates/telemeta/inc/user_list.html:9
-msgid "E-mail"
-msgstr "邮箱"
-
-#: templates/telemeta/inc/user_list.html:10
-msgid "Groups"
-msgstr "群组"
-
 #: templates/telemeta/instrument_alias_edit.html:16
 #: templates/telemeta/instrument_alias_edit.html:30
 #: templates/telemeta/instrument_alias_edit_value.html:30
@@ -1728,12 +1626,28 @@ msgstr "该仪器列表为空"
 msgid "My playlists"
 msgstr "我的播放列表"
 
-#: templates/telemeta/lists.html:79
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
+#: templates/telemeta/lists.html:75
+#: templates/telemeta/inc/module_revisions.html:18
+msgid "Type"
+msgstr "类型"
+
+#: templates/telemeta/lists.html:76
+#: templates/telemeta/inc/children_list.html:18
+#: templates/telemeta/inc/collection_list.html:13
+#: templates/telemeta/inc/mediaitem_list.html:17
+#: templates/telemeta/inc/resource_list.html:11
+msgid "Code"
+msgstr "密码"
+
+#: templates/telemeta/lists.html:79 templates/telemeta/search_results.html:70
 msgid "Sound"
 msgstr "声音"
 
+#: templates/telemeta/lists.html:97
+#: templates/telemeta/inc/module_revisions.html:40
+msgid "deleted"
+msgstr "已删除"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "用户认证"
@@ -1742,71 +1656,75 @@ msgstr "用户认证"
 msgid "Your username and password didn't match. Please try again."
 msgstr "您的用户名和密码不匹配。请重试。"
 
-#: templates/telemeta/login.html:45
+#: templates/telemeta/login.html:44
 msgid "Password forgotten"
 msgstr "忘记密码"
 
 #: templates/telemeta/mediaitem_add.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
-#: views/item.py:895
+#: views/item.py:934
 msgid "Item"
 msgstr "项"
 
-#: templates/telemeta/mediaitem_detail.html:181
+#: templates/telemeta/mediaitem_detail.html:180
 #: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_detail.html:182
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "书签"
 
-#: templates/telemeta/mediaitem_detail.html:191
+#: templates/telemeta/mediaitem_detail.html:190
 #: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "性能"
 
-#: templates/telemeta/mediaitem_detail.html:193
+#: templates/telemeta/mediaitem_detail.html:192
 #: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "单元"
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "You don't have access to the media of this item."
 msgstr "您无权访问该项的媒体"
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Please contact the administrators to get more rights."
 msgstr "请联系管理员以获得跟多权限。"
 
-#: templates/telemeta/mediaitem_detail.html:214
+#: templates/telemeta/mediaitem_detail.html:213
 #: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "点击这里"
 
-#: templates/telemeta/mediaitem_detail.html:233
+#: templates/telemeta/mediaitem_detail.html:232
 msgid "Recording date"
 msgstr "录音日期"
 
-#: templates/telemeta/mediaitem_detail.html:266
+#: templates/telemeta/mediaitem_detail.html:244
+#: templates/telemeta/inc/mediaitem_list.html:12
+msgid "Location"
+msgstr "位置"
+
+#: templates/telemeta/mediaitem_detail.html:265
 msgid "Musical informations"
 msgstr "音乐信息"
 
-#: templates/telemeta/mediaitem_detail.html:314
+#: templates/telemeta/mediaitem_detail.html:313
 msgid "Published references"
 msgstr "已出版参考资料"
 
-#: templates/telemeta/mediaitem_detail.html:317
+#: templates/telemeta/mediaitem_detail.html:316
 msgid "Remarks"
 msgstr "评论"
 
-#: templates/telemeta/mediaitem_detail.html:338
+#: templates/telemeta/mediaitem_detail.html:337
 #, fuzzy
-#| msgid "collections"
 msgid "Item size"
 msgstr "选集"
 
@@ -1814,16 +1732,16 @@ msgstr "选集"
 msgid "No such item"
 msgstr "无该项"
 
-#: templates/telemeta/mediaitem_edit.html:89
+#: templates/telemeta/mediaitem_edit.html:88
 msgid "Keywords"
 msgstr "关键词"
 
-#: templates/telemeta/mediaitem_edit.html:90
+#: templates/telemeta/mediaitem_edit.html:89
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "性能"
 
-#: templates/telemeta/mediaitem_edit.html:91
+#: templates/telemeta/mediaitem_edit.html:93
 #, fuzzy
 msgid "Format"
 msgstr "格式"
@@ -1844,6 +1762,23 @@ msgstr "关键字"
 msgid "Media Items"
 msgstr "媒体项"
 
+#: templates/telemeta/mediaitem_list.html:28
+msgid "Unpublished"
+msgstr "未出版的"
+
+#: templates/telemeta/mediaitem_list.html:29
+msgid "Published"
+msgstr "已出版的"
+
+#: templates/telemeta/mediaitem_list.html:30
+#: templates/telemeta/search_criteria.html:168
+#: templates/telemeta/inc/children_list.html:16
+#: templates/telemeta/inc/collection_list.html:9
+#: templates/telemeta/inc/mediaitem_list.html:9
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr ""
+
 #: templates/telemeta/paginator.html:5
 msgid "Previous"
 msgstr "前一个"
@@ -1864,6 +1799,16 @@ msgstr "用户资料"
 msgid "Playlists"
 msgstr "播放列表"
 
+#: templates/telemeta/profile_detail.html:39
+#: templates/telemeta/inc/user_list.html:7
+msgid "First Name"
+msgstr "名"
+
+#: templates/telemeta/profile_detail.html:40
+#: templates/telemeta/inc/user_list.html:8
+msgid "Last Name"
+msgstr "姓"
+
 #: templates/telemeta/profile_detail.html:41
 msgid "Email"
 msgstr "邮箱"
@@ -1904,6 +1849,127 @@ msgstr "应用"
 msgid "Change password"
 msgstr "更改密码"
 
+#: templates/telemeta/resource_confirm_delete.html:20
+msgid "Delete the resource permanently?"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:26
+msgid "No"
+msgstr ""
+
+#: templates/telemeta/resource_confirm_delete.html:28
+msgid "Yes"
+msgstr ""
+
+#: templates/telemeta/resource_detail.html:120
+#: templates/telemeta/resource_detail_dc.html:22
+msgid "No such resource"
+msgstr "该资源不存在"
+
+#: templates/telemeta/search_criteria.html:5
+#: templates/telemeta/search_criteria.html:85
+msgid "Advanced Search"
+msgstr "高级搜索"
+
+#: templates/telemeta/search_criteria.html:132
+#: templates/telemeta/search_results.html:56
+#: templates/telemeta/inc/mediaitem_list.html:16
+msgid "Year of recording"
+msgstr "录音年份"
+
+#: templates/telemeta/search_criteria.html:139
+#: templates/telemeta/search_criteria.html:158
+#: templates/telemeta/search_results.html:58
+#: templates/telemeta/search_results.html:65
+msgid "to"
+msgstr "给"
+
+#: templates/telemeta/search_criteria.html:151
+#: templates/telemeta/search_results.html:63
+msgid "Year of publication"
+msgstr "出版年份"
+
+#: templates/telemeta/search_criteria.html:176
+msgid "Search"
+msgstr "搜索"
+
+#: templates/telemeta/search_results.html:6
+#: templates/telemeta/search_results.html:11
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: templates/telemeta/search_results.html:23
+#: templates/telemeta/search_results.html:27
+msgid "Sounds"
+msgstr "声音"
+
+#: templates/telemeta/search_results.html:35
+msgid "Search pattern"
+msgstr "搜索样板"
+
+#: templates/telemeta/inc/children_list.html:8
+#, python-format
+msgid ""
+"%(resource.children_type|capitalize)s %(first_on_page)s to %(last_on_page)s "
+"on %(hits)s"
+msgstr ""
+
+#: templates/telemeta/inc/children_list.html:39
+#: templates/telemeta/inc/resource_list.html:31
+msgid "No resource"
+msgstr "无资源"
+
+#: templates/telemeta/inc/collection_list.html:43
+msgid "No collection"
+msgstr "无选集"
+
+#: templates/telemeta/inc/collection_related.html:13
+#: templates/telemeta/inc/mediaitem_related.html:13
+#: templates/telemeta/inc/resource_related.html:13
+msgid "Preview"
+msgstr "预览"
+
+#: templates/telemeta/inc/collection_related.html:41
+#: templates/telemeta/inc/mediaitem_related.html:41
+#: templates/telemeta/inc/resource_related.html:41
+msgid "Credits"
+msgstr "工作人员"
+
+#: templates/telemeta/inc/collection_related.html:45
+#: templates/telemeta/inc/mediaitem_related.html:45
+#: templates/telemeta/inc/resource_related.html:45
+msgid "Download"
+msgstr "下载"
+
+#: templates/telemeta/inc/dublincore.html:4
+msgid "Dublin Core Metadata"
+msgstr "都柏林核心元数据"
+
+#: templates/telemeta/inc/mediaitem_list.html:14
+msgid "Country/Continent"
+msgstr "国家/洲"
+
+#: templates/telemeta/inc/mediaitem_list.html:53
+msgid "No item"
+msgstr "无项目"
+
+#: templates/telemeta/inc/module_revisions.html:19
+#: templates/telemeta/inc/user_list.html:6
+msgid "User"
+msgstr "用户"
+
+#: templates/telemeta/inc/module_searches.html:13
+msgid "Criteria"
+msgstr "标准"
+
+#: templates/telemeta/inc/user_list.html:9
+msgid "E-mail"
+msgstr "邮箱"
+
+#: templates/telemeta/inc/user_list.html:10
+msgid "Groups"
+msgstr "群组"
+
 #: templates/telemeta/registration/logged_out.html:6
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "谢谢您今天对网站的访问与支持。"
@@ -2063,58 +2129,6 @@ msgstr "邮箱地址："
 msgid "Reset my password"
 msgstr "重置我的密码"
 
-#: templates/telemeta/resource_confirm_delete.html:20
-msgid "Delete the resource permanently?"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:26
-msgid "No"
-msgstr ""
-
-#: templates/telemeta/resource_confirm_delete.html:28
-msgid "Yes"
-msgstr ""
-
-#: templates/telemeta/resource_detail.html:121
-#: templates/telemeta/resource_detail_dc.html:22
-msgid "No such resource"
-msgstr "该资源不存在"
-
-#: templates/telemeta/search_criteria.html:5
-#: templates/telemeta/search_criteria.html:63
-msgid "Advanced Search"
-msgstr "高级搜索"
-
-#: templates/telemeta/search_criteria.html:114
-#: templates/telemeta/search_criteria.html:133
-#: templates/telemeta/search_results.html:58
-#: templates/telemeta/search_results.html:65
-msgid "to"
-msgstr "给"
-
-#: templates/telemeta/search_criteria.html:126
-#: templates/telemeta/search_results.html:63
-msgid "Year of publication"
-msgstr "出版年份"
-
-#: templates/telemeta/search_criteria.html:151
-msgid "Search"
-msgstr "搜索"
-
-#: templates/telemeta/search_results.html:6
-#: templates/telemeta/search_results.html:11
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: templates/telemeta/search_results.html:23
-#: templates/telemeta/search_results.html:27
-msgid "Sounds"
-msgstr "声音"
-
-#: templates/telemeta/search_results.html:35
-msgid "Search pattern"
-msgstr "搜索样板"
-
 #: templatetags/telemeta_utils.py:259
 #, python-format
 msgid "%(count)d item"
@@ -2155,7 +2169,7 @@ msgid "Access not allowed"
 msgstr "不允许访问"
 
 #: views/collection.py:52 views/home.py:93 views/item.py:135 views/item.py:507
-#: views/item.py:896 views/profile.py:70
+#: views/item.py:935 views/profile.py:70
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr "请登录或联系网站管理员以获得私人访问权限。"
@@ -2176,12 +2190,16 @@ msgstr "列表"
 msgid "You have successfully updated your item."
 msgstr ""
 
-#: views/item.py:894
+#: views/item.py:933
 #, fuzzy
-#| msgid "Access not allowed"
 msgid "Access not allowed."
 msgstr "不允许访问"
 
+#, fuzzy
+#~ msgctxt "edit"
+#~ msgid "General"
+#~ msgstr "通用"
+
 #~ msgid "Add to playlist"
 #~ msgstr "添加到播放列表"
 
diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 29283567..ee71e14e 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -116,7 +116,7 @@
  {% if user.is_staff %}
  <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
  <ul>
- <li><a href="{% url "telemeta-admin-general" %}">{% trans "General" %}</a></li>
+ <li><a href="{% url "telemeta-admin-general" %}">{% trans "General" context "admin" %}</a></li>
  <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 aliases" %}</a></li>
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 63ead4e4..b318ff2d 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -38,7 +38,7 @@
 {% endblock %}
 
 {% block title_buttons %}
-  <div class="fixedWidthAsPlayer">
+  <div>
     {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
     <a href="{% url "telemeta-collection-edit" collection.public_id %}">
       <button type="button" class="btn btn-default">
@@ -90,9 +90,9 @@
                 {% endif %}
                 <dt>{% trans "Document status" %}</dt>
                 {% if '_I_' in collection.public_id %}
-                 <dd>{% trans 'unpublished' %}</dd>
+                 <dd>{% trans 'unpublished' context "collection" %}</dd>
                 {% elif '_E_' in collection.public_id %}
-                 <dd>{% trans 'published' %}</dd>
+                 <dd>{% trans 'published' context "collection" %}</dd>
                 {% else %}
                  <dd>&nbsp;</dd>
                 {% endif %}
diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html
index b6b789bc..21b415a9 100644
--- a/telemeta/templates/telemeta/collection_list.html
+++ b/telemeta/templates/telemeta/collection_list.html
@@ -26,9 +26,9 @@
   </button>
   <ul class="dropdown-menu" role="menu">
     <li><a href="{% url "telemeta-collections" %}" class="">{% trans "All" %}</a></li>
-    <li><a href="{% url "telemeta-collections-unpublished" %}">{% trans "Unpublished" %}</a></li>
-    <li><a href="{% url "telemeta-collections-published" %}">{% trans "Published" %}</a></li>
-    <li><a href="{% url "telemeta-collections-sound" %}">{% trans "Digitized" %}</a></li>
+    <li><a href="{% url "telemeta-collections-unpublished" %}">{% trans "Unpublished" context "collection list" %}</a></li>
+    <li><a href="{% url "telemeta-collections-published" %}">{% trans "Published" context "collection list" %}</a></li>
+    <li><a href="{% url "telemeta-collections-sound" %}">{% trans "Digitized" context "collection list" %}</a></li>
   </ul>
 </div>
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
diff --git a/telemeta/templates/telemeta/inc/children_list.html b/telemeta/templates/telemeta/inc/children_list.html
index b356f60d..d994d395 100644
--- a/telemeta/templates/telemeta/inc/children_list.html
+++ b/telemeta/templates/telemeta/inc/children_list.html
@@ -28,7 +28,7 @@
        <center><span class="glyphicon glyphicon-volume-up" style="font-size: 1.3em;"></span></center>
       {% endif %}
     </td>
-    <td>{{ child.descriptions }}</td>
+    <td>{% if child.descriptions %}{{ child.descriptions }}{% else %}{{ child.description }}{% endif %}</td>
     <td>{{ child.code }}</td>
 </tr>
 {% endif %}
diff --git a/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html
index b57d3fc5..1a1daf61 100644
--- a/telemeta/templates/telemeta/login.html
+++ b/telemeta/templates/telemeta/login.html
@@ -17,7 +17,7 @@ $(document).ready(function() {
 {{ block.super }}
 <div class="large-4 columns">&nbsp;</div>
 <div class="module large-4 columns">
-    <span class="module-title"><img src="{{ STATIC_URL }}telemeta/images/user_red.png" style="vertical-align:middle" />
+    <span class="module-title"><span class="glyphicon glyphicon-log-in"></span>
     {% trans "User authentication" %}</span>
 
 <div style="background-color: white; align: center; padding: 1em;">
@@ -28,20 +28,19 @@ $(document).ready(function() {
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
 
-<p>
-<label>
-{{ form.username.label_tag }}
-{{ form.username }}
-</label>
-<label>
-{{ form.password.label_tag }}
-{{ form.password }}
-</label>
+<table>
+<tr>
+	<td><label>{{ form.username.label_tag }}</label></td>
+	<td>{{ form.username }}</td>
+</tr>
+<tr>
+	<td><label>{{ form.password.label_tag }}</label></td>
+	<td>{{ form.password }}</td>
+</tr>
+</table>
 
 <a href="#" class="component_icon button icon_login" style="float: right;" onclick="$('#_loginForm').submit();">{% trans "Sign in" %}</a>
-
 <input type="hidden" name="next" value="{{ next }}" />
-
 <span><a href="{% url "telemeta-password-reset" %}">{% trans "Password forgotten" %} ?</a></span>
 </p>
 
diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index 237c5c6a..793dd65b 100644
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -85,12 +85,12 @@
 
     <ul class="nav nav-tabs" role="tablist">
       <li class="active"><a href="#general" role="tab" data-toggle="tab">{% trans "General" %}</a></li>
-      <li><a href="#related" role="tab" data-toggle="tab">{% trans "Related media" %}</a></li>
       <li><a href="#keyword_relations" role="tab" data-toggle="tab">{% trans "Keywords" %}</a></li>
       <li><a href="#performances" role="tab" data-toggle="tab">{% trans "Performance" %}</a></li>
-      <!-- <li><a href="#format" role="tab" data-toggle="tab">{% trans "Format" %}</a></li> -->
-      <li><a href="#identifiers" role="tab" data-toggle="tab">{% trans "Identifier" %}</a></li>
       <li><a href="#tabs_container" role="tab" data-toggle="tab">{% trans "Markers" %}</a></li>
+      <li><a href="#related" role="tab" data-toggle="tab">{% trans "Related media" %}</a></li>
+      <li><a href="#identifiers" role="tab" data-toggle="tab">{% trans "Identifier" %}</a></li>
+ <!-- <li><a href="#format" role="tab" data-toggle="tab">{% trans "Format" %}</a></li> -->
     </ul>
 
     <div class="tab-content">
-- 
2.39.5