From: yomguy <yomguy@parisson.com>
Date: Fri, 25 May 2012 14:36:58 +0000 (+0200)
Subject: reorganize many models, add various item fields, add enums, add migr and trans
X-Git-Tag: 1.4.3-2^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=305d2e3cda9b6ace7a7f38bd35388b4472de537f;p=telemeta.git

reorganize many models, add various item fields, add enums, add migr and trans
---

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 4515cfcd..6f9eb7f9 100644
--- a/telemeta/admin.py
+++ b/telemeta/admin.py
@@ -99,7 +99,7 @@ admin.site.register(InstrumentRelation, InstrumentRelationAdmin)
 admin.site.register(InstrumentAliasRelation, InstrumentAliasRelationAdmin)
 
 admin.site.register(Location, LocationAdmin)
-#admin.site.register(LocationType)
+admin.site.register(LocationType)
 admin.site.register(LocationAlias, LocationAliasAdmin)
 admin.site.register(LocationRelation, LocationRelationAdmin)
 
diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index f12e50db..4c35688d 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 2f59f350..23e69c5f 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: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+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,7 +26,7 @@ msgstr ""
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr ""
 
-#: models/enum.py:41 models/enum.py:139 models/media.py:475
+#: models/enum.py:41 models/enum.py:139 models/media.py:489
 #: models/system.py:103
 msgid "value"
 msgstr ""
@@ -63,15 +63,15 @@ msgstr ""
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:335
+#: models/enum.py:113 models/media.py:339
 msgid "vernacular style"
 msgstr ""
 
-#: models/enum.py:120 models/media.py:337
+#: models/enum.py:120 models/media.py:341
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:446
+#: models/enum.py:127 models/media.py:460
 msgid "keyword"
 msgstr ""
 
@@ -83,17 +83,17 @@ msgstr ""
 msgid "publisher"
 msgstr ""
 
-#: models/enum.py:153 models/enum.py:157 models/media.py:325
+#: models/enum.py:153 models/enum.py:157 models/media.py:329
 msgid "population / social group"
 msgstr ""
 
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
 #: models/language.py:54 models/location.py:51 models/location.py:158
-#: models/media.py:474
+#: models/media.py:488
 msgid "name"
 msgstr ""
 
-#: models/enum.py:172 models/format.py:74
+#: models/enum.py:172 models/format.py:75
 msgid "tape wheel diameter (cm)"
 msgstr ""
 
@@ -105,25 +105,29 @@ msgstr ""
 msgid "tape width (inch)"
 msgstr ""
 
-#: models/enum.py:193 models/format.py:77
+#: models/enum.py:193 models/format.py:78
 msgid "tape speed (m/s)"
 msgstr ""
 
-#: models/enum.py:200 models/format.py:79
+#: models/enum.py:200 models/format.py:80
 msgid "tape vendor"
 msgstr ""
 
-#: models/enum.py:207 models/format.py:68
+#: models/enum.py:207 models/format.py:69
 msgid "number of channels"
 msgstr ""
 
-#: models/enum.py:214 models/format.py:66
-msgid "original location"
+#: models/enum.py:214 models/media.py:346
+msgid "organization"
+msgstr ""
+
+#: models/enum.py:221 models/media.py:350
+msgid "rights"
 msgstr ""
 
-#: models/format.py:56 models/media.py:376 models/media.py:435
-#: models/media.py:445 models/media.py:456 models/media.py:472
-#: models/media.py:493 models/media.py:539 models/media.py:560
+#: models/format.py:56 models/media.py:390 models/media.py:449
+#: models/media.py:459 models/media.py:470 models/media.py:486
+#: models/media.py:507 models/media.py:553 models/media.py:574
 msgid "item"
 msgstr ""
 
@@ -131,7 +135,7 @@ msgstr ""
 msgid "physical format"
 msgstr ""
 
-#: models/format.py:60
+#: models/format.py:60 models/media.py:354
 msgid "original code"
 msgstr ""
 
@@ -151,27 +155,31 @@ msgstr ""
 msgid "comments / notes"
 msgstr ""
 
-#: models/format.py:69
-msgid "audio quality"
+#: models/format.py:66
+msgid "original location"
 msgstr ""
 
 #: models/format.py:70
+msgid "audio quality"
+msgstr ""
+
+#: models/format.py:71
 msgid "recording system"
 msgstr ""
 
-#: models/format.py:75
+#: models/format.py:76
 msgid "tape thickness (um)"
 msgstr ""
 
-#: models/format.py:80
+#: models/format.py:81
 msgid "tape reference"
 msgstr ""
 
-#: models/format.py:81
+#: models/format.py:82
 msgid "sticker presence"
 msgstr ""
 
-#: models/format.py:85
+#: models/format.py:86
 msgid "format"
 msgstr ""
 
@@ -187,7 +195,7 @@ msgstr ""
 msgid "parent instrument"
 msgstr ""
 
-#: models/instrument.py:80 models/location.py:170
+#: models/instrument.py:80 models/location.py:171
 msgid "alias"
 msgstr ""
 
@@ -219,6 +227,10 @@ msgstr ""
 msgid "comment"
 msgstr ""
 
+#: models/language.py:63
+msgid "languages"
+msgstr ""
+
 #: models/location.py:49
 msgid "country"
 msgstr ""
@@ -239,12 +251,12 @@ msgstr ""
 msgid "current location"
 msgstr ""
 
-#: models/location.py:58 models/location.py:171 models/location.py:187
+#: models/location.py:58 models/location.py:172 models/location.py:188
 msgid "authoritative"
 msgstr ""
 
-#: models/location.py:112 models/location.py:169 models/location.py:184
-#: models/media.py:321
+#: models/location.py:112 models/location.py:170 models/location.py:185
+#: models/media.py:325
 msgid "location"
 msgstr ""
 
@@ -252,14 +264,22 @@ msgstr ""
 msgid "locations"
 msgstr ""
 
-#: models/location.py:179
+#: models/location.py:166
+msgid "lieux types"
+msgstr ""
+
+#: models/location.py:180
 msgid "location aliases"
 msgstr ""
 
-#: models/location.py:185
+#: models/location.py:186
 msgid "ancestor location"
 msgstr ""
 
+#: models/location.py:194
+msgid "location relations"
+msgstr ""
+
 #: models/media.py:72
 msgid "Metadata only"
 msgstr ""
@@ -273,35 +293,35 @@ msgid "Private data"
 msgstr ""
 
 #: models/media.py:77 models/media.py:97 models/media.py:193
-#: models/media.py:352
+#: models/media.py:347
 msgid "public access"
 msgstr ""
 
 #: models/media.py:93 models/media.py:123 models/media.py:171
-#: models/media.py:312 models/media.py:494 models/media.py:510
-#: models/media.py:542
+#: models/media.py:312 models/media.py:508 models/media.py:524
+#: models/media.py:556
 msgid "title"
 msgstr ""
 
-#: models/media.py:94 models/media.py:125 models/media.py:511
-#: models/media.py:544
+#: models/media.py:94 models/media.py:125 models/media.py:525
+#: models/media.py:558
 msgid "description"
 msgstr ""
 
-#: models/media.py:95 models/media.py:218 models/media.py:346
+#: models/media.py:95 models/media.py:218 models/media.py:353
 msgid "code"
 msgstr ""
 
