From: yomguy <yomguy@parisson.com>
Date: Wed, 8 Jun 2011 14:39:03 +0000 (+0200)
Subject: add conservation_site to collection model (please alter media_collections table)
X-Git-Tag: 1.1~123
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=698a13402c4d5be293dda885eedfef32c888120a;p=telemeta.git

add conservation_site to collection model (please alter media_collections table)
---

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 96e67bff..4d957f1e 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1160,6 +1160,9 @@ a.image-link {
 #id_file {
     width: 500px;
 }
+#id_conservation_site {
+    width: 500px;
+}
 
 /*focus on elements*/
 a:focus,div:focus{
diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 54c2ec9e..8b9b055c 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ
diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index f16c3918..9489b8be 100644
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-01 18:55+0200\n"
+"POT-Creation-Date: 2011-06-08 16:37+0200\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"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr ""
 
-#: models/enum.py:41 models/enum.py:139
+#: models/enum.py:41 models/enum.py:139 models/media.py:374
 msgid "value"
 msgstr ""
 
-#: models/enum.py:57 models/media.py:145
+#: models/enum.py:57 models/media.py:146
 msgid "archive format"
 msgstr ""
 
@@ -62,15 +62,15 @@ msgstr ""
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:262
+#: models/enum.py:113 models/media.py:250
 msgid "vernacular style"
 msgstr ""
 
-#: models/enum.py:120 models/media.py:264
+#: models/enum.py:120 models/media.py:252
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:353
+#: models/enum.py:127 models/media.py:334
 msgid "keyword"
 msgstr ""
 
@@ -82,12 +82,12 @@ msgstr ""
 msgid "publisher"
 msgstr ""
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:255
+#: models/enum.py:153 models/enum.py:157 models/media.py:243
 msgid "population / social group"
 msgstr ""
 
-#: models/enum.py:157 models/instrument.py:43 models/instrument.py:53
-#: models/location.py:51 models/location.py:150
+#: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
+#: models/location.py:51 models/location.py:151 models/media.py:373
 msgid "name"
 msgstr ""
 
@@ -103,7 +103,7 @@ msgstr ""
 msgid "parent instrument"
 msgstr ""
 
-#: models/instrument.py:80 models/location.py:161
+#: models/instrument.py:80 models/location.py:163
 msgid "alias"
 msgstr ""
 
@@ -131,12 +131,12 @@ msgstr ""
 msgid "current location"
 msgstr ""
 
-#: models/location.py:58 models/location.py:162 models/location.py:177
+#: models/location.py:58 models/location.py:164 models/location.py:180
 msgid "authoritative"
 msgstr ""
 
-#: models/location.py:112 models/location.py:160 models/location.py:174
-#: models/media.py:251
+#: models/location.py:112 models/location.py:162 models/location.py:177
+#: models/media.py:239
 msgid "location"
 msgstr ""
 
@@ -144,15 +144,15 @@ msgstr ""
 msgid "locations"
 msgstr ""
 
-#: models/location.py:149
+#: models/location.py:150
 msgid "identifier"
 msgstr ""
 
-#: models/location.py:170
+#: models/location.py:172
 msgid "location aliases"
 msgstr ""
 
-#: models/location.py:175
+#: models/location.py:178
 msgid "ancestor location"
 msgstr ""
 
@@ -168,20 +168,20 @@ msgstr ""
 msgid "Private data"
 msgstr ""
 
-#: models/media.py:63 models/media.py:116 models/media.py:279
+#: models/media.py:63 models/media.py:116 models/media.py:267
 msgid "public access"
 msgstr ""
 
-#: models/media.py:93 models/media.py:276
+#: models/media.py:93 models/media.py:264
 msgid "reference"
 msgstr ""
 
-#: models/media.py:94 models/media.py:242 models/media.py:390
-#: models/media.py:405 models/media.py:439
+#: models/media.py:94 models/media.py:230 models/media.py:389
+#: models/media.py:404 models/media.py:438
 msgid "title"
 msgstr ""
 
-#: models/media.py:95 models/media.py:243
+#: models/media.py:95 models/media.py:231
 msgid "original title / translation"
 msgstr ""
 
@@ -201,7 +201,7 @@ msgstr ""
 msgid "year published"
 msgstr ""
 
-#: models/media.py:107 models/media.py:244
+#: models/media.py:107 models/media.py:232
 msgid "recordist"
 msgstr ""
 
@@ -257,181 +257,193 @@ msgstr ""
 msgid "published"
 msgstr ""
 
-#: models/media.py:140 models/media.py:273
+#: models/media.py:138
+msgid "conservation site"
+msgstr ""
+
+#: models/media.py:141 models/media.py:261
 msgid "code"
 msgstr ""
 
-#: models/media.py:141 models/media.py:274
+#: models/media.py:142 models/media.py:262
 msgid "old code"
 msgstr ""
 
-#: models/media.py:142 models/media.py:283
+#: models/media.py:143 models/media.py:271
 msgid "approximative duration"
 msgstr ""
 
-#: models/media.py:143
+#: models/media.py:144
 msgid "number of components (medium / piece)"
 msgstr ""
 
-#: models/media.py:147
+#: models/media.py:148
 msgid "digitization"
 msgstr ""
 
-#: models/media.py:148
+#: models/media.py:149
 msgid "status"
 msgstr ""
 
-#: models/media.py:149
+#: models/media.py:150
 msgid "a_informer_07_03"
 msgstr ""
 
-#: models/media.py:183
+#: models/media.py:184
 msgid "states / nations"
 msgstr ""
 
-#: models/media.py:197
+#: models/media.py:198
 msgid "populations / social groups"
 msgstr ""
 
-#: models/media.py:205 models/media.py:326
+#: models/media.py:206 models/media.py:314
 msgid "computed duration"
 msgstr ""
 
-#: models/media.py:246
+#: models/media.py:234
 msgid "collection"
 msgstr ""
 
-#: models/media.py:247
+#: models/media.py:235
 msgid "recording date (from)"
 msgstr ""
 
-#: models/media.py:248
+#: models/media.py:236
 msgid "recording date (until)"
 msgstr ""
 
-#: models/media.py:252
+#: models/media.py:240
 msgid "location details"
 msgstr ""
 
-#: models/media.py:253
+#: models/media.py:241
 msgid "cultural area"
 msgstr ""
 
-#: models/media.py:256
+#: models/media.py:244
 msgid "comments"
 msgstr ""
 
-#: models/media.py:257
+#: models/media.py:245
 msgid "moda_execut"
 msgstr ""
 
-#: models/media.py:258
+#: models/media.py:246
 msgid "language"
 msgstr ""
 
-#: models/media.py:265
+#: models/media.py:253
 msgid "author / compositor"
 msgstr ""
 
-#: models/media.py:268
+#: models/media.py:256
 msgid "remarks"
 msgstr ""
 
-#: models/media.py:269
+#: models/media.py:257
 msgid "recordist selection"
 msgstr ""
 
-#: models/media.py:270
+#: models/media.py:258
 msgid "recordist as in collection"
 msgstr ""
 
-#: models/media.py:275
+#: models/media.py:263
 msgid "item number"
 msgstr ""
 
-#: models/media.py:277
+#: models/media.py:265
 msgid "published references"
 msgstr ""
 
-#: models/media.py:278
+#: models/media.py:266
 msgid "copy of"
 msgstr ""
 
-#: models/media.py:280
+#: models/media.py:268
 msgid "file"
 msgstr ""
 
-#: models/media.py:290 models/media.py:472
-#: templates/telemeta_default/mediaitem_detail.html:178
+#: models/media.py:278 models/media.py:471
+#: templates/telemeta_default/mediaitem_detail.html:177
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:352 models/media.py:366 models/media.py:389
-#: models/media.py:436 models/media.py:457
+#: models/media.py:333 models/media.py:347 models/media.py:371
+#: models/media.py:388 models/media.py:435 models/media.py:456
 msgid "item"
 msgstr ""
 
-#: models/media.py:368
+#: models/media.py:349
 msgid "composition"
 msgstr ""
 
-#: models/media.py:370
+#: models/media.py:351
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:371
+#: models/media.py:352
 msgid "number"
 msgstr ""
 
-#: models/media.py:372
+#: models/media.py:353
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:391
+#: models/media.py:372
+msgid "id"
+msgstr ""
+
+#: models/media.py:375
+msgid "unit"
+msgstr ""
+
+#: models/media.py:390
 msgid "start"
 msgstr ""
 
-#: models/media.py:392
+#: models/media.py:391
 msgid "end"
 msgstr ""
 
-#: models/media.py:403 models/media.py:422 models/media.py:437
+#: models/media.py:402 models/media.py:421 models/media.py:436
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:406 models/media.py:441
+#: models/media.py:405 models/media.py:440
 msgid "description"
 msgstr ""
 
-#: models/media.py:423
+#: models/media.py:422
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:424
+#: models/media.py:423
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:425
+#: models/media.py:424
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:438 models/system.py:54
+#: models/media.py:437 models/system.py:54
 msgid "time"
 msgstr ""
 
-#: models/media.py:440 models/media.py:459 models/media.py:473
+#: models/media.py:439 models/media.py:458 models/media.py:472
 msgid "date"
 msgstr ""
 
-#: models/media.py:442
+#: models/media.py:441
 msgid "author"
 msgstr ""
 
-#: models/media.py:458
+#: models/media.py:457
 msgid "mime_type"
 msgstr ""
 
-#: models/media.py:460
+#: models/media.py:459
 msgid "transcoded"
 msgstr ""
 
@@ -704,15 +716,15 @@ msgid "Collection"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:64
-#: templates/telemeta_default/mediaitem_detail.html:78
-#: templates/telemeta_default/mediaitem_detail.html:178
-#: templates/telemeta_default/mediaitem_detail.html:217
+#: templates/telemeta_default/mediaitem_detail.html:77
+#: templates/telemeta_default/mediaitem_detail.html:177
+#: templates/telemeta_default/mediaitem_detail.html:216
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:65
-#: templates/telemeta_default/mediaitem_detail.html:79
+#: templates/telemeta_default/mediaitem_detail.html:78
 msgid "Copy"
 msgstr ""
 
@@ -721,7 +733,7 @@ msgid "Add item"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:69
-#: templates/telemeta_default/mediaitem_detail.html:82
+#: templates/telemeta_default/mediaitem_detail.html:81
 msgid "Add to playlist"
 msgstr ""
 
@@ -734,7 +746,7 @@ msgid "Recording year"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:122
-#: templates/telemeta_default/mediaitem_detail.html:162
+#: templates/telemeta_default/mediaitem_detail.html:161
 msgid "Geographic and cultural informations"
 msgstr ""
 
@@ -750,7 +762,7 @@ msgid "Bibliographic references"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:234
+#: templates/telemeta_default/mediaitem_detail.html:233
 msgid "Archiving data"
 msgstr ""
 
@@ -759,26 +771,26 @@ msgid "Related documentation"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:172
-#: templates/telemeta_default/mediaitem_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:169
 msgid "Comments"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:185
-#: templates/telemeta_default/mediaitem_detail.html:250
+#: templates/telemeta_default/collection_detail.html:186
+#: templates/telemeta_default/mediaitem_detail.html:249
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:190
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:191
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:190
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:191
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:195
+#: templates/telemeta_default/collection_detail.html:196
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -840,7 +852,7 @@ msgstr ""
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:122
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Value"
 msgstr ""
 
@@ -908,6 +920,7 @@ msgid "Playlists"
 msgstr ""
 
 #: templates/telemeta_default/home.html:35
+#: templates/telemeta_default/mediaitem_detail.html:263
 msgid "Delete"
 msgstr ""
 
@@ -983,62 +996,62 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:84
+#: templates/telemeta_default/mediaitem_detail.html:83
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:85
+#: templates/telemeta_default/mediaitem_detail.html:84
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:111
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:113
+#: templates/telemeta_default/mediaitem_detail.html:112
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:121
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:123
+#: templates/telemeta_default/mediaitem_detail.html:122
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:131
+#: templates/telemeta_default/mediaitem_detail.html:130
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:152
+#: templates/telemeta_default/mediaitem_detail.html:151
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:164
+#: templates/telemeta_default/mediaitem_detail.html:163
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:183
+#: templates/telemeta_default/mediaitem_detail.html:182
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:217
+#: templates/telemeta_default/mediaitem_detail.html:216
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:222
+#: templates/telemeta_default/mediaitem_detail.html:221
 msgid "General informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:224
+#: templates/telemeta_default/mediaitem_detail.html:223
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:240
+#: templates/telemeta_default/mediaitem_detail.html:239
 msgid "Published references"
 msgstr ""
 
@@ -1159,7 +1172,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1095
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1099
 msgid "Last changes"
 msgstr ""
 
@@ -1333,11 +1346,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1106
+#: web/base.py:1110
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1108
+#: web/base.py:1112
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 18dc209c..6cc5da7a 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 081c5f56..933dcb12 100644
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-01 18:55+0200\n"
+"POT-Creation-Date: 2011-06-08 16:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,11 +25,11 @@ msgstr "Durée"
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr "Entrez une durée valide au format HH:MM[:ss]"
 
-#: models/enum.py:41 models/enum.py:139
+#: models/enum.py:41 models/enum.py:139 models/media.py:374
 msgid "value"
 msgstr "valeur"
 
-#: models/enum.py:57 models/media.py:145
+#: models/enum.py:57 models/media.py:146
 msgid "archive format"
 msgstr "format du support"
 
@@ -61,15 +61,15 @@ msgstr "contexte d'enregistrement"
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:262
+#: models/enum.py:113 models/media.py:250
 msgid "vernacular style"
 msgstr "style vernaculaire"
 
-#: models/enum.py:120 models/media.py:264
+#: models/enum.py:120 models/media.py:252
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:353
+#: models/enum.py:127 models/media.py:334
 #, fuzzy
 msgid "keyword"
 msgstr "Mot-clé"
@@ -82,12 +82,12 @@ msgstr "éditeur / statut"
 msgid "publisher"
 msgstr "éditeur"
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:255
+#: models/enum.py:153 models/enum.py:157 models/media.py:243
 msgid "population / social group"
 msgstr "population / groupe social"
 
-#: models/enum.py:157 models/instrument.py:43 models/instrument.py:53
-#: models/location.py:51 models/location.py:150
+#: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
+#: models/location.py:51 models/location.py:151 models/media.py:373
 msgid "name"
 msgstr "nom"
 
@@ -103,7 +103,7 @@ msgstr "instrument"
 msgid "parent instrument"
 msgstr "instrument parent"
 
-#: models/instrument.py:80 models/location.py:161
+#: models/instrument.py:80 models/location.py:163
 msgid "alias"
 msgstr "alias"
 
@@ -131,12 +131,12 @@ msgstr "type complet"
 msgid "current location"
 msgstr "lieu actuel"
 
-#: models/location.py:58 models/location.py:162 models/location.py:177
+#: models/location.py:58 models/location.py:164 models/location.py:180
 msgid "authoritative"
 msgstr "officiel"
 
-#: models/location.py:112 models/location.py:160 models/location.py:174
-#: models/media.py:251
+#: models/location.py:112 models/location.py:162 models/location.py:177
+#: models/media.py:239
 msgid "location"
 msgstr "lieu"
 
@@ -144,15 +144,15 @@ msgstr "lieu"
 msgid "locations"
 msgstr "lieux"
 
-#: models/location.py:149
+#: models/location.py:150
 msgid "identifier"
 msgstr "identifiant"
 
-#: models/location.py:170
+#: models/location.py:172
 msgid "location aliases"
 msgstr "location aliases"
 
-#: models/location.py:175
+#: models/location.py:178
 msgid "ancestor location"
 msgstr "lieu ancêtre"
 
@@ -168,20 +168,20 @@ msgstr "Son et métadonnées"
 msgid "Private data"
 msgstr "Données privées"
 
-#: models/media.py:63 models/media.py:116 models/media.py:279
+#: models/media.py:63 models/media.py:116 models/media.py:267
 msgid "public access"
 msgstr "accès public"
 
-#: models/media.py:93 models/media.py:276
+#: models/media.py:93 models/media.py:264
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:94 models/media.py:242 models/media.py:390
-#: models/media.py:405 models/media.py:439
+#: models/media.py:94 models/media.py:230 models/media.py:389
+#: models/media.py:404 models/media.py:438
 msgid "title"
 msgstr "titre"
 
-#: models/media.py:95 models/media.py:243
+#: models/media.py:95 models/media.py:231
 msgid "original title / translation"
 msgstr "titre original / traduction"
 
@@ -201,7 +201,7 @@ msgstr "année d'enregistrement (jusqu'à)"
 msgid "year published"
 msgstr "année de parution"
 
-#: models/media.py:107 models/media.py:244
+#: models/media.py:107 models/media.py:232
 msgid "recordist"
 msgstr "collecteur"
 
@@ -257,186 +257,198 @@ msgstr "collecteur identique au déposant"
 msgid "published"
 msgstr "édité"
 
-#: models/media.py:140 models/media.py:273
+#: models/media.py:138
+msgid "conservation site"
+msgstr "lieu de conservation"
+
+#: models/media.py:141 models/media.py:261
 msgid "code"
 msgstr "cote"
 
-#: models/media.py:141 models/media.py:274
+#: models/media.py:142 models/media.py:262
 msgid "old code"
 msgstr "ancienne cote"
 
-#: models/media.py:142 models/media.py:283
+#: models/media.py:143 models/media.py:271
 msgid "approximative duration"
 msgstr "durée approximative"
 
-#: models/media.py:143
+#: models/media.py:144
 msgid "number of components (medium / piece)"
 msgstr "nb de composants (support / pièce)"
 
-#: models/media.py:147
+#: models/media.py:148
 msgid "digitization"
 msgstr "numérisation"
 
-#: models/media.py:148
+#: models/media.py:149
 msgid "status"
 msgstr "etat"
 
-#: models/media.py:149
+#: models/media.py:150
 msgid "a_informer_07_03"
 msgstr "a_informer_07_03"
 
-#: models/media.py:183
+#: models/media.py:184
 msgid "states / nations"
 msgstr "états / nations"
 
-#: models/media.py:197
+#: models/media.py:198
 msgid "populations / social groups"
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:205 models/media.py:326
+#: models/media.py:206 models/media.py:314
 msgid "computed duration"
 msgstr "durée calculée"
 
-#: models/media.py:246
+#: models/media.py:234
 msgid "collection"
 msgstr "collection"
 
-#: models/media.py:247
+#: models/media.py:235
 msgid "recording date (from)"
 msgstr "date d'enregistrement (depuis)"
 
-#: models/media.py:248
+#: models/media.py:236
 msgid "recording date (until)"
 msgstr "date d'enregistrement (jusqu'à)"
 
-#: models/media.py:252
+#: models/media.py:240
 msgid "location details"
 msgstr "précisions lieu"
 
-#: models/media.py:253
+#: models/media.py:241
 msgid "cultural area"
 msgstr "aire culturelle"
 
-#: models/media.py:256
+#: models/media.py:244
 msgid "comments"
 msgstr "commentaires"
 
-#: models/media.py:257
+#: models/media.py:245
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:258
+#: models/media.py:246
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:265
+#: models/media.py:253
 msgid "author / compositor"
 msgstr "auteur / compositeur"
 
-#: models/media.py:268
+#: models/media.py:256
 msgid "remarks"
 msgstr "remarques"
 
-#: models/media.py:269
+#: models/media.py:257
 msgid "recordist selection"
 msgstr "sélection collecteur"
 
-#: models/media.py:270
+#: models/media.py:258
 msgid "recordist as in collection"
 msgstr "collecteur identique à la collection"
 
-#: models/media.py:275
+#: models/media.py:263
 msgid "item number"
 msgstr "n° de l'item"
 
-#: models/media.py:277
+#: models/media.py:265
 msgid "published references"
 msgstr "références éditées"
 
-#: models/media.py:278
+#: models/media.py:266
 msgid "copy of"
 msgstr "copie de"
 
-#: models/media.py:280
+#: models/media.py:268
 msgid "file"
 msgstr "fichier"
 
-#: models/media.py:290 models/media.py:472
-#: templates/telemeta_default/mediaitem_detail.html:178
+#: models/media.py:278 models/media.py:471
+#: templates/telemeta_default/mediaitem_detail.html:177
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:352 models/media.py:366 models/media.py:389
-#: models/media.py:436 models/media.py:457
+#: models/media.py:333 models/media.py:347 models/media.py:371
+#: models/media.py:388 models/media.py:435 models/media.py:456
 msgid "item"
 msgstr "item"
 
-#: models/media.py:368
+#: models/media.py:349
 msgid "composition"
 msgstr "Voix / Instruments"
 
-#: models/media.py:370
+#: models/media.py:351
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:371
+#: models/media.py:352
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:372
+#: models/media.py:353
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:391
+#: models/media.py:372
+msgid "id"
+msgstr ""
+
+#: models/media.py:375
+msgid "unit"
+msgstr "unité"
+
+#: models/media.py:390
 msgid "start"
 msgstr "début"
 
-#: models/media.py:392
+#: models/media.py:391
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:403 models/media.py:422 models/media.py:437
+#: models/media.py:402 models/media.py:421 models/media.py:436
 #, fuzzy
 msgid "public_id"
 msgstr "édité"
 
-#: models/media.py:406 models/media.py:441
+#: models/media.py:405 models/media.py:440
 msgid "description"
 msgstr ""
 
-#: models/media.py:423
+#: models/media.py:422
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:424
+#: models/media.py:423
 #, fuzzy
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:425
+#: models/media.py:424
 #, fuzzy
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:438 models/system.py:54
+#: models/media.py:437 models/system.py:54
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:440 models/media.py:459 models/media.py:473
+#: models/media.py:439 models/media.py:458 models/media.py:472
 msgid "date"
 msgstr ""
 
-#: models/media.py:442
+#: models/media.py:441
 #, fuzzy
 msgid "author"
 msgstr "rédacteur fiche"
 
-#: models/media.py:458
+#: models/media.py:457
 #, fuzzy
 msgid "mime_type"
 msgstr "type"
 
-#: models/media.py:460
+#: models/media.py:459
 msgid "transcoded"
 msgstr ""
 
@@ -713,15 +725,15 @@ msgid "Collection"
 msgstr "Collection"
 
 #: templates/telemeta_default/collection_detail.html:64
-#: templates/telemeta_default/mediaitem_detail.html:78
-#: templates/telemeta_default/mediaitem_detail.html:178
-#: templates/telemeta_default/mediaitem_detail.html:217
+#: templates/telemeta_default/mediaitem_detail.html:77
+#: templates/telemeta_default/mediaitem_detail.html:177
+#: templates/telemeta_default/mediaitem_detail.html:216
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr "Editer"
 
 #: templates/telemeta_default/collection_detail.html:65
-#: templates/telemeta_default/mediaitem_detail.html:79
+#: templates/telemeta_default/mediaitem_detail.html:78
 msgid "Copy"
 msgstr "Copier"
 
@@ -730,7 +742,7 @@ msgid "Add item"
 msgstr "Ajouter item"
 
 #: templates/telemeta_default/collection_detail.html:69
-#: templates/telemeta_default/mediaitem_detail.html:82
+#: templates/telemeta_default/mediaitem_detail.html:81
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
@@ -743,7 +755,7 @@ msgid "Recording year"
 msgstr "Année d'enregistrement"
 
 #: templates/telemeta_default/collection_detail.html:122
-#: templates/telemeta_default/mediaitem_detail.html:162
+#: templates/telemeta_default/mediaitem_detail.html:161
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
@@ -759,7 +771,7 @@ msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
 #: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:234
+#: templates/telemeta_default/mediaitem_detail.html:233
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
@@ -768,26 +780,26 @@ msgid "Related documentation"
 msgstr "Documentation associée"
 
 #: templates/telemeta_default/collection_detail.html:172
-#: templates/telemeta_default/mediaitem_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:169
 msgid "Comments"
 msgstr "Commentaires"
 
-#: templates/telemeta_default/collection_detail.html:185
-#: templates/telemeta_default/mediaitem_detail.html:250
+#: templates/telemeta_default/collection_detail.html:186
+#: templates/telemeta_default/mediaitem_detail.html:249
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:190
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:191
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:190
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:191
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:195
+#: templates/telemeta_default/collection_detail.html:196
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -849,7 +861,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:122
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Value"
 msgstr "Valeur"
 
@@ -917,6 +929,7 @@ msgid "Playlists"
 msgstr "Listes de lecture"
 
 #: templates/telemeta_default/home.html:35
+#: templates/telemeta_default/mediaitem_detail.html:263
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -993,62 +1006,62 @@ msgstr "Mot de passe oublié"
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta_default/mediaitem_detail.html:84
+#: templates/telemeta_default/mediaitem_detail.html:83
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/telemeta_default/mediaitem_detail.html:85
+#: templates/telemeta_default/mediaitem_detail.html:84
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/telemeta_default/mediaitem_detail.html:111
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta_default/mediaitem_detail.html:113
+#: templates/telemeta_default/mediaitem_detail.html:112
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta_default/mediaitem_detail.html:121
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta_default/mediaitem_detail.html:123
+#: templates/telemeta_default/mediaitem_detail.html:122
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta_default/mediaitem_detail.html:131
+#: templates/telemeta_default/mediaitem_detail.html:130
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta_default/mediaitem_detail.html:152
+#: templates/telemeta_default/mediaitem_detail.html:151
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:164
+#: templates/telemeta_default/mediaitem_detail.html:163
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:183
+#: templates/telemeta_default/mediaitem_detail.html:182
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:217
+#: templates/telemeta_default/mediaitem_detail.html:216
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta_default/mediaitem_detail.html:222
+#: templates/telemeta_default/mediaitem_detail.html:221
 msgid "General informations"
 msgstr "Informations générales"
 
-#: templates/telemeta_default/mediaitem_detail.html:224
+#: templates/telemeta_default/mediaitem_detail.html:223
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta_default/mediaitem_detail.html:240
+#: templates/telemeta_default/mediaitem_detail.html:239
 msgid "Published references"
 msgstr "Références éditées"
 
@@ -1169,7 +1182,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1095
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1099
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1349,11 +1362,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1106
+#: web/base.py:1110
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1108
+#: web/base.py:1112
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."
@@ -1361,6 +1374,9 @@ msgstr ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
+#~ msgid "Conservation site"
+#~ msgstr "Lieu de conservation"
+
 #~ msgid "Locations"
 #~ msgstr "Lieux"
 
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 97d03d29..c06a1ccf 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -135,6 +135,7 @@ class MediaCollection(MediaResource):
     items_done            = CharField(_('items finished'))
     collector_is_creator  = BooleanField(_('recordist identical to depositor'))
     is_published          = BooleanField(_('published'))
+    conservation_site     = CharField(_('conservation site'))
     
     # Technical data
     code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code])
diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index d45424aa..7861c749 100644
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -174,6 +174,7 @@
                         {% dl_field collection "metadata_writer" %}
                         {% dl_field collection "travail" %}
                         {% dl_field collection "items_done" %}
+                        {% dl_field collection "conservation_site" %}
                     </dl>
                 </div>
             </div>