locales

diff --git a/de/LC_MESSAGES/django.mo b/de/LC_MESSAGES/django.mo
index 2e8f7a253cc04a5fded3fa9d078ac5aca989bc67..905cb9dfbee1b23489a1a30378dc7bf1f7362914 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 410c97260e7aa4d1ffa46df0d1d2a399b67ef3b2..3e2cdb7fd8a126fd4b853bf71fd611a099e98061 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 15:49+0100\n"
+"POT-Creation-Date: 2014-11-20 18:01+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"
@@ -83,7 +83,7 @@ msgstr "HerausgeberIn"
 msgid "population / social group"
 msgstr "Bevölkerung / soziale Gruppe"
 
-#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
+#: models/enum.py:166 models/instrument.py:43 models/instrument.py:54
 #: models/language.py:54 models/location.py:52 models/location.py:160
 #: models/media.py:573
 msgid "name"
@@ -216,19 +216,19 @@ msgstr "Aufklebezettel vorhanden"
 msgid "format"
 msgstr "Format"
 
-#: models/instrument.py:57
+#: models/instrument.py:58
 msgid "instrument aliases"
 msgstr "Parallelbezeichnungen des Instrumentes"
 
-#: models/instrument.py:65 models/instrument.py:82
+#: models/instrument.py:67 models/instrument.py:84
 msgid "instrument"
 msgstr "Instrument"
 
-#: models/instrument.py:67
+#: models/instrument.py:69
 msgid "parent instrument"
 msgstr "Vorgängerinstrument"
 
-#: models/instrument.py:80 models/location.py:173
+#: models/instrument.py:82 models/location.py:173
 msgid "alias"
 msgstr "Parallelbezeichnung"
 
@@ -595,7 +595,7 @@ msgstr "HinterlegerIn"
 
 #: models/media.py:387
 #, fuzzy
-msgid "CollectionCode-ItemCode"
+msgid "CollectionCode_ItemCode"
 msgstr "Sammlung"
 
 #: models/media.py:389
@@ -970,7 +970,7 @@ msgstr "g:i A,M j,n/j/y"
 #: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:388
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:105
+#: templates/telemeta/resource_detail.html:116
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "löschen"
@@ -1128,9 +1128,9 @@ 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:20
-#: templates/telemeta/mediaitem_edit.html:75
-#: templates/telemeta/resource_edit.html:20
+#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/mediaitem_edit.html:87
+#: templates/telemeta/resource_edit.html:38
 msgid "General"
 msgstr "allgemein"
 
@@ -1254,15 +1254,14 @@ msgstr "juristische Hinweise"
 
 #: templates/telemeta/collection_add.html:6
 #: templates/telemeta/mediaitem_add.html:8
-#: templates/telemeta/mediaitem_copy.html:8
 #: templates/telemeta/resource_add.html:7
 msgid "New"
 msgstr "neu"
 
-#: templates/telemeta/collection_add.html:10
-#: templates/telemeta/collection_add.html:14
-#: templates/telemeta/collection_edit.html:11
-#: templates/telemeta/collection_edit.html:50
+#: templates/telemeta/collection_add.html:12
+#: templates/telemeta/collection_add.html:20
+#: templates/telemeta/collection_edit.html:16
+#: templates/telemeta/collection_edit.html:68
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:41
 #: templates/telemeta/enumeration_edit_value.html:37
@@ -1271,12 +1270,10 @@ msgstr "neu"
 #: templates/telemeta/instrument_alias_edit_value.html:60
 #: templates/telemeta/instrument_edit_value.html:38
 #: templates/telemeta/instrument_edit_value.html:60
-#: templates/telemeta/mediaitem_add.html:12
-#: templates/telemeta/mediaitem_add.html:16
-#: templates/telemeta/mediaitem_copy.html:13
-#: templates/telemeta/mediaitem_copy.html:18
-#: templates/telemeta/mediaitem_edit.html:12
-#: templates/telemeta/mediaitem_edit.html:134
+#: templates/telemeta/mediaitem_add.html:14
+#: templates/telemeta/mediaitem_add.html:22
+#: templates/telemeta/mediaitem_edit.html:16
+#: templates/telemeta/mediaitem_edit.html:148
 #: templates/telemeta/mediaitem_keywords_edit.html:12
 #: templates/telemeta/mediaitem_keywords_edit.html:40
 #: templates/telemeta/mediaitem_performances_edit.html:12
@@ -1285,10 +1282,10 @@ msgstr "neu"
 #: templates/telemeta/mediaitem_related_edit.html:40
 #: templates/telemeta/profile_edit.html:6
 #: templates/telemeta/profile_edit.html:29
-#: templates/telemeta/resource_add.html:11
-#: templates/telemeta/resource_add.html:15
-#: templates/telemeta/resource_edit.html:11
-#: templates/telemeta/resource_edit.html:52
+#: templates/telemeta/resource_add.html:13
+#: templates/telemeta/resource_add.html:21
+#: templates/telemeta/resource_edit.html:16
+#: templates/telemeta/resource_edit.html:72
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:40
 msgid "Cancel"
@@ -1303,19 +1300,20 @@ msgstr "Sammlung"
 #: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:107
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:43
+#: templates/telemeta/resource_detail.html:45
 msgid "Edit"
 msgstr "bearbeiten"
 
 #: templates/telemeta/collection_detail.html:50
 #: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:46
