Merge branch 'dev' into lam

Conflicts:
	telemeta/locale/de/LC_MESSAGES/django.mo
	telemeta/locale/de/LC_MESSAGES/django.po
	telemeta/locale/de/LC_MESSAGES/djangojs.mo
	telemeta/locale/de/LC_MESSAGES/djangojs.po
	telemeta/locale/fr/LC_MESSAGES/django.mo
	telemeta/locale/fr/LC_MESSAGES/django.po
	telemeta/locale/fr/LC_MESSAGES/djangojs.mo
	telemeta/locale/fr/LC_MESSAGES/djangojs.po

diff --cc telemeta/locale/de/LC_MESSAGES/django.mo
index 10d55ef425f1d65c039622257e66e9a7b61b2714,fe36b8b6dfecc489a4eb912bd9fcb456f871b541..60607a893897d39731f186fa74bcfad0d3932a8b
Binary files differ

diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 5a9c5236d1426b3ae9a49d317ad2808667f35e63,ab00c1cee95c62edad8e97a2ad7bbfc2a27bfe2e..e9d3606fcfb51baf6a23a61b42e916cbf12d2702
--- 1/telemeta/locale/de/LC_MESSAGES/django.po
--- 2/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-25 14:22+0200\n"
 -"POT-Creation-Date: 2012-09-25 14:16+0200\n"
++"POT-Creation-Date: 2012-09-25 14:45+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"
@@@ -806,7 -806,7 +806,7 @@@ msgstr "
  #: templates/postman/base_folder.html:49 templates/postman/view.html:25
  #: templates/telemeta/collection_detail.html:217
  #: templates/telemeta/lists.html:58
- #: templates/telemeta/mediaitem_detail.html:330
 -#: templates/telemeta/mediaitem_detail.html:339
++#: templates/telemeta/mediaitem_detail.html:332
  #: templates/telemeta/resource_detail.html:102
  msgid "Delete"
  msgstr ""
@@@ -1079,7 -1078,6 +1079,7 @@@ msgstr "
  
  #: templates/telemeta/base.html:165
  #: templates/telemeta/collection_detail.html:125
- #: templates/telemeta/mediaitem_detail.html:244
++#: templates/telemeta/mediaitem_detail.html:246
  msgid "Legal notices"
  msgstr ""
  
@@@ -1176,7 -1174,7 +1176,7 @@@ msgid "Recording period
  msgstr ""
  
  #: templates/telemeta/collection_detail.html:103
- #: templates/telemeta/mediaitem_detail.html:233
 -#: templates/telemeta/mediaitem_detail.html:207
++#: templates/telemeta/mediaitem_detail.html:235
  #: templates/telemeta/resource_detail.html:73
  msgid "Last modification"
  msgstr ""
@@@ -1197,7 -1196,7 +1197,7 @@@ msgid "Bibliographic references
  msgstr ""
  
  #: templates/telemeta/collection_detail.html:152
- #: templates/telemeta/mediaitem_detail.html:263
 -#: templates/telemeta/mediaitem_detail.html:277
++#: templates/telemeta/mediaitem_detail.html:265
  msgid "Archiving data"
  msgstr ""
  
@@@ -1206,17 -1205,17 +1206,17 @@@ msgid "Related documentation
  msgstr ""
  
  #: templates/telemeta/collection_detail.html:162
- #: templates/telemeta/mediaitem_detail.html:301
 -#: templates/telemeta/mediaitem_detail.html:308
++#: templates/telemeta/mediaitem_detail.html:303
  msgid "Comments"
  msgstr ""
  
  #: templates/telemeta/collection_detail.html:176
- #: templates/telemeta/mediaitem_detail.html:289
 -#: templates/telemeta/mediaitem_detail.html:293
++#: templates/telemeta/mediaitem_detail.html:291
  msgid "Technical data"
  msgstr ""
  
  #: templates/telemeta/collection_detail.html:181
- #: templates/telemeta/mediaitem_detail.html:229
 -#: templates/telemeta/mediaitem_detail.html:296