-#: models/media.py:96 models/media.py:170 models/media.py:349
+#: models/media.py:96 models/media.py:170
 msgid "reference"
 msgstr ""
 
-#: models/media.py:124 models/media.py:543 models/media.py:562
+#: models/media.py:124 models/media.py:557 models/media.py:576
 #: models/system.py:115
 msgid "date"
 msgstr ""
 
-#: models/media.py:126 models/media.py:561
+#: models/media.py:126 models/media.py:575
 msgid "mime_type"
 msgstr ""
 
@@ -313,7 +333,7 @@ msgstr ""
 msgid "credits"
 msgstr ""
 
-#: models/media.py:129 models/media.py:354
+#: models/media.py:129 models/media.py:368
 msgid "file"
 msgstr ""
 
@@ -325,11 +345,11 @@ msgstr ""
 msgid "depositor / contributor"
 msgstr ""
 
-#: models/media.py:176 models/media.py:644
+#: models/media.py:176 models/media.py:658
 msgid "recording year (from)"
 msgstr ""
 
-#: models/media.py:177 models/media.py:645
+#: models/media.py:177 models/media.py:659
 msgid "recording year (until)"
 msgstr ""
 
@@ -337,7 +357,7 @@ msgstr ""
 msgid "year published"
 msgstr ""
 
-#: models/media.py:184 models/media.py:314
+#: models/media.py:184 models/media.py:356
 msgid "recordist"
 msgstr ""
 
@@ -393,11 +413,11 @@ msgstr ""
 msgid "conservation site"
 msgstr ""
 
-#: models/media.py:219 models/media.py:347
+#: models/media.py:219
 msgid "old code"
 msgstr ""
 
-#: models/media.py:220 models/media.py:357
+#: models/media.py:220 models/media.py:371
 msgid "approximative duration"
 msgstr ""
 
@@ -425,11 +445,11 @@ msgstr ""
 msgid "populations / social groups"
 msgstr ""
 
-#: models/media.py:284 models/media.py:402
+#: models/media.py:284 models/media.py:416
 msgid "computed duration"
 msgstr ""
 
-#: models/media.py:292 models/media.py:298 models/media.py:316
+#: models/media.py:292 models/media.py:298 models/media.py:315
 msgid "collection"
 msgstr ""
 
@@ -437,160 +457,200 @@ msgstr ""
 msgid "collection related media"
 msgstr ""
 
-#: models/media.py:317
+#: models/media.py:316
 msgid "recording date (from)"
 msgstr ""
 
-#: models/media.py:318
+#: models/media.py:317
 msgid "recording date (until)"
 msgstr ""
 
+#: models/media.py:319
+msgid "scientist"
+msgstr ""
+
+#: models/media.py:320
+msgid "domain"
+msgstr ""
+
+#: models/media.py:321
+msgid "summary"
+msgstr ""
+
 #: models/media.py:322
+msgid "remarks"
+msgstr ""
+
+#: models/media.py:326
 msgid "location details"
 msgstr ""
 
-#: models/media.py:323
+#: models/media.py:327
 msgid "cultural area"
 msgstr ""
 
-#: models/media.py:326
+#: models/media.py:330
 msgid "language"
 msgstr ""
 
-#: models/media.py:328
+#: models/media.py:332
 msgid "ISO language"
 msgstr ""
 
-#: models/media.py:330
+#: models/media.py:334
 msgid "comments / ethnographic context"
 msgstr ""
 
-#: models/media.py:331
+#: models/media.py:335
 msgid "moda_execut"
 msgstr ""
 
-#: models/media.py:338
+#: models/media.py:342
 msgid "author / compositor"
 msgstr ""
 
-#: models/media.py:341
-msgid "remarks"
+#: models/media.py:343
+msgid "contributor"
 msgstr ""
 
-#: models/media.py:342
-msgid "recordist selection"
+#: models/media.py:349
+msgid "depositor"
 msgstr ""
 
-#: models/media.py:343
-msgid "recordist as in collection"
+#: models/media.py:355
+msgid "item number"
 msgstr ""
 
-#: models/media.py:348
-msgid "item number"
+#: models/media.py:357
+msgid "digitalist"
+msgstr ""
+
+#: models/media.py:358
+msgid "collector"
 msgstr ""
 
-#: models/media.py:350
+#: models/media.py:359
+msgid "collector selection"
+msgstr ""
+
+#: models/media.py:360
+msgid "collector as in collection"
+msgstr ""
+
+#: models/media.py:361
+msgid "digitization date"
+msgstr ""
+
+#: models/media.py:362
+msgid "publishing date"
+msgstr ""
+
+#: models/media.py:363
+msgid "creator reference"
+msgstr ""
+
+#: models/media.py:364
 msgid "published references"
 msgstr ""
 
-#: models/media.py:351
+#: models/media.py:365
 msgid "copy of"
 msgstr ""
 
-#: models/media.py:364 templates/telemeta/mediaitem_edit.html:41
+#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:429
+#: models/media.py:443
 msgid "instruments"
 msgstr ""
 
-#: models/media.py:439 models/media.py:440
+#: models/media.py:453 models/media.py:454
 msgid "item related media"
 msgstr ""
 
-#: models/media.py:458
+#: models/media.py:472
 msgid "composition"
 msgstr ""
 
-#: models/media.py:460
+#: models/media.py:474
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:461
+#: models/media.py:475
 msgid "number"
 msgstr ""
 
-#: models/media.py:462
+#: models/media.py:476
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:473
+#: models/media.py:487
 msgid "id"
 msgstr ""
 
-#: models/media.py:476
+#: models/media.py:490
 msgid "unit"
 msgstr ""
 
-#: models/media.py:495
+#: models/media.py:509
 msgid "start"
 msgstr ""
 
-#: models/media.py:496
+#: models/media.py:510
 msgid "end"
 msgstr ""
 
-#: models/media.py:500
+#: models/media.py:514
 msgid "item part"
 msgstr ""
 
-#: models/media.py:508 models/media.py:525 models/media.py:540
+#: models/media.py:522 models/media.py:539 models/media.py:554
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:526
+#: models/media.py:540
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:527
+#: models/media.py:541
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:528
+#: models/media.py:542
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:541 models/system.py:55
+#: models/media.py:555 models/system.py:55
 msgid "time"
 msgstr ""
 
-#: models/media.py:545
+#: models/media.py:559
 msgid "author"
 msgstr ""
 
-#: models/media.py:563
+#: models/media.py:577
 msgid "transcoded"
 msgstr ""
 
-#: models/media.py:643
+#: models/media.py:657
 msgid "collections"
 msgstr ""
 
-#: models/media.py:655 models/media.py:656 models/media.py:666
-#: models/media.py:683
+#: models/media.py:669 models/media.py:670 models/media.py:680
+#: models/media.py:697
 msgid "corpus"
 msgstr ""
 
-#: models/media.py:676 models/media.py:677 models/media.py:694
+#: models/media.py:690 models/media.py:691 models/media.py:708
 msgid "fonds"
 msgstr ""
 
-#: models/media.py:687 models/media.py:688
+#: models/media.py:701 models/media.py:702
 msgid "corpus related media"
 msgstr ""
 