+#: templates/telemeta/resource_detail.html:50
 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
 msgid "List"
 msgstr "Liste"
 
@@ -1387,7 +1385,7 @@ msgstr "Kommentare"
 
 #: templates/telemeta/collection_detail.html:187
 #: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:86
 msgid "Last modification"
 msgstr "Letzte Änderung"
 
@@ -1418,28 +1416,15 @@ msgstr "Normalansicht"
 msgid "No such collection"
 msgstr "keine solche Sammlung"
 
-#: templates/telemeta/collection_edit.html:21
-#: 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:76
-#: templates/telemeta/resource_edit.html:21
-msgid "Related media"
-msgstr "damit zusammenhängende Medien"
-
-#: templates/telemeta/collection_edit.html:22
-#: templates/telemeta/mediaitem_edit.html:80
-#, fuzzy
-msgid "Identifier"
-msgstr "Identifikator"
-
-#: templates/telemeta/collection_edit.html:53
+#: templates/telemeta/collection_edit.html:23
+#: templates/telemeta/collection_edit.html:75
 #: templates/telemeta/collection_related_edit.html:14
 #: templates/telemeta/collection_related_edit.html:43
 #: templates/telemeta/enumeration_edit_value.html:35
 #: templates/telemeta/instrument_alias_edit_value.html:36
 #: templates/telemeta/instrument_edit_value.html:36
-#: templates/telemeta/mediaitem_edit.html:138
+#: templates/telemeta/mediaitem_edit.html:23
+#: templates/telemeta/mediaitem_edit.html:155
 #: templates/telemeta/mediaitem_keywords_edit.html:13
 #: templates/telemeta/mediaitem_keywords_edit.html:41
 #: templates/telemeta/mediaitem_performances_edit.html:13
@@ -1447,12 +1432,29 @@ msgstr "Identifikator"
 #: templates/telemeta/mediaitem_related_edit.html:13
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_edit.html:55
+#: templates/telemeta/resource_edit.html:24
+#: templates/telemeta/resource_edit.html:77
+#: templates/telemeta/resource_edit.html:81
 #: templates/telemeta/resource_related_edit.html:13
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
 msgstr "speichern"
 
+#: templates/telemeta/collection_edit.html:37
+#: 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"
+
+#: templates/telemeta/collection_edit.html:38
+#: templates/telemeta/mediaitem_edit.html:92
+#, fuzzy
+msgid "Identifier"
+msgstr "Identifikator"
+
 #: templates/telemeta/collection_list.html:25
 #: templates/telemeta/mediaitem_list.html:24
 msgid "Filters"
@@ -1523,7 +1525,7 @@ msgstr "Eintrag hinzufügen"
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
 #: templates/telemeta/mediaitem_detail.html:192
-#: templates/telemeta/mediaitem_edit.html:123
+#: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Wert"
 
@@ -1757,40 +1759,39 @@ msgid "Password forgotten"
 msgstr "Passwort vergessen."
 
 #: templates/telemeta/mediaitem_add.html:5
-#: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
 #: views/item.py:895
 msgid "Item"
 msgstr "Element"
 
 #: templates/telemeta/mediaitem_detail.html:181
-#: templates/telemeta/mediaitem_edit.html:113
+#: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:81
-#: templates/telemeta/mediaitem_edit.html:115
+#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marken"
 
 #: templates/telemeta/mediaitem_detail.html:191
-#: templates/telemeta/mediaitem_edit.html:122
+#: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Eigenschaft"
 
 #: templates/telemeta/mediaitem_detail.html:193
-#: templates/telemeta/mediaitem_edit.html:124
+#: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Einheit"
 
 #: templates/telemeta/mediaitem_detail.html:214
-#: templates/telemeta/mediaitem_edit.html:60
+#: 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_edit.html:60
+#: templates/telemeta/mediaitem_edit.html:74
 #, fuzzy
 msgid "Please contact the administrators to get more rights."
 msgstr ""
@@ -1798,7 +1799,7 @@ msgstr ""
 "Website, um einen privaten Zugang zu erhalten."
 
 #: templates/telemeta/mediaitem_detail.html:214
-#: templates/telemeta/mediaitem_edit.html:60
+#: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
@@ -1829,26 +1830,26 @@ msgstr "Sammlungen"
 msgid "No such item"
 msgstr "kein solches Element"
 
-#: templates/telemeta/mediaitem_edit.html:77
+#: templates/telemeta/mediaitem_edit.html:89
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: templates/telemeta/mediaitem_edit.html:78
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "Aufführung"
 
-#: templates/telemeta/mediaitem_edit.html:79
+#: templates/telemeta/mediaitem_edit.html:91
 #, fuzzy
 msgid "Format"
 msgstr "Format"
 
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:105
 #, fuzzy
 msgid "Collection access status"
 msgstr "Status"
 
-#: templates/telemeta/mediaitem_edit.html:94
+#: templates/telemeta/mediaitem_edit.html:106
 #, fuzzy
 msgid "Context access status"
 msgstr "Status"
@@ -2102,11 +2103,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:49
-msgid "Add to playlist"
-msgstr "zu Wiedergabeliste hinzufügen"
-
-#: templates/telemeta/resource_detail.html:110
+#: templates/telemeta/resource_detail.html:121
 #: templates/telemeta/resource_detail_dc.html:22
 msgid "No such resource"
 msgstr "keine solche Ressource"