++#: templates/telemeta/mediaitem_detail.html:231
  msgid "Media type"
  msgstr ""
  
@@@ -1478,23 -1481,19 +1478,23 @@@ msgstr "
  msgid "Location"
  msgstr ""
  
 -#: templates/telemeta/mediaitem_detail.html:225
 -msgid "Language ISO"
 +#: templates/telemeta/mediaitem_detail.html:218
 +msgid "Interprets"
 +msgstr ""
 +
 +#: templates/telemeta/mediaitem_detail.html:226
 +msgid "Remarks"
  msgstr ""
  
- #: templates/telemeta/mediaitem_detail.html:246
 -#: templates/telemeta/mediaitem_detail.html:229
 -msgid "Ethnographic context"
++#: templates/telemeta/mediaitem_detail.html:248
 +msgid "Organization"
  msgstr ""
  
- #: templates/telemeta/mediaitem_detail.html:250
 -#: templates/telemeta/mediaitem_detail.html:240
 -msgid "Musical informations"
++#: templates/telemeta/mediaitem_detail.html:252
 +msgid "Rights"
  msgstr ""
  
- #: templates/telemeta/mediaitem_detail.html:276
 -#: templates/telemeta/mediaitem_detail.html:283
++#: templates/telemeta/mediaitem_detail.html:278
  msgid "Published references"
  msgstr ""
  

diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.mo
index 10d55ef425f1d65c039622257e66e9a7b61b2714,fe36b8b6dfecc489a4eb912bd9fcb456f871b541..60607a893897d39731f186fa74bcfad0d3932a8b
Binary files differ

diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.po
index 7a6b130f127394be386b2228b065a977b3ee67fa,8b3ff4c43f9409b66d9e5cc117ca05771ee65359..809c172ae3c96c25840117c35c460602d9a7906a
--- 1/telemeta/locale/de/LC_MESSAGES/djangojs.po
--- 2/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-25 14:22+0200\n"
 -"POT-Creation-Date: 2012-09-25 14:16+0200\n"
++"POT-Creation-Date: 2012-09-25 14:45+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 --cc telemeta/locale/fr/LC_MESSAGES/django.mo
index e4b0580046330ef5c8f725b6ef3950cc1c73b23e,cbc2162ecad28e481e7dec7a96b9b9b6aa6683ea..d6b7633579007e4d6012d1dc3135d65a60675b6f
Binary files differ

diff --cc telemeta/locale/fr/LC_MESSAGES/django.po
index 2eab0b037a72d314ffdfadd4e93d56ee29e00d46,ef80a0846a6a6074f244fcd10a86e8dda13ed35e..93966e1cab0a3d96072fce72e4bc575e53d2e985
--- 1/telemeta/locale/fr/LC_MESSAGES/django.po
--- 2/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-25 14:22+0200\n"
 -"POT-Creation-Date: 2012-09-25 14:16+0200\n"
++"POT-Creation-Date: 2012-09-25 14:45+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"
@@@ -806,7 -806,7 +806,7 @@@ msgstr "
  #: templates/postman/base_folder.html:49 templates/postman/view.html:25
  #: templates/telemeta/collection_detail.html:217
  #: templates/telemeta/lists.html:58
- #: templates/telemeta/mediaitem_detail.html:330
 -#: templates/telemeta/mediaitem_detail.html:339
++#: templates/telemeta/mediaitem_detail.html:332
  #: templates/telemeta/resource_detail.html:102
  msgid "Delete"
  msgstr "Supprimer"
@@@ -1083,7 -1082,6 +1083,7 @@@ msgstr "
  
  #: templates/telemeta/base.html:165
  #: templates/telemeta/collection_detail.html:125
- #: templates/telemeta/mediaitem_detail.html:244
++#: templates/telemeta/mediaitem_detail.html:246
  msgid "Legal notices"
  msgstr "Mentions légales"
  
@@@ -1180,7 -1178,7 +1180,7 @@@ msgid "Recording period
  msgstr "Période d'enregistrement"
  
  #: templates/telemeta/collection_detail.html:103