-#: models/media.py:698 models/media.py:699
+#: models/media.py:712 models/media.py:713
 msgid "fonds related media"
 msgstr ""
 
diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo
index f12e50db..4c35688d 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ
diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po
index 50fb4a24..5526d637 100644
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+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"
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index d648abe9..dc5bb65b 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 8a7e718e..8e8f1228 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: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+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,7 +25,7 @@ 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/media.py:475
+#: models/enum.py:41 models/enum.py:139 models/media.py:489
 #: models/system.py:103
 msgid "value"
 msgstr "valeur"
@@ -60,17 +60,17 @@ msgstr "contexte d'enregistrement"
 
 #: models/enum.py:106
 msgid "A/D conversion"
-msgstr ""
+msgstr "Conversion A/N"
 
-#: models/enum.py:113 models/media.py:335
+#: models/enum.py:113 models/media.py:339
 msgid "vernacular style"
 msgstr "style vernaculaire"
 
-#: models/enum.py:120 models/media.py:337
+#: models/enum.py:120 models/media.py:341
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:446
+#: models/enum.py:127 models/media.py:460
 msgid "keyword"
 msgstr "Mot-clé"
 
@@ -82,17 +82,17 @@ msgstr "éditeur / statut"
 msgid "publisher"
 msgstr "éditeur"
 
-#: models/enum.py:153 models/enum.py:157 models/media.py:325
+#: models/enum.py:153 models/enum.py:157 models/media.py:329
 msgid "population / social group"
 msgstr "population / groupe social"
 
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
 #: models/language.py:54 models/location.py:51 models/location.py:158
-#: models/media.py:474
+#: models/media.py:488
 msgid "name"
 msgstr "nom"
 
-#: models/enum.py:172 models/format.py:74
+#: models/enum.py:172 models/format.py:75
 msgid "tape wheel diameter (cm)"
 msgstr "diamètre de moyeu de bande (cm)"
 
@@ -104,25 +104,29 @@ msgstr "longueur de bande (cm)"
 msgid "tape width (inch)"
 msgstr "largeur de bande (pouce)"
 
-#: models/enum.py:193 models/format.py:77
+#: models/enum.py:193 models/format.py:78
 msgid "tape speed (m/s)"
 msgstr "vitesse de bande (m/s)"
 
-#: models/enum.py:200 models/format.py:79
+#: models/enum.py:200 models/format.py:80
 msgid "tape vendor"
 msgstr "marque de bande"
 
-#: models/enum.py:207 models/format.py:68
+#: models/enum.py:207 models/format.py:69
 msgid "number of channels"
 msgstr "Nombre de pistes"
 
-#: models/enum.py:214 models/format.py:66
-msgid "original location"
-msgstr "lieu d'archivage"
+#: models/enum.py:214 models/media.py:346
+msgid "organization"
+msgstr "organisation"
 
-#: models/format.py:56 models/media.py:376 models/media.py:435
-#: models/media.py:445 models/media.py:456 models/media.py:472
-#: models/media.py:493 models/media.py:539 models/media.py:560
+#: models/enum.py:221 models/media.py:350
+msgid "rights"
+msgstr "droits"
+
+#: models/format.py:56 models/media.py:390 models/media.py:449
+#: models/media.py:459 models/media.py:470 models/media.py:486
+#: models/media.py:507 models/media.py:553 models/media.py:574
 msgid "item"
 msgstr "item"
 
@@ -130,7 +134,7 @@ msgstr "item"
 msgid "physical format"
 msgstr "nature du support original"
 
-#: models/format.py:60
+#: models/format.py:60 models/media.py:354
 msgid "original code"
 msgstr "cote originale"
 
@@ -150,27 +154,31 @@ msgstr "Qualité technique / état de conservation"
 msgid "comments / notes"
 msgstr "commentaires / notes"
 
-#: models/format.py:69
+#: models/format.py:66
+msgid "original location"
+msgstr "lieu d'archivage"
+
+#: models/format.py:70
 msgid "audio quality"
 msgstr "qualité audio"
 
-#: models/format.py:70
+#: models/format.py:71
 msgid "recording system"
 msgstr "système d'enregistrement"
 
-#: models/format.py:75
+#: models/format.py:76
 msgid "tape thickness (um)"
 msgstr "épaisseur de bande (um)"
 
-#: models/format.py:80
+#: models/format.py:81
 msgid "tape reference"
 msgstr "référence de bande"
 
-#: models/format.py:81
+#: models/format.py:82
 msgid "sticker presence"
 msgstr "présence de collants"
 
-#: models/format.py:85
+#: models/format.py:86
 msgid "format"
 msgstr "format"
 
@@ -186,7 +194,7 @@ msgstr "instrument"
 msgid "parent instrument"
 msgstr "instrument parent"
 
-#: models/instrument.py:80 models/location.py:170
+#: models/instrument.py:80 models/location.py:171
 msgid "alias"
 msgstr "alias"
 
@@ -218,6 +226,10 @@ msgstr "type"
 msgid "comment"
 msgstr "commentaire"
 
+#: models/language.py:63
+msgid "languages"
+msgstr "langues"
+
 #: models/location.py:49
 msgid "country"
 msgstr "état/nation"
@@ -238,12 +250,12 @@ msgstr "type complet"
 msgid "current location"
 msgstr "lieu actuel"
 
-#: models/location.py:58 models/location.py:171 models/location.py:187
+#: models/location.py:58 models/location.py:172 models/location.py:188
 msgid "authoritative"
 msgstr "officiel"
 
-#: models/location.py:112 models/location.py:169 models/location.py:184
-#: models/media.py:321
+#: models/location.py:112 models/location.py:170 models/location.py:185
+#: models/media.py:325
 msgid "location"
 msgstr "lieu"
 
@@ -251,14 +263,23 @@ msgstr "lieu"
 msgid "locations"
 msgstr "lieux"
 
-#: models/location.py:179
+#: models/location.py:166
+#, fuzzy
+msgid "lieux types"
+msgstr "lieux types"
+
+#: models/location.py:180
 msgid "location aliases"
-msgstr "location aliases"
+msgstr "lieux alias"
 
-#: models/location.py:185
+#: models/location.py:186
 msgid "ancestor location"
 msgstr "lieu ancêtre"
 
+#: models/location.py:194
+msgid "location relations"
+msgstr "lieux relations"
+
 #: models/media.py:72
 msgid "Metadata only"
 msgstr "Métadonnées uniquement"
@@ -272,35 +293,35 @@ msgid "Private data"
 msgstr "Données privées"
 
 #: models/media.py:77 models/media.py:97 models/media.py:193
-#: models/media.py:352
+#: models/media.py:347
 msgid "public access"
 msgstr "accès public"
 
 #: models/media.py:93 models/media.py:123 models/media.py:171
-#: models/media.py:312 models/media.py:494 models/media.py:510
-#: models/media.py:542
+#: models/media.py:312 models/media.py:508 models/media.py:524
+#: models/media.py:556
 msgid "title"
 msgstr "titre"
 
-#: models/media.py:94 models/media.py:125 models/media.py:511
-#: models/media.py:544
+#: models/media.py:94 models/media.py:125 models/media.py:525
+#: models/media.py:558
 msgid "description"
 msgstr "description"
 