@@ -2215,6 +2212,9 @@ msgstr ""
 msgid "Access not allowed."
 msgstr "Zugang verboten"
 
+#~ msgid "Add to playlist"
+#~ msgstr "zu Wiedergabeliste hinzufügen"
+
 #, fuzzy
 #~ msgid "Item access status"
 #~ msgstr "Status"

diff --git a/es/LC_MESSAGES/django.mo b/es/LC_MESSAGES/django.mo
index ec282b092c227765e9cb3911757158c31650b972..bb661b5ffc7389422093120555d784020708ddc3 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 16ecc9b71864cb7a4b068e85a6d54a1e27b98b86..766c590f25188e4d1e7fcc9162035fc0f8eeb9b4 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 15:49+0100\n"
+"POT-Creation-Date: 2014-11-20 18:01+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "population / social group"
 msgstr ""
 
-#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
+#: models/enum.py:166 models/instrument.py:43 models/instrument.py:54
 #: models/language.py:54 models/location.py:52 models/location.py:160
 #: models/media.py:573
 msgid "name"
@@ -208,19 +208,19 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: models/instrument.py:57
+#: models/instrument.py:58
 msgid "instrument aliases"
 msgstr ""
 
-#: models/instrument.py:65 models/instrument.py:82
+#: models/instrument.py:67 models/instrument.py:84
 msgid "instrument"
 msgstr ""
 
-#: models/instrument.py:67
+#: models/instrument.py:69
 msgid "parent instrument"
 msgstr ""
 
-#: models/instrument.py:80 models/location.py:173
+#: models/instrument.py:82 models/location.py:173
 msgid "alias"
 msgstr ""
 
@@ -576,7 +576,7 @@ msgid "depositor"
 msgstr ""
 
 #: models/media.py:387
-msgid "CollectionCode-ItemCode"
+msgid "CollectionCode_ItemCode"
 msgstr ""
 
 #: models/media.py:389
@@ -938,7 +938,7 @@ msgstr ""
 #: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:388
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:105
+#: templates/telemeta/resource_detail.html:116
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr ""
@@ -1090,9 +1090,9 @@ msgid "Administration"
 msgstr ""
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20
-#: templates/telemeta/mediaitem_edit.html:75
-#: templates/telemeta/resource_edit.html:20
+#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/mediaitem_edit.html:87
+#: templates/telemeta/resource_edit.html:38
 msgid "General"
 msgstr ""
 
@@ -1213,15 +1213,14 @@ msgstr ""
 
 #: templates/telemeta/collection_add.html:6
 #: templates/telemeta/mediaitem_add.html:8
-#: templates/telemeta/mediaitem_copy.html:8
 #: templates/telemeta/resource_add.html:7
 msgid "New"
 msgstr ""
 
-#: templates/telemeta/collection_add.html:10
-#: templates/telemeta/collection_add.html:14
-#: templates/telemeta/collection_edit.html:11
-#: templates/telemeta/collection_edit.html:50
+#: templates/telemeta/collection_add.html:12
+#: templates/telemeta/collection_add.html:20
+#: templates/telemeta/collection_edit.html:16
+#: templates/telemeta/collection_edit.html:68
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:41
 #: templates/telemeta/enumeration_edit_value.html:37
@@ -1230,12 +1229,10 @@ msgstr ""
 #: templates/telemeta/instrument_alias_edit_value.html:60
 #: templates/telemeta/instrument_edit_value.html:38
 #: templates/telemeta/instrument_edit_value.html:60
-#: templates/telemeta/mediaitem_add.html:12
-#: templates/telemeta/mediaitem_add.html:16
-#: templates/telemeta/mediaitem_copy.html:13
-#: templates/telemeta/mediaitem_copy.html:18
-#: templates/telemeta/mediaitem_edit.html:12
-#: templates/telemeta/mediaitem_edit.html:134
+#: templates/telemeta/mediaitem_add.html:14
+#: templates/telemeta/mediaitem_add.html:22
+#: templates/telemeta/mediaitem_edit.html:16
+#: templates/telemeta/mediaitem_edit.html:148
 #: templates/telemeta/mediaitem_keywords_edit.html:12
 #: templates/telemeta/mediaitem_keywords_edit.html:40
 #: templates/telemeta/mediaitem_performances_edit.html:12
@@ -1244,10 +1241,10 @@ msgstr ""
 #: templates/telemeta/mediaitem_related_edit.html:40
 #: templates/telemeta/profile_edit.html:6
 #: templates/telemeta/profile_edit.html:29
-#: templates/telemeta/resource_add.html:11
-#: templates/telemeta/resource_add.html:15
-#: templates/telemeta/resource_edit.html:11
-#: templates/telemeta/resource_edit.html:52
+#: templates/telemeta/resource_add.html:13
+#: templates/telemeta/resource_add.html:21
+#: templates/telemeta/resource_edit.html:16
+#: templates/telemeta/resource_edit.html:72
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:40
 msgid "Cancel"
@@ -1262,19 +1259,20 @@ msgstr ""
 #: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:107
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:43
+#: templates/telemeta/resource_detail.html:45
 msgid "Edit"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:50
 #: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:46
+#: templates/telemeta/resource_detail.html:50
 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
 msgid "List"
 msgstr ""
 
@@ -1341,7 +1339,7 @@ msgstr ""
 
 #: templates/telemeta/collection_detail.html:187
 #: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:86
 msgid "Last modification"
 msgstr ""
 
