add some contexts to locales, fix login style, change edit tab order

diff --git a/de/LC_MESSAGES/django.mo b/de/LC_MESSAGES/django.mo
index 905cb9dfbee1b23489a1a30378dc7bf1f7362914..e609078c37d52241c457e9fffa55076a2f1277cf 100644 (file)
Binary files a/de/LC_MESSAGES/django.mo and b/de/LC_MESSAGES/django.mo differ

diff --git a/de/LC_MESSAGES/django.po b/de/LC_MESSAGES/django.po
index 3e2cdb7fd8a126fd4b853bf71fd611a099e98061..e868cda81fad7a0abecb294b4a69d88faf6a2ea7 100644 (file)
--- a/de/LC_MESSAGES/django.po
+++ b/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/es/LC_MESSAGES/django.mo b/es/LC_MESSAGES/django.mo
index bb661b5ffc7389422093120555d784020708ddc3..0cacfcec3c98e76232ba058ad4b52bc715cf2d0c 100644 (file)
Binary files a/es/LC_MESSAGES/django.mo and b/es/LC_MESSAGES/django.mo differ

diff --git a/es/LC_MESSAGES/django.po b/es/LC_MESSAGES/django.po
index 766c590f25188e4d1e7fcc9162035fc0f8eeb9b4..9bafa34765e53a4114f91b62cea07cae64c20108 100644 (file)
--- a/es/LC_MESSAGES/django.po
+++ b/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/fr/LC_MESSAGES/django.mo b/fr/LC_MESSAGES/django.mo
index dc8891b06a073ddc61ba6f80ee4c4cdf0e828f0e..132af2fa5b3d5f9bf0102a8aedcd06f67fa18d41 100644 (file)
Binary files a/fr/LC_MESSAGES/django.mo and b/fr/LC_MESSAGES/django.mo differ

diff --git a/fr/LC_MESSAGES/django.po b/fr/LC_MESSAGES/django.po
index 6b76479ffcaa05802729b8d7cc292c92cfd9400b..16758b20650abdb45c96b4e4663a04b67569244e 100644 (file)
--- a/fr/LC_MESSAGES/django.po
+++ b/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/zh_CN/LC_MESSAGES/django.mo b/zh_CN/LC_MESSAGES/django.mo
index 394ae1f1973aa96e5202bb0970709897529b3cec..2992fb989ac04f22254af8a98beb62c0f7344ddf 100644 (file)
Binary files a/zh_CN/LC_MESSAGES/django.mo and b/zh_CN/LC_MESSAGES/django.mo differ

diff --git a/zh_CN/LC_MESSAGES/django.po b/zh_CN/LC_MESSAGES/django.po
index a0fad6fcd75148678386dce4dff870b32605ada7..65637de970f96a5ba8b3b3491029a59791ba2af8 100644 (file)
--- a/zh_CN/LC_MESSAGES/django.po
+++ b/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 "添加到播放列表"