-#: models/media.py:95 models/media.py:218 models/media.py:346
+#: models/media.py:95 models/media.py:218 models/media.py:353
 msgid "code"
 msgstr "cote"
 
-#: models/media.py:96 models/media.py:170 models/media.py:349
+#: models/media.py:96 models/media.py:170
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:124 models/media.py:543 models/media.py:562
+#: models/media.py:124 models/media.py:557 models/media.py:576
 #: models/system.py:115
 msgid "date"
 msgstr ""
 
-#: models/media.py:126 models/media.py:561
+#: models/media.py:126 models/media.py:575
 msgid "mime_type"
 msgstr "type mime"
 
@@ -312,7 +333,7 @@ msgstr ""
 msgid "credits"
 msgstr "crédits"
 
-#: models/media.py:129 models/media.py:354
+#: models/media.py:129 models/media.py:368
 msgid "file"
 msgstr "fichier"
 
@@ -324,11 +345,11 @@ msgstr "titre original / traduction"
 msgid "depositor / contributor"
 msgstr "déposant / contributeur"
 
-#: models/media.py:176 models/media.py:644
+#: models/media.py:176 models/media.py:658
 msgid "recording year (from)"
 msgstr "année d'enregistrement (depuis)"
 
-#: models/media.py:177 models/media.py:645
+#: models/media.py:177 models/media.py:659
 msgid "recording year (until)"
 msgstr "année d'enregistrement (jusqu'à)"
 
@@ -336,7 +357,7 @@ msgstr "année d'enregistrement (jusqu'à)"
 msgid "year published"
 msgstr "année de parution"
 
-#: models/media.py:184 models/media.py:314
+#: models/media.py:184 models/media.py:356
 msgid "recordist"
 msgstr "collecteur"
 
@@ -392,11 +413,11 @@ msgstr "édité"
 msgid "conservation site"
 msgstr "lieu de conservation"
 
-#: models/media.py:219 models/media.py:347
+#: models/media.py:219
 msgid "old code"
 msgstr "ancienne cote"
 
-#: models/media.py:220 models/media.py:357
+#: models/media.py:220 models/media.py:371
 msgid "approximative duration"
 msgstr "durée approximative"
 
@@ -424,11 +445,11 @@ msgstr "états / nations"
 msgid "populations / social groups"
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:284 models/media.py:402
+#: models/media.py:284 models/media.py:416
 msgid "computed duration"
 msgstr "durée calculée"
 
-#: models/media.py:292 models/media.py:298 models/media.py:316
+#: models/media.py:292 models/media.py:298 models/media.py:315
 msgid "collection"
 msgstr "collection"
 
@@ -436,160 +457,200 @@ msgstr "collection"
 msgid "collection related media"
 msgstr "média associés à la collection"
 
-#: models/media.py:317
+#: models/media.py:316
 msgid "recording date (from)"
 msgstr "date d'enregistrement (depuis)"
 
-#: models/media.py:318
+#: models/media.py:317
 msgid "recording date (until)"
 msgstr "date d'enregistrement (jusqu'à)"
 
+#: models/media.py:319
+msgid "scientist"
+msgstr "reponsable scientifique"
+
+#: models/media.py:320
+msgid "domain"
+msgstr "discipline"
+
+#: models/media.py:321
+msgid "summary"
+msgstr "résumé"
+
 #: models/media.py:322
+msgid "remarks"
+msgstr "remarques"
+
+#: models/media.py:326
 msgid "location details"
 msgstr "précisions lieu"
 
-#: models/media.py:323
+#: models/media.py:327
 msgid "cultural area"
 msgstr "aire culturelle"
 
-#: models/media.py:326
+#: models/media.py:330
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:328
+#: models/media.py:332
 msgid "ISO language"
 msgstr "Langue ISO"
 
-#: models/media.py:330
+#: models/media.py:334
 msgid "comments / ethnographic context"
 msgstr "commentaires / contexte ethnographique"
 
-#: models/media.py:331
+#: models/media.py:335
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:338
+#: models/media.py:342
 msgid "author / compositor"
 msgstr "auteur / compositeur"
 
-#: models/media.py:341
-msgid "remarks"
-msgstr "remarques"
+#: models/media.py:343
+msgid "contributor"
+msgstr "intervenant"
 
-#: models/media.py:342
-msgid "recordist selection"
+#: models/media.py:349
+msgid "depositor"
+msgstr "déposant"
+
+#: models/media.py:355
+msgid "item number"
+msgstr "n° de l'item"
+
+#: models/media.py:357
+msgid "digitalist"
+msgstr "opérateur de numérisation"
+
+#: models/media.py:358
+msgid "collector"
+msgstr "collecteur"
+
+#: models/media.py:359
+msgid "collector selection"
 msgstr "sélection collecteur"
 
-#: models/media.py:343
-msgid "recordist as in collection"
+#: models/media.py:360
+msgid "collector as in collection"
 msgstr "collecteur identique à la collection"
 
-#: models/media.py:348
-msgid "item number"
-msgstr "n° de l'item"
+#: models/media.py:361
+msgid "digitization date"
+msgstr "date de numérisation"
 
-#: models/media.py:350
+#: models/media.py:362
+msgid "publishing date"
+msgstr "date de création du support édité"
+
+#: models/media.py:363
+msgid "creator reference"
+msgstr "référence du créateur"
+
+#: models/media.py:364
 msgid "published references"
 msgstr "références éditées"
 
-#: models/media.py:351
+#: models/media.py:365
 msgid "copy of"
 msgstr "copie de"
 
-#: models/media.py:364 templates/telemeta/mediaitem_edit.html:41
+#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:429
+#: models/media.py:443
 msgid "instruments"
 msgstr "instruments"
 
-#: models/media.py:439 models/media.py:440
+#: models/media.py:453 models/media.py:454
 msgid "item related media"
 msgstr "média associés à l'item"
 
-#: models/media.py:458
+#: models/media.py:472
 msgid "composition"
 msgstr "Voix / Instruments"
 
-#: models/media.py:460
+#: models/media.py:474
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:461
+#: models/media.py:475
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:462
+#: models/media.py:476
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:473
+#: models/media.py:487
 msgid "id"
 msgstr ""
 
-#: models/media.py:476
+#: models/media.py:490
 msgid "unit"
 msgstr "unité"
 
-#: models/media.py:495
+#: models/media.py:509
 msgid "start"
 msgstr "début"
 
-#: models/media.py:496
+#: models/media.py:510
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:500
+#: models/media.py:514
 msgid "item part"
 msgstr "partie"
 
-#: models/media.py:508 models/media.py:525 models/media.py:540
+#: models/media.py:522 models/media.py:539 models/media.py:554
 msgid "public_id"
 msgstr "public_id"
 
-#: models/media.py:526
+#: models/media.py:540
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:527
+#: models/media.py:541
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:528
+#: models/media.py:542
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:541 models/system.py:55
+#: models/media.py:555 models/system.py:55
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:545
+#: models/media.py:559
 msgid "author"
 msgstr "auteur"
 
-#: models/media.py:563
+#: models/media.py:577
 msgid "transcoded"
 msgstr ""
 
-#: models/media.py:643
+#: models/media.py:657
 msgid "collections"
 msgstr "collections"
 