@@ -1370,27 +1368,15 @@ msgstr ""
 msgid "No such collection"
 msgstr ""
 
-#: templates/telemeta/collection_edit.html:21
-#: 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:76
-#: templates/telemeta/resource_edit.html:21
-msgid "Related media"
-msgstr ""
-
-#: templates/telemeta/collection_edit.html:22
-#: templates/telemeta/mediaitem_edit.html:80
-msgid "Identifier"
-msgstr ""
-
-#: templates/telemeta/collection_edit.html:53
+#: templates/telemeta/collection_edit.html:23
+#: templates/telemeta/collection_edit.html:75
 #: templates/telemeta/collection_related_edit.html:14
 #: templates/telemeta/collection_related_edit.html:43
 #: templates/telemeta/enumeration_edit_value.html:35
 #: templates/telemeta/instrument_alias_edit_value.html:36
 #: templates/telemeta/instrument_edit_value.html:36
-#: templates/telemeta/mediaitem_edit.html:138
+#: templates/telemeta/mediaitem_edit.html:23
+#: templates/telemeta/mediaitem_edit.html:155
 #: templates/telemeta/mediaitem_keywords_edit.html:13
 #: templates/telemeta/mediaitem_keywords_edit.html:41
 #: templates/telemeta/mediaitem_performances_edit.html:13
@@ -1398,12 +1384,28 @@ msgstr ""
 #: templates/telemeta/mediaitem_related_edit.html:13
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_edit.html:55
+#: templates/telemeta/resource_edit.html:24
+#: templates/telemeta/resource_edit.html:77
+#: templates/telemeta/resource_edit.html:81
 #: templates/telemeta/resource_related_edit.html:13
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
 msgstr ""
 
+#: templates/telemeta/collection_edit.html:37
+#: 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 ""
+
+#: templates/telemeta/collection_edit.html:38
+#: templates/telemeta/mediaitem_edit.html:92
+msgid "Identifier"
+msgstr ""
+
 #: templates/telemeta/collection_list.html:25
 #: templates/telemeta/mediaitem_list.html:24
 msgid "Filters"
@@ -1474,7 +1476,7 @@ msgstr ""
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
 #: templates/telemeta/mediaitem_detail.html:192
-#: templates/telemeta/mediaitem_edit.html:123
+#: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr ""
 
@@ -1703,45 +1705,44 @@ msgid "Password forgotten"
 msgstr ""
 
 #: templates/telemeta/mediaitem_add.html:5
-#: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
 #: views/item.py:895
 msgid "Item"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:181
-#: templates/telemeta/mediaitem_edit.html:113
+#: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:81
-#: templates/telemeta/mediaitem_edit.html:115
+#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:191
-#: templates/telemeta/mediaitem_edit.html:122
+#: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:193
-#: templates/telemeta/mediaitem_edit.html:124
+#: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:214
-#: templates/telemeta/mediaitem_edit.html:60
+#: 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_edit.html:60
+#: 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_edit.html:60
+#: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr ""
 
@@ -1769,24 +1770,24 @@ msgstr ""
 msgid "No such item"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:77
+#: templates/telemeta/mediaitem_edit.html:89
 msgid "Keywords"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:78
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:79
+#: templates/telemeta/mediaitem_edit.html:91
 msgid "Format"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:105
 msgid "Collection access status"
 msgstr ""
 
-#: templates/telemeta/mediaitem_edit.html:94
+#: templates/telemeta/mediaitem_edit.html:106
 msgid "Context access status"
 msgstr ""
 
@@ -2023,11 +2024,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:49
-msgid "Add to playlist"
-msgstr ""
-
-#: templates/telemeta/resource_detail.html:110
+#: templates/telemeta/resource_detail.html:121
 #: templates/telemeta/resource_detail_dc.html:22
 msgid "No such resource"
 msgstr ""

diff --git a/fr/LC_MESSAGES/django.mo b/fr/LC_MESSAGES/django.mo
index 98824298d94fe8a64a3a091ea5ac3714a1e80a2e..dc8891b06a073ddc61ba6f80ee4c4cdf0e828f0e 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 4dd2f1a7eb8241f601f67b375ef2abbe84c99f8a..6b76479ffcaa05802729b8d7cc292c92cfd9400b 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 15:49+0100\n"
+"POT-Creation-Date: 2014-11-20 18:01+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"
@@ -82,7 +82,7 @@ msgstr "éditeur"
 msgid "population / social group"
 msgstr "population / groupe social"
 
-#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
+#: models/enum.py:166 models/instrument.py:43 models/instrument.py:54
 #: models/language.py:54 models/location.py:52 models/location.py:160
 #: models/media.py:573
 msgid "name"
@@ -207,19 +207,19 @@ msgstr "présence de collants"
 msgid "format"
 msgstr "format"
 
-#: models/instrument.py:57
+#: models/instrument.py:58
 msgid "instrument aliases"
 msgstr "instrument aliases"
 
-#: models/instrument.py:65 models/instrument.py:82
+#: models/instrument.py:67 models/instrument.py:84
 msgid "instrument"
 msgstr "instrument"
 
-#: models/instrument.py:67
+#: models/instrument.py:69
 msgid "parent instrument"
 msgstr "instrument parent"
 
-#: models/instrument.py:80 models/location.py:173
+#: models/instrument.py:82 models/location.py:173
 msgid "alias"
 msgstr "alias"
 