- #: templates/telemeta/mediaitem_detail.html:233
 -#: templates/telemeta/mediaitem_detail.html:207
++#: templates/telemeta/mediaitem_detail.html:235
  #: templates/telemeta/resource_detail.html:73
  msgid "Last modification"
  msgstr "Dernière modification"
@@@ -1201,7 -1200,7 +1201,7 @@@ msgid "Bibliographic references
  msgstr "Références bibliographiques"
  
  #: templates/telemeta/collection_detail.html:152
- #: templates/telemeta/mediaitem_detail.html:263
 -#: templates/telemeta/mediaitem_detail.html:277
++#: templates/telemeta/mediaitem_detail.html:265
  msgid "Archiving data"
  msgstr "Données d'archivage"
  
@@@ -1210,17 -1209,17 +1210,17 @@@ msgid "Related documentation
  msgstr "Documentation associée"
  
  #: templates/telemeta/collection_detail.html:162
- #: templates/telemeta/mediaitem_detail.html:301
 -#: templates/telemeta/mediaitem_detail.html:308
++#: templates/telemeta/mediaitem_detail.html:303
  msgid "Comments"
  msgstr "Commentaires"
  
  #: templates/telemeta/collection_detail.html:176
- #: templates/telemeta/mediaitem_detail.html:289
 -#: templates/telemeta/mediaitem_detail.html:293
++#: templates/telemeta/mediaitem_detail.html:291
  msgid "Technical data"
  msgstr "Données techniques"
  
  #: templates/telemeta/collection_detail.html:181
- #: templates/telemeta/mediaitem_detail.html:229
 -#: templates/telemeta/mediaitem_detail.html:296
++#: templates/telemeta/mediaitem_detail.html:231
  msgid "Media type"
  msgstr "Type de media"
  
@@@ -1483,23 -1486,19 +1483,23 @@@ msgstr "Date d'enregistrement
  msgid "Location"
  msgstr "Lieu"
  
 -#: templates/telemeta/mediaitem_detail.html:225
 -msgid "Language ISO"
 -msgstr "Langue ISO"
 +#: templates/telemeta/mediaitem_detail.html:218
 +msgid "Interprets"
 +msgstr "Interprètes"
  
 -#: templates/telemeta/mediaitem_detail.html:229
 -msgid "Ethnographic context"
 -msgstr "Contexte ethnographique"
 +#: templates/telemeta/mediaitem_detail.html:226
 +msgid "Remarks"
 +msgstr "Remarques"
 +
- #: templates/telemeta/mediaitem_detail.html:246
++#: templates/telemeta/mediaitem_detail.html:248
 +msgid "Organization"
 +msgstr "Organisation"
  
- #: templates/telemeta/mediaitem_detail.html:250
 -#: templates/telemeta/mediaitem_detail.html:240
 -msgid "Musical informations"
 -msgstr "Informations sur la musique"
++#: templates/telemeta/mediaitem_detail.html:252
 +msgid "Rights"
 +msgstr "Droits"
  
- #: templates/telemeta/mediaitem_detail.html:276
 -#: templates/telemeta/mediaitem_detail.html:283
++#: templates/telemeta/mediaitem_detail.html:278
  msgid "Published references"
  msgstr "Références éditées"
  

diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index 7eadc04a710a366c3aba219e051d7c1a796a8d56,d8370f69308bec46fba2eb83f17903dc8068be2a..eeaa8bc241953823087b393650897b3175aad151
Binary files differ

diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.po
index 90a98b9001d2870a28134eedd32cefbaee90bb81,674295ce609822754e2ca468a88874aecdf0f60f..4a43ea920c90fef2d3c38b6d26cc65534d7ecce2
--- 1/telemeta/locale/fr/LC_MESSAGES/djangojs.po
--- 2/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-25 14:22+0200\n"
 -"POT-Creation-Date: 2012-09-25 14:16+0200\n"
++"POT-Creation-Date: 2012-09-25 14:45+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"