-#: models/media.py:655 models/media.py:656 models/media.py:666
-#: models/media.py:683
+#: models/media.py:669 models/media.py:670 models/media.py:680
+#: models/media.py:697
 msgid "corpus"
 msgstr "corpus"
 
-#: models/media.py:676 models/media.py:677 models/media.py:694
+#: models/media.py:690 models/media.py:691 models/media.py:708
 msgid "fonds"
 msgstr "fonds"
 
-#: models/media.py:687 models/media.py:688
+#: models/media.py:701 models/media.py:702
 msgid "corpus related media"
 msgstr "média associés"
 
-#: models/media.py:698 models/media.py:699
+#: models/media.py:712 models/media.py:713
 msgid "fonds related media"
 msgstr "média associés"
 
diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index 3e047656..80105524 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
index 575c11be..6f498f6e 100644
--- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+0200\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"
diff --git a/telemeta/migrations/0018_auto__del_originallocation__add_organization__add_rights__add_field_me.py b/telemeta/migrations/0018_auto__del_originallocation__add_organization__add_rights__add_field_me.py
new file mode 100644
index 00000000..9043d48e
--- /dev/null
+++ b/telemeta/migrations/0018_auto__del_originallocation__add_organization__add_rights__add_field_me.py
@@ -0,0 +1,637 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'OriginalLocation'
+        db.delete_table('original_location')
+
+        # Adding model 'Organization'
+        db.create_table('organization', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('value', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)),
+        ))
+        db.send_create_signal('telemeta', ['Organization'])
+
+        # Adding model 'Rights'
+        db.create_table('rights', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('value', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)),
+        ))
+        db.send_create_signal('telemeta', ['Rights'])
+
+        # Adding field 'MediaItem.scientist'
+        db.add_column('media_items', 'scientist',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.domain'
+        db.add_column('media_items', 'domain',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.summary'
+        db.add_column('media_items', 'summary',
+                      self.gf('telemeta.models.core.TextField')(default='', blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.contributor'
+        db.add_column('media_items', 'contributor',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.organization'
+        db.add_column('media_items', 'organization',
+                      self.gf('telemeta.models.core.WeakForeignKey')(default=None, to=orm['telemeta.Organization'], null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.depositor'
+        db.add_column('media_items', 'depositor',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.rights'
+        db.add_column('media_items', 'rights',
+                      self.gf('telemeta.models.core.WeakForeignKey')(default=None, to=orm['telemeta.Rights'], null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.recordist'
+        db.add_column('media_items', 'recordist',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.digitalist'
+        db.add_column('media_items', 'digitalist',
+                      self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.digitization_date'
+        db.add_column('media_items', 'digitization_date',
+                      self.gf('telemeta.models.core.DateField')(default=None, null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'MediaItem.publishing_date'
+        db.add_column('media_items', 'publishing_date',
+                      self.gf('telemeta.models.core.DateField')(default=None, null=True, blank=True),
+                      keep_default=False)
+
+
+        # Changing field 'Format.original_location'
+        db.alter_column('media_formats', 'original_location_id', self.gf('telemeta.models.core.ForeignKey')(on_delete=models.SET_NULL, to=orm['telemeta.Location'], null=True))
+    def backwards(self, orm):
+        # Adding model 'OriginalLocation'
+        db.create_table('original_location', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('value', self.gf('telemeta.models.core.CharField')(max_length=250, unique=True)),
+        ))
+        db.send_create_signal('telemeta', ['OriginalLocation'])
+
+        # Deleting model 'Organization'
+        db.delete_table('organization')
+
+        # Deleting model 'Rights'
+        db.delete_table('rights')
+
+        # Deleting field 'MediaItem.scientist'
+        db.delete_column('media_items', 'scientist')
+
+        # Deleting field 'MediaItem.domain'
+        db.delete_column('media_items', 'domain')
+
+        # Deleting field 'MediaItem.summary'
+        db.delete_column('media_items', 'summary')
+
+        # Deleting field 'MediaItem.contributor'
+        db.delete_column('media_items', 'contributor')
+
+        # Deleting field 'MediaItem.organization'
+        db.delete_column('media_items', 'organization_id')
+
+        # Deleting field 'MediaItem.depositor'
+        db.delete_column('media_items', 'depositor')
+
+        # Deleting field 'MediaItem.rights'
+        db.delete_column('media_items', 'rights_id')
+
+        # Deleting field 'MediaItem.recordist'
+        db.delete_column('media_items', 'recordist')
+
+        # Deleting field 'MediaItem.digitalist'
+        db.delete_column('media_items', 'digitalist')
+
+        # Deleting field 'MediaItem.digitization_date'
+        db.delete_column('media_items', 'digitization_date')
+
+        # Deleting field 'MediaItem.publishing_date'
+        db.delete_column('media_items', 'publishing_date')
+
+
+        # Changing field 'Format.original_location'
+        db.alter_column('media_formats', 'original_location_id', self.gf('telemeta.models.core.WeakForeignKey')(null=True, to=orm['telemeta.OriginalLocation']))
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'telemeta.acquisitionmode': {
+            'Meta': {'ordering': "['value']", 'object_name': 'AcquisitionMode', 'db_table': "'acquisition_modes'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.adconversion': {
+            'Meta': {'ordering': "['value']", 'object_name': 'AdConversion', 'db_table': "'ad_conversions'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.contextkeyword': {
+            'Meta': {'ordering': "['value']", 'object_name': 'ContextKeyword', 'db_table': "'context_keywords'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.criteria': {
+            'Meta': {'object_name': 'Criteria', 'db_table': "'search_criteria'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'value': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.ethnicgroup': {
+            'Meta': {'ordering': "['value']", 'object_name': 'EthnicGroup', 'db_table': "'ethnic_groups'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.ethnicgroupalias': {
+            'Meta': {'ordering': "['ethnic_group__value']", 'unique_together': "(('ethnic_group', 'value'),)", 'object_name': 'EthnicGroupAlias', 'db_table': "'ethnic_group_aliases'"},
+            'ethnic_group': ('telemeta.models.core.ForeignKey', [], {'related_name': "'aliases'", 'to': "orm['telemeta.EthnicGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.format': {
+            'Meta': {'object_name': 'Format', 'db_table': "'media_formats'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'format'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.MediaItem']", 'blank': 'True', 'null': 'True'}),
+            'original_audio_quality': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'original_channels': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.NumberOfChannels']"}),
+            'original_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'original_comments': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'original_location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'format'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.Location']", 'blank': 'True', 'null': 'True'}),
+            'original_number': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'original_state': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'original_status': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'physical_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PhysicalFormat']"}),
+            'recording_system': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'sticker_presence': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'tape_reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'tape_speed': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeSpeed']"}),
+            'tape_thickness': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'tape_vendor': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeVendor']"}),
+            'tape_wheel_diameter': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeWheelDiameter']"})
+        },
+        'telemeta.genericstyle': {
+            'Meta': {'ordering': "['value']", 'object_name': 'GenericStyle', 'db_table': "'generic_styles'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.instrument': {
+            'Meta': {'object_name': 'Instrument', 'db_table': "'instruments'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.instrumentalias': {
+            'Meta': {'object_name': 'InstrumentAlias', 'db_table': "'instrument_aliases'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.instrumentaliasrelation': {
+            'Meta': {'unique_together': "(('alias', 'instrument'),)", 'object_name': 'InstrumentAliasRelation', 'db_table': "'instrument_alias_relations'"},
+            'alias': ('telemeta.models.core.ForeignKey', [], {'related_name': "'other_name'", 'to': "orm['telemeta.InstrumentAlias']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'relation'", 'to': "orm['telemeta.InstrumentAlias']"})
+        },
+        'telemeta.instrumentrelation': {
+            'Meta': {'unique_together': "(('instrument', 'parent_instrument'),)", 'object_name': 'InstrumentRelation', 'db_table': "'instrument_relations'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'parent_relation'", 'to': "orm['telemeta.Instrument']"}),
+            'parent_instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'child_relation'", 'to': "orm['telemeta.Instrument']"})
+        },
+        'telemeta.language': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Language', 'db_table': "'languages'"},
+            'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identifier': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'part1': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}),
+            'part2B': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'part2T': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}),
+            'scope': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}),
+            'type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'})
+        },
+        'telemeta.legalright': {
+            'Meta': {'ordering': "['value']", 'object_name': 'LegalRight', 'db_table': "'legal_rights'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.location': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Location', 'db_table': "'locations'"},
+            'complete_type': ('telemeta.models.core.ForeignKey', [], {'related_name': "'locations'", 'to': "orm['telemeta.LocationType']"}),
+            'current_location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'past_names'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Location']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'latitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'longitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'name': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '150'}),
+            'type': ('telemeta.models.core.IntegerField', [], {'default': '0', 'db_index': 'True', 'blank': 'True'})
+        },
+        'telemeta.locationalias': {
+            'Meta': {'ordering': "['alias']", 'unique_together': "(('location', 'alias'),)", 'object_name': 'LocationAlias', 'db_table': "'location_aliases'"},
+            'alias': ('telemeta.models.core.CharField', [], {'max_length': '150'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'aliases'", 'to': "orm['telemeta.Location']"})
+        },
+        'telemeta.locationrelation': {
+            'Meta': {'ordering': "['ancestor_location__name']", 'unique_together': "(('location', 'ancestor_location'),)", 'object_name': 'LocationRelation', 'db_table': "'location_relations'"},
+            'ancestor_location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'descendant_relations'", 'to': "orm['telemeta.Location']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'is_direct': ('telemeta.models.core.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'ancestor_relations'", 'to': "orm['telemeta.Location']"})
+        },
+        'telemeta.locationtype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'LocationType', 'db_table': "'location_types'"},
+            'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('telemeta.models.core.CharField', [], {'max_length': '150'})
+        },
+        'telemeta.mediacollection': {
+            'Meta': {'ordering': "['code']", 'object_name': 'MediaCollection', 'db_table': "'media_collections'"},
+            'a_informer_07_03': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'acquisition_mode': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AcquisitionMode']"}),
+            'ad_conversion': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AdConversion']"}),
+            'alt_ids': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}),
+            'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'cnrs_contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}),
+            'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'collector_is_creator': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'conservation_site': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'creator': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'doctype_code': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_published': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'items_done': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'legal_rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.LegalRight']"}),
+            'metadata_author': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataAuthor']"}),
+            'metadata_writer': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataWriter']"}),
+            'old_code': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'physical_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PhysicalFormat']"}),
+            'physical_items_num': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}),
+            'publisher': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Publisher']"}),
+            'publisher_collection': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublisherCollection']"}),
+            'publisher_serial': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'publishing_status': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublishingStatus']"}),
+            'recorded_from_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'recorded_to_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'recording_context': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.RecordingContext']"}),
+            'reference': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'state': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'travail': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'year_published': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'})
+        },
+        'telemeta.mediacollectionrelated': {
+            'Meta': {'object_name': 'MediaCollectionRelated', 'db_table': "'media_collection_related'"},
+            'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaCollection']"}),
+            'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '100', 'db_column': "'filename'", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'})
+        },
+        'telemeta.mediacorpus': {
+            'Meta': {'object_name': 'MediaCorpus', 'db_table': "'media_corpus'"},
+            'children': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'corpus'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.MediaCollection']"}),
+            'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}),
+            'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}),
+            'recorded_from_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'recorded_to_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'reference': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.mediacorpusrelated': {
+            'Meta': {'object_name': 'MediaCorpusRelated', 'db_table': "'media_corpus_related'"},
+            'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '100', 'db_column': "'filename'", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'resource': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaCorpus']"}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'})
+        },
+        'telemeta.mediafonds': {
+            'Meta': {'object_name': 'MediaFonds', 'db_table': "'media_fonds'"},
+            'children': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'fonds'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.MediaCorpus']"}),
+            'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}),
+            'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}),
+            'reference': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.mediafondsrelated': {
+            'Meta': {'object_name': 'MediaFondsRelated', 'db_table': "'media_fonds_related'"},
+            'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '100', 'db_column': "'filename'", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'resource': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaFonds']"}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'})
+        },
+        'telemeta.mediaitem': {
+            'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"},
+            'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}),
+            'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'code': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '250', 'blank': 'True'}),
+            'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'to': "orm['telemeta.MediaCollection']"}),
+            'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'collector_from_collection': ('telemeta.models.core.BooleanField', [], {'default': 'False'}),
+            'collector_selection': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'context_comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'copied_from_item': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'copies'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MediaItem']"}),
+            'creator_reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'cultural_area': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'depositor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'digitalist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'digitization_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'domain': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'ethnic_group': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.EthnicGroup']"}),
+            'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '100', 'db_column': "'filename'", 'blank': 'True'}),
+            'generic_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.GenericStyle']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'language_iso': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.Language']", 'blank': 'True', 'null': 'True'}),
+            'location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Location']", 'null': 'True', 'blank': 'True'}),
+            'location_comment': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'moda_execut': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'old_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'organization': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Organization']", 'null': 'True', 'blank': 'True'}),
+            'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}),
+            'publishing_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'recorded_from_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'recorded_to_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'recordist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Rights']", 'null': 'True', 'blank': 'True'}),
+            'scientist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'summary': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'track': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'vernacular_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.VernacularStyle']"})
+        },
+        'telemeta.mediaitemanalysis': {
+            'Meta': {'ordering': "['name']", 'object_name': 'MediaItemAnalysis', 'db_table': "'media_analysis'"},
+            'analyzer_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'analysis'", 'to': "orm['telemeta.MediaItem']"}),
+            'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'unit': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'})
+        },
+        'telemeta.mediaitemkeyword': {
+            'Meta': {'unique_together': "(('item', 'keyword'),)", 'object_name': 'MediaItemKeyword', 'db_table': "'media_item_keywords'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'keyword_relations'", 'to': "orm['telemeta.MediaItem']"}),
+            'keyword': ('telemeta.models.core.ForeignKey', [], {'related_name': "'item_relations'", 'to': "orm['telemeta.ContextKeyword']"})
+        },
+        'telemeta.mediaitemmarker': {
+            'Meta': {'object_name': 'MediaItemMarker', 'db_table': "'media_markers'"},
+            'author': ('telemeta.models.core.ForeignKey', [], {'related_name': "'markers'", 'to': "orm['auth.User']"}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'markers'", 'to': "orm['telemeta.MediaItem']"}),
+            'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'time': ('telemeta.models.core.FloatField', [], {'default': '0', 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'})
+        },
+        'telemeta.mediaitemperformance': {
+            'Meta': {'object_name': 'MediaItemPerformance', 'db_table': "'media_item_performances'"},
+            'alias': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'performances'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.InstrumentAlias']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instrument': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'performances'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Instrument']"}),
+            'instruments_num': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'media_item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'performances'", 'to': "orm['telemeta.MediaItem']"}),
+            'musicians': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'})
+        },
+        'telemeta.mediaitemrelated': {
+            'Meta': {'object_name': 'MediaItemRelated', 'db_table': "'media_item_related'"},
+            'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '100', 'db_column': "'filename'", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaItem']"}),
+            'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}),
+            'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'})
+        },
+        'telemeta.mediaitemtranscodingflag': {
+            'Meta': {'object_name': 'MediaItemTranscodingFlag', 'db_table': "'media_transcoding'"},
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'transcoding'", 'to': "orm['telemeta.MediaItem']"}),
+            'mime_type': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'value': ('telemeta.models.core.BooleanField', [], {'default': 'False'})
+        },
+        'telemeta.mediapart': {
+            'Meta': {'object_name': 'MediaPart', 'db_table': "'media_parts'"},
+            'end': ('telemeta.models.core.FloatField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'parts'", 'to': "orm['telemeta.MediaItem']"}),
+            'start': ('telemeta.models.core.FloatField', [], {}),
+            'title': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.metadataauthor': {
+            'Meta': {'ordering': "['value']", 'object_name': 'MetadataAuthor', 'db_table': "'metadata_authors'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.metadatawriter': {
+            'Meta': {'ordering': "['value']", 'object_name': 'MetadataWriter', 'db_table': "'metadata_writers'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.numberofchannels': {
+            'Meta': {'ordering': "['value']", 'object_name': 'NumberOfChannels', 'db_table': "'original_channel_number'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.organization': {
+            'Meta': {'ordering': "['value']", 'object_name': 'Organization', 'db_table': "'organization'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.physicalformat': {
+            'Meta': {'ordering': "['value']", 'object_name': 'PhysicalFormat', 'db_table': "'physical_formats'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.playlist': {
+            'Meta': {'object_name': 'Playlist', 'db_table': "'playlists'"},
+            'author': ('telemeta.models.core.ForeignKey', [], {'related_name': "'playlists'", 'db_column': "'author'", 'to': "orm['auth.User']"}),
+            'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'title': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.playlistresource': {
+            'Meta': {'object_name': 'PlaylistResource', 'db_table': "'playlist_resources'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'playlist': ('telemeta.models.core.ForeignKey', [], {'related_name': "'resources'", 'to': "orm['telemeta.Playlist']"}),
+            'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'resource_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}),
+            'resource_type': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.publisher': {
+            'Meta': {'ordering': "['value']", 'object_name': 'Publisher', 'db_table': "'publishers'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.publishercollection': {
+            'Meta': {'ordering': "['value']", 'object_name': 'PublisherCollection', 'db_table': "'publisher_collections'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'publisher': ('telemeta.models.core.ForeignKey', [], {'related_name': "'publisher_collections'", 'to': "orm['telemeta.Publisher']"}),
+            'value': ('telemeta.models.core.CharField', [], {'max_length': '250'})
+        },
+        'telemeta.publishingstatus': {
+            'Meta': {'ordering': "['value']", 'object_name': 'PublishingStatus', 'db_table': "'publishing_status'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.recordingcontext': {
+            'Meta': {'ordering': "['value']", 'object_name': 'RecordingContext', 'db_table': "'recording_contexts'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.revision': {
+            'Meta': {'object_name': 'Revision', 'db_table': "'revisions'"},
+            'change_type': ('telemeta.models.core.CharField', [], {'max_length': '16'}),
+            'element_id': ('telemeta.models.core.IntegerField', [], {}),
+            'element_type': ('telemeta.models.core.CharField', [], {'max_length': '16'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'time': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'revisions'", 'db_column': "'username'", 'to': "orm['auth.User']"})
+        },
+        'telemeta.rights': {
+            'Meta': {'ordering': "['value']", 'object_name': 'Rights', 'db_table': "'rights'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.search': {
+            'Meta': {'ordering': "['-date']", 'object_name': 'Search', 'db_table': "'searches'"},
+            'criteria': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'search'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.Criteria']"}),
+            'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'username': ('telemeta.models.core.ForeignKey', [], {'related_name': "'searches'", 'db_column': "'username'", 'to': "orm['auth.User']"})
+        },
+        'telemeta.tapelength': {
+            'Meta': {'ordering': "['value']", 'object_name': 'TapeLength', 'db_table': "'tape_length'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.tapespeed': {
+            'Meta': {'ordering': "['value']", 'object_name': 'TapeSpeed', 'db_table': "'tape_speed'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.tapevendor': {
+            'Meta': {'ordering': "['value']", 'object_name': 'TapeVendor', 'db_table': "'tape_vendor'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.tapewheeldiameter': {
+            'Meta': {'ordering': "['value']", 'object_name': 'TapeWheelDiameter', 'db_table': "'tape_wheel_diameter'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.tapewidth': {
+            'Meta': {'ordering': "['value']", 'object_name': 'TapeWidth', 'db_table': "'tape_width'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        },
+        'telemeta.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'profiles'"},
+            'address': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
+            'attachment': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'department': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'expiration_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'function': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'telephone': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
+            'user': ('telemeta.models.core.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'telemeta.vernacularstyle': {
+            'Meta': {'ordering': "['value']", 'object_name': 'VernacularStyle', 'db_table': "'vernacular_styles'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'})
+        }
+    }
+
+    complete_apps = ['telemeta']
\ No newline at end of file
diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py
index 1fe4de6d..4126b954 100644
--- a/telemeta/models/enum.py
+++ b/telemeta/models/enum.py
@@ -206,9 +206,16 @@ class NumberOfChannels(Enumeration):
         db_table = 'original_channel_number'
         verbose_name = _("number of channels")
 
-class OriginalLocation(Enumeration):
-    "Location of th original item or collection"
+class Organization(Enumeration):
+    "Organization"
 
     class Meta(MetaEnumeration):
-        db_table = 'original_location'
-        verbose_name = _("original location")
+        db_table = 'organization'
+        verbose_name = _("organization")
+
+class Rights(Enumeration):
+    "Archive rights"
+
+    class Meta(MetaEnumeration):
+        db_table = 'rights'
+        verbose_name = _("rights")
diff --git a/telemeta/models/format.py b/telemeta/models/format.py
index 7599e1f6..dc3865ce 100644
--- a/telemeta/models/format.py
+++ b/telemeta/models/format.py
@@ -62,8 +62,9 @@ class Format(ModelCore):
     original_status       = CharField(_('original status'))
     original_state        = TextField(_('technical properties / conservation state'))
     original_comments     = TextField(_('comments / notes'))
-    original_location     = WeakForeignKey(OriginalLocation, related_name="format",
-                                        verbose_name = _("original location"))
+    original_location     = ForeignKey('Location', related_name="format",
+                                       verbose_name = _("original location"),
+                                       blank=True, null=True, on_delete=models.SET_NULL)
     original_channels     = WeakForeignKey(NumberOfChannels, related_name="format",
                                         verbose_name = _("number of channels"))
     original_audio_quality = TextField(_('audio quality'))
diff --git a/telemeta/models/language.py b/telemeta/models/language.py
index 92914b47..a5ef0ce9 100644
--- a/telemeta/models/language.py
+++ b/telemeta/models/language.py
@@ -60,3 +60,4 @@ class Language(ModelCore):
     class Meta(MetaCore):
         db_table = 'languages'
         ordering = ['name']
+        verbose_name_plural = _('languages')
diff --git a/telemeta/models/location.py b/telemeta/models/location.py
index d3a1741b..3eaf00c5 100644
--- a/telemeta/models/location.py
+++ b/telemeta/models/location.py
@@ -51,10 +51,10 @@ class Location(ModelCore):
     name             = CharField(_('name'), unique=True, max_length=150, required=True)
     type             = IntegerField(_('type'), choices=TYPE_CHOICES, default=OTHER_TYPE, db_index=True)
     complete_type    = ForeignKey('LocationType', related_name="locations", verbose_name=_('complete type'))
-    current_location = WeakForeignKey('self', related_name="past_names", 
-                                      verbose_name=_('current location')) 
-    latitude         = FloatField(null=True)                                    
-    longitude        = FloatField(null=True)                                    
+    current_location = WeakForeignKey('self', related_name="past_names",
+                                      verbose_name=_('current location'))
+    latitude         = FloatField(null=True)
+    longitude        = FloatField(null=True)
     is_authoritative = BooleanField(_('authoritative'))
 
     objects = LocationManager()
@@ -71,18 +71,18 @@ class Location(ModelCore):
         q = Q(descendant_relations__location=self)
         if direct:
             q &= Q(descendant_relations__is_direct=True)
-        return Location.objects.filter(q)           
+        return Location.objects.filter(q)
 
     def descendants(self, direct=False):
         q = Q(ancestor_relations__ancestor_location=self)
         if direct:
             q &= Q(ancestor_relations__is_direct=True)
-        return Location.objects.filter(q)           
+        return Location.objects.filter(q)
 
     def apparented(self):
         return Location.objects.filter(
-                Q(pk=self.id) | 
-                Q(ancestor_relations__ancestor_location=self) | 
+                Q(pk=self.id) |
+                Q(ancestor_relations__ancestor_location=self) |
                 Q(current_location=self.id)).distinct()
 
     def add_child(self, other):
@@ -90,7 +90,7 @@ class Location(ModelCore):
         for location in self.ancestors():
             #FIXME: might raise Duplicate Entry
             LocationRelation.objects.create(location=other, ancestor_location=location)
-            
+
     def add_parent(self, other):
         LocationRelation.objects.create(location=self, ancestor_location=other, is_direct=True)
         for location in self.descendants():
@@ -125,7 +125,7 @@ class Location(ModelCore):
             if self.id == map[flatname]:
                 return flatname
 
-        return None                    
+        return None
 
     def paths(self):
         #FIXME: need to handle multiple (polyhierarchical) paths
@@ -144,7 +144,7 @@ class Location(ModelCore):
         for path in self.paths():
             names.append(u', '.join([unicode(l) for l in path]))
         return names
-        
+
     def listnames(self):
         names = []
         for path in self.paths():
@@ -159,10 +159,11 @@ class LocationType(ModelCore):
 
     def __unicode__(self):
         return self.name
-        
+
     class Meta(MetaCore):
         db_table = 'location_types'
         ordering = ['name']
+        verbose_name_plural = _('lieux types')
 
 class LocationAlias(ModelCore):
     "Location aliases"
@@ -178,7 +179,7 @@ class LocationAlias(ModelCore):
         unique_together = (('location', 'alias'),)
         verbose_name_plural = _('location aliases')
         ordering = ['alias']
-    
+
 class LocationRelation(ModelCore):
     "Location relations"
     location             = ForeignKey('Location', related_name="ancestor_relations", verbose_name=_('location'))
@@ -190,11 +191,12 @@ class LocationRelation(ModelCore):
         db_table = 'location_relations'
         unique_together = ('location', 'ancestor_location')
         ordering = ['ancestor_location__name']
+        verbose_name_plural = _('location relations')
 
     def __unicode__(self):
         sep = ' > '
         if not self.is_direct:
-            sep = ' >..> ' 
+            sep = ' >..> '
         return unicode(self.ancestor_location) + sep + unicode(self.location)
 
 
@@ -205,4 +207,4 @@ class LocationForm(ModelForm):
     def __init__(self, *args, **kwds):
         super(LocationForm, self).__init__(*args, **kwds)
 #        self.fields['name'].queryset = Location.objects.order_by('name')
-        
+
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 5e64a3d8..7ebef25d 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -311,12 +311,16 @@ class MediaItem(MediaResource):
     # Main Informations
     title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
-    collector             = CharField(_('recordist'))
     collection            = ForeignKey('MediaCollection', related_name="items",
                                        verbose_name=_('collection'))
     recorded_from_date    = DateField(_('recording date (from)'))
     recorded_to_date      = DateField(_('recording date (until)'))
 
+    scientist             = CharField(_('scientist'))
+    domain                = CharField(_('domain'))
+    summary               = TextField(_('summary'))
+    comment               = TextField(_('remarks'))
+
     # Geographic and cultural informations
     location              = WeakForeignKey('Location', verbose_name=_('location'))
     location_comment      = CharField(_('location details'))
@@ -336,21 +340,31 @@ class MediaItem(MediaResource):
     generic_style         = WeakForeignKey('GenericStyle', related_name="items",
                                            verbose_name=_('generic style'))
     author                = CharField(_('author / compositor'))
+    contributor           = CharField(_('contributor'))
 
-    # General informations
-    comment               = TextField(_('remarks'))
-    collector_selection   = CharField(_('recordist selection'))
-    collector_from_collection = BooleanField(_('recordist as in collection'))
+    # Legal mentions
+    organization          = WeakForeignKey('Organization', verbose_name=_('organization'))
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
+                                      max_length=16, default="metadata")
+    depositor             = CharField(_('depositor'))
+    rights                = WeakForeignKey('Rights', verbose_name=_('rights'))
 
     # Archiving data
     code                  = CharField(_('code'), unique=True, blank=True)
-    old_code              = CharField(_('old code'), unique=False, blank=True)
+    old_code              = CharField(_('original code'), unique=False, blank=True)
     track                 = CharField(_('item number'))
-    creator_reference     = CharField(_('reference'))
+    recordist             = CharField(_('recordist'))
+    digitalist            = CharField(_('digitalist'))
+    collector             = CharField(_('collector'))
+    collector_selection   = CharField(_('collector selection'))
+    collector_from_collection = BooleanField(_('collector as in collection'))
+    digitization_date        = DateField(_('digitization date'))
+    publishing_date       = DateField(_('publishing date'))
+    creator_reference     = CharField(_('creator reference'))
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
-    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
-                                      max_length=16, default="metadata")
+
+    # Media
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
 
     # Technical data