@@ -575,7 +575,9 @@ msgid "depositor"
 msgstr "déposant"
 
 #: models/media.py:387
-msgid "CollectionCode-ItemCode"
+#, fuzzy
+#| msgid "CollectionCode-ItemCode"
+msgid "CollectionCode_ItemCode"
 msgstr "CodeCollection-CodeItem"
 
 #: models/media.py:389
@@ -938,7 +940,7 @@ msgstr ""
 #: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:388
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:105
+#: templates/telemeta/resource_detail.html:116
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "Supprimer"
@@ -1090,9 +1092,9 @@ 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:20
-#: templates/telemeta/mediaitem_edit.html:75
-#: templates/telemeta/resource_edit.html:20
+#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/mediaitem_edit.html:87
+#: templates/telemeta/resource_edit.html:38
 msgid "General"
 msgstr "Générale"
 
@@ -1215,15 +1217,14 @@ msgstr "Mentions légales"
 
 #: templates/telemeta/collection_add.html:6
 #: templates/telemeta/mediaitem_add.html:8
-#: templates/telemeta/mediaitem_copy.html:8
 #: templates/telemeta/resource_add.html:7
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/telemeta/collection_add.html:10
-#: templates/telemeta/collection_add.html:14
-#: templates/telemeta/collection_edit.html:11
-#: templates/telemeta/collection_edit.html:50
+#: templates/telemeta/collection_add.html:12
+#: templates/telemeta/collection_add.html:20
+#: templates/telemeta/collection_edit.html:16
+#: templates/telemeta/collection_edit.html:68
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:41
 #: templates/telemeta/enumeration_edit_value.html:37
@@ -1232,12 +1233,10 @@ msgstr "Nouveau"
 #: templates/telemeta/instrument_alias_edit_value.html:60
 #: templates/telemeta/instrument_edit_value.html:38
 #: templates/telemeta/instrument_edit_value.html:60
-#: templates/telemeta/mediaitem_add.html:12
-#: templates/telemeta/mediaitem_add.html:16
-#: templates/telemeta/mediaitem_copy.html:13
-#: templates/telemeta/mediaitem_copy.html:18
-#: templates/telemeta/mediaitem_edit.html:12
-#: templates/telemeta/mediaitem_edit.html:134
+#: templates/telemeta/mediaitem_add.html:14
+#: templates/telemeta/mediaitem_add.html:22
+#: templates/telemeta/mediaitem_edit.html:16
+#: templates/telemeta/mediaitem_edit.html:148
 #: templates/telemeta/mediaitem_keywords_edit.html:12
 #: templates/telemeta/mediaitem_keywords_edit.html:40
 #: templates/telemeta/mediaitem_performances_edit.html:12
@@ -1246,10 +1245,10 @@ msgstr "Nouveau"
 #: templates/telemeta/mediaitem_related_edit.html:40
 #: templates/telemeta/profile_edit.html:6
 #: templates/telemeta/profile_edit.html:29
-#: templates/telemeta/resource_add.html:11
-#: templates/telemeta/resource_add.html:15
-#: templates/telemeta/resource_edit.html:11
-#: templates/telemeta/resource_edit.html:52
+#: templates/telemeta/resource_add.html:13
+#: templates/telemeta/resource_add.html:21
+#: templates/telemeta/resource_edit.html:16
+#: templates/telemeta/resource_edit.html:72
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:40
 msgid "Cancel"
@@ -1264,19 +1263,20 @@ msgstr "Collection"
 #: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:107
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:43
+#: templates/telemeta/resource_detail.html:45
 msgid "Edit"
 msgstr "Editer"
 
 #: templates/telemeta/collection_detail.html:50
 #: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:46
+#: templates/telemeta/resource_detail.html:50
 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
 msgid "List"
 msgstr "Lister"
 
@@ -1343,7 +1343,7 @@ msgstr "Commentaires"
 
 #: templates/telemeta/collection_detail.html:187
 #: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:86
 msgid "Last modification"
 msgstr "Dernière modification de la fiche"
 
@@ -1372,27 +1372,15 @@ msgstr "Vue normale"
 msgid "No such collection"
 msgstr "Aucune collection de ce type"
 
-#: templates/telemeta/collection_edit.html:21
-#: 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:76
-#: templates/telemeta/resource_edit.html:21
-msgid "Related media"
-msgstr "Média associés"
-
-#: templates/telemeta/collection_edit.html:22
-#: templates/telemeta/mediaitem_edit.html:80
-msgid "Identifier"
-msgstr "Identifiant"
-
-#: templates/telemeta/collection_edit.html:53
+#: templates/telemeta/collection_edit.html:23
+#: templates/telemeta/collection_edit.html:75
 #: templates/telemeta/collection_related_edit.html:14
 #: templates/telemeta/collection_related_edit.html:43
 #: templates/telemeta/enumeration_edit_value.html:35
 #: templates/telemeta/instrument_alias_edit_value.html:36
 #: templates/telemeta/instrument_edit_value.html:36
-#: templates/telemeta/mediaitem_edit.html:138
+#: templates/telemeta/mediaitem_edit.html:23
+#: templates/telemeta/mediaitem_edit.html:155
 #: templates/telemeta/mediaitem_keywords_edit.html:13
 #: templates/telemeta/mediaitem_keywords_edit.html:41
 #: templates/telemeta/mediaitem_performances_edit.html:13
@@ -1400,12 +1388,28 @@ msgstr "Identifiant"
 #: templates/telemeta/mediaitem_related_edit.html:13
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_edit.html:55
+#: templates/telemeta/resource_edit.html:24
+#: templates/telemeta/resource_edit.html:77
+#: templates/telemeta/resource_edit.html:81
 #: templates/telemeta/resource_related_edit.html:13
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
 msgstr "Enregistrer"
 
+#: templates/telemeta/collection_edit.html:37
+#: 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"
+
+#: templates/telemeta/collection_edit.html:38
+#: templates/telemeta/mediaitem_edit.html:92
+msgid "Identifier"
+msgstr "Identifiant"
+
 #: templates/telemeta/collection_list.html:25
 #: templates/telemeta/mediaitem_list.html:24
 msgid "Filters"
@@ -1476,7 +1480,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
 #: templates/telemeta/mediaitem_detail.html:192
-#: templates/telemeta/mediaitem_edit.html:123
+#: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "Valeur"
 
@@ -1708,45 +1712,44 @@ msgid "Password forgotten"
 msgstr "Mot de passe oublié"
 
 #: templates/telemeta/mediaitem_add.html:5
-#: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
 #: views/item.py:895
 msgid "Item"
 msgstr "Item"
 
 #: templates/telemeta/mediaitem_detail.html:181
-#: templates/telemeta/mediaitem_edit.html:113
+#: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr "Fichier"
 
 #: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:81
-#: templates/telemeta/mediaitem_edit.html:115
+#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "Marqueurs"
 
 #: templates/telemeta/mediaitem_detail.html:191
-#: templates/telemeta/mediaitem_edit.html:122
+#: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "Propriété"
 
 #: templates/telemeta/mediaitem_detail.html:193
-#: templates/telemeta/mediaitem_edit.html:124
+#: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "Unité"
 
 #: templates/telemeta/mediaitem_detail.html:214
-#: templates/telemeta/mediaitem_edit.html:60
+#: 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_edit.html:60
+#: 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_edit.html:60
+#: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "Cliquez ici"
 
@@ -1774,24 +1777,24 @@ msgstr "Taille de l'item"
 msgid "No such item"
 msgstr "Item introuvable"
 
-#: templates/telemeta/mediaitem_edit.html:77
+#: templates/telemeta/mediaitem_edit.html:89
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: templates/telemeta/mediaitem_edit.html:78
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "Voix / Instruments"
 
-#: templates/telemeta/mediaitem_edit.html:79
+#: templates/telemeta/mediaitem_edit.html:91
 msgid "Format"
 msgstr "Format"
 
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:105
 msgid "Collection access status"
 msgstr "Statut d'accès de la collection"
 
-#: templates/telemeta/mediaitem_edit.html:94
+#: templates/telemeta/mediaitem_edit.html:106
 msgid "Context access status"
 msgstr "Statut d'accès selon le profil"
 
@@ -2030,11 +2033,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:49
-msgid "Add to playlist"
-msgstr "Ajouter à la liste"
-
-#: templates/telemeta/resource_detail.html:110
+#: templates/telemeta/resource_detail.html:121
 #: templates/telemeta/resource_detail_dc.html:22
 msgid "No such resource"
 msgstr "Aucune ressource de ce type"
@@ -2143,6 +2142,9 @@ msgstr ""
 msgid "Access not allowed."
 msgstr "Accès non autorisé"
 
+#~ msgid "Add to playlist"
+#~ msgstr "Ajouter à la liste"
+
 #~ msgid "Item access status"
 #~ msgstr "Statut d'accès de l'item"
 

diff --git a/zh_CN/LC_MESSAGES/django.mo b/zh_CN/LC_MESSAGES/django.mo
index 33b5d38b56a56b775710e0a2ba333e2ee63a728f..394ae1f1973aa96e5202bb0970709897529b3cec 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 f8d4d86a47ff6223a7a10e38edc67c25d9b2659e..a0fad6fcd75148678386dce4dff870b32605ada7 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 15:49+0100\n"
+"POT-Creation-Date: 2014-11-20 18:01+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"
@@ -83,7 +83,7 @@ msgstr "出版者"
 msgid "population / social group"
 msgstr "居民/社会团体"
 
-#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
+#: models/enum.py:166 models/instrument.py:43 models/instrument.py:54
 #: models/language.py:54 models/location.py:52 models/location.py:160
 #: models/media.py:573
 msgid "name"
@@ -216,19 +216,19 @@ msgstr "标签有无"
 msgid "format"
 msgstr "格式"
 
-#: models/instrument.py:57
+#: models/instrument.py:58
 msgid "instrument aliases"
 msgstr "仪器（乐器）别名"
 
-#: models/instrument.py:65 models/instrument.py:82
+#: models/instrument.py:67 models/instrument.py:84
 msgid "instrument"
 msgstr "仪器（乐器）"
 
-#: models/instrument.py:67
+#: models/instrument.py:69
 msgid "parent instrument"
 msgstr "母（原始）仪器"
 
-#: models/instrument.py:80 models/location.py:173
+#: models/instrument.py:82 models/location.py:173
 msgid "alias"
 msgstr "别名"
 
@@ -596,7 +596,7 @@ msgstr "寄存者"
 
 #: models/media.py:387
 #, fuzzy
-msgid "CollectionCode-ItemCode"
+msgid "CollectionCode_ItemCode"
 msgstr "选集"
 
 #: models/media.py:389
@@ -969,7 +969,7 @@ msgstr ""
 #: templates/telemeta/lists.html:63
 #: templates/telemeta/mediaitem_detail.html:388
 #: templates/telemeta/mediaitem_detail_dc.html:20
-#: templates/telemeta/resource_detail.html:105
+#: templates/telemeta/resource_detail.html:116
 #: templates/telemeta/resource_detail_dc.html:17
 msgid "Delete"
 msgstr "删除"
@@ -1123,9 +1123,9 @@ msgid "Administration"
 msgstr "管理"
 
 #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
-#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20
-#: templates/telemeta/mediaitem_edit.html:75
-#: templates/telemeta/resource_edit.html:20
+#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:36
+#: templates/telemeta/mediaitem_edit.html:87
+#: templates/telemeta/resource_edit.html:38
 msgid "General"
 msgstr "通用"
 
@@ -1246,15 +1246,14 @@ msgstr "合法通知"
 
 #: templates/telemeta/collection_add.html:6
 #: templates/telemeta/mediaitem_add.html:8
-#: templates/telemeta/mediaitem_copy.html:8
 #: templates/telemeta/resource_add.html:7
 msgid "New"
 msgstr "新的"
 
-#: templates/telemeta/collection_add.html:10
-#: templates/telemeta/collection_add.html:14
-#: templates/telemeta/collection_edit.html:11
-#: templates/telemeta/collection_edit.html:50
+#: templates/telemeta/collection_add.html:12
+#: templates/telemeta/collection_add.html:20
+#: templates/telemeta/collection_edit.html:16
+#: templates/telemeta/collection_edit.html:68
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:41
 #: templates/telemeta/enumeration_edit_value.html:37
@@ -1263,12 +1262,10 @@ msgstr "新的"
 #: templates/telemeta/instrument_alias_edit_value.html:60
 #: templates/telemeta/instrument_edit_value.html:38
 #: templates/telemeta/instrument_edit_value.html:60
-#: templates/telemeta/mediaitem_add.html:12
-#: templates/telemeta/mediaitem_add.html:16
-#: templates/telemeta/mediaitem_copy.html:13
-#: templates/telemeta/mediaitem_copy.html:18
-#: templates/telemeta/mediaitem_edit.html:12
-#: templates/telemeta/mediaitem_edit.html:134
+#: templates/telemeta/mediaitem_add.html:14
+#: templates/telemeta/mediaitem_add.html:22
+#: templates/telemeta/mediaitem_edit.html:16
+#: templates/telemeta/mediaitem_edit.html:148
 #: templates/telemeta/mediaitem_keywords_edit.html:12
 #: templates/telemeta/mediaitem_keywords_edit.html:40
 #: templates/telemeta/mediaitem_performances_edit.html:12
@@ -1277,10 +1274,10 @@ msgstr "新的"
 #: templates/telemeta/mediaitem_related_edit.html:40
 #: templates/telemeta/profile_edit.html:6
 #: templates/telemeta/profile_edit.html:29
-#: templates/telemeta/resource_add.html:11
-#: templates/telemeta/resource_add.html:15
-#: templates/telemeta/resource_edit.html:11
-#: templates/telemeta/resource_edit.html:52
+#: templates/telemeta/resource_add.html:13
+#: templates/telemeta/resource_add.html:21
+#: templates/telemeta/resource_edit.html:16
+#: templates/telemeta/resource_edit.html:72
 #: templates/telemeta/resource_related_edit.html:12
 #: templates/telemeta/resource_related_edit.html:40
 msgid "Cancel"
@@ -1295,19 +1292,20 @@ msgstr "选集"
 #: templates/telemeta/lists.html:60
 #: templates/telemeta/mediaitem_detail.html:107
 #: templates/telemeta/profile_detail.html:72
-#: templates/telemeta/resource_detail.html:43
+#: templates/telemeta/resource_detail.html:45
 msgid "Edit"
 msgstr "编辑"
 
 #: templates/telemeta/collection_detail.html:50
 #: templates/telemeta/mediaitem_detail.html:112
-#: templates/telemeta/resource_detail.html:46
+#: templates/telemeta/resource_detail.html:50
 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
 msgid "List"
 msgstr "列表"
 
@@ -1380,7 +1378,7 @@ msgstr "注解"
 
 #: templates/telemeta/collection_detail.html:187
 #: templates/telemeta/mediaitem_detail.html:320
-#: templates/telemeta/resource_detail.html:75
+#: templates/telemeta/resource_detail.html:86
 msgid "Last modification"
 msgstr "上次修改"
 
@@ -1411,28 +1409,15 @@ msgstr "正常视角"
 msgid "No such collection"
 msgstr "无这类选集"
 
-#: templates/telemeta/collection_edit.html:21
-#: 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:76
-#: templates/telemeta/resource_edit.html:21
-msgid "Related media"
-msgstr "相关媒体"
-
-#: templates/telemeta/collection_edit.html:22
-#: templates/telemeta/mediaitem_edit.html:80
-#, fuzzy
-msgid "Identifier"
-msgstr "标识码"
-
-#: templates/telemeta/collection_edit.html:53
+#: templates/telemeta/collection_edit.html:23
+#: templates/telemeta/collection_edit.html:75
 #: templates/telemeta/collection_related_edit.html:14
 #: templates/telemeta/collection_related_edit.html:43
 #: templates/telemeta/enumeration_edit_value.html:35
 #: templates/telemeta/instrument_alias_edit_value.html:36
 #: templates/telemeta/instrument_edit_value.html:36
-#: templates/telemeta/mediaitem_edit.html:138
+#: templates/telemeta/mediaitem_edit.html:23
+#: templates/telemeta/mediaitem_edit.html:155
 #: templates/telemeta/mediaitem_keywords_edit.html:13
 #: templates/telemeta/mediaitem_keywords_edit.html:41
 #: templates/telemeta/mediaitem_performances_edit.html:13
@@ -1440,12 +1425,29 @@ msgstr "标识码"
 #: templates/telemeta/mediaitem_related_edit.html:13
 #: templates/telemeta/mediaitem_related_edit.html:41
 #: templates/telemeta/profile_edit.html:31
-#: templates/telemeta/resource_edit.html:55
+#: templates/telemeta/resource_edit.html:24
+#: templates/telemeta/resource_edit.html:77
+#: templates/telemeta/resource_edit.html:81
 #: templates/telemeta/resource_related_edit.html:13
 #: templates/telemeta/resource_related_edit.html:41
 msgid "Save"
 msgstr "保存"
 
+#: templates/telemeta/collection_edit.html:37
+#: 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 "相关媒体"
+
+#: templates/telemeta/collection_edit.html:38
+#: templates/telemeta/mediaitem_edit.html:92
+#, fuzzy
+msgid "Identifier"
+msgstr "标识码"
+
 #: templates/telemeta/collection_list.html:25
 #: templates/telemeta/mediaitem_list.html:24
 msgid "Filters"
@@ -1516,7 +1518,7 @@ msgstr "添加记录"
 #: templates/telemeta/enumeration_edit.html:31
 #: templates/telemeta/enumeration_edit_value.html:30
 #: templates/telemeta/mediaitem_detail.html:192
-#: templates/telemeta/mediaitem_edit.html:123
+#: templates/telemeta/mediaitem_edit.html:135
 msgid "Value"
 msgstr "价值"
 
@@ -1745,45 +1747,44 @@ msgid "Password forgotten"
 msgstr "忘记密码"
 
 #: templates/telemeta/mediaitem_add.html:5
-#: templates/telemeta/mediaitem_copy.html:5
 #: templates/telemeta/mediaitem_detail.html:5 views/item.py:134
 #: views/item.py:895
 msgid "Item"
 msgstr "项"
 
 #: templates/telemeta/mediaitem_detail.html:181
-#: templates/telemeta/mediaitem_edit.html:113
+#: templates/telemeta/mediaitem_edit.html:125
 msgid "File"
 msgstr ""
 
 #: templates/telemeta/mediaitem_detail.html:183
-#: templates/telemeta/mediaitem_edit.html:81
-#: templates/telemeta/mediaitem_edit.html:115
+#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:127
 msgid "Markers"
 msgstr "书签"
 
 #: templates/telemeta/mediaitem_detail.html:191
-#: templates/telemeta/mediaitem_edit.html:122
+#: templates/telemeta/mediaitem_edit.html:134
 msgid "Property"
 msgstr "性能"
 
 #: templates/telemeta/mediaitem_detail.html:193
-#: templates/telemeta/mediaitem_edit.html:124
+#: templates/telemeta/mediaitem_edit.html:136
 msgid "Unit"
 msgstr "单元"
 
 #: templates/telemeta/mediaitem_detail.html:214
-#: templates/telemeta/mediaitem_edit.html:60
+#: 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_edit.html:60
+#: 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_edit.html:60
+#: templates/telemeta/mediaitem_edit.html:74
 msgid "Click here"
 msgstr "点击这里"
 
@@ -1813,25 +1814,25 @@ msgstr "选集"
 msgid "No such item"
 msgstr "无该项"
 
-#: templates/telemeta/mediaitem_edit.html:77
+#: templates/telemeta/mediaitem_edit.html:89
 msgid "Keywords"
 msgstr "关键词"
 
-#: templates/telemeta/mediaitem_edit.html:78
+#: templates/telemeta/mediaitem_edit.html:90
 #: templates/telemeta/mediaitem_performances_edit.html:25
 msgid "Performance"
 msgstr "性能"
 
-#: templates/telemeta/mediaitem_edit.html:79
+#: templates/telemeta/mediaitem_edit.html:91
 #, fuzzy
 msgid "Format"
 msgstr "格式"
 
-#: templates/telemeta/mediaitem_edit.html:93
+#: templates/telemeta/mediaitem_edit.html:105
 msgid "Collection access status"
 msgstr "选集访问状态"
 
-#: templates/telemeta/mediaitem_edit.html:94
+#: templates/telemeta/mediaitem_edit.html:106
 msgid "Context access status"
 msgstr "文本访问状态"
 
@@ -2074,11 +2075,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: templates/telemeta/resource_detail.html:49
-msgid "Add to playlist"
-msgstr "添加到播放列表"
-
-#: templates/telemeta/resource_detail.html:110
+#: templates/telemeta/resource_detail.html:121
 #: templates/telemeta/resource_detail_dc.html:22
 msgid "No such resource"
 msgstr "该资源不存在"
@@ -2185,6 +2182,9 @@ msgstr ""
 msgid "Access not allowed."
 msgstr "不允许访问"
 
+#~ msgid "Add to playlist"
+#~ msgstr "添加到播放列表"
+
 #~ msgid "Item access status"
 #~ msgstr "项访问状态"