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.po
index a81266c5376c8f818f14fba82dde26d148d7453c,daeff561b45375ee4413f009d61b17260550b343..ccbfd83a68119a9e903a275981db75636b429347
--- 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,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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/de/LC_MESSAGES/djangojs.po
index dce25902bc6f5ed4edf68146e125f87d8e85aae6,3138926745bec86325ab98f9f5b4cd81010bc208..4f4d6b5b4f8b0ad742ecfe2050a65ec9d0395ca0
--- 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,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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.po
index 1148f51c7e17ab3d6ef6db71980ca0fae7179066,3efcef83c94e43c699a749c5b1fe4d2cec38361b..07ec5358c2831340d7008858c3c6fd102d211df7
--- 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,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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"
@@@ -1923,17 -1925,12 +1926,26 @@@ msgstr "
  msgid "Last changes"
  msgstr "Dernières modifications"
  
++<<<<<<< HEAD
 +#~ msgid "Language ISO"
 +#~ msgstr "Langue ISO"
 +
 +#~ msgid "Ethnographic context"
 +#~ msgstr "Contexte ethnographique"
 +
 +#~ msgid "Musical informations"
 +#~ msgstr "Informations sur la musique"
 +
 +#~ msgid "General informations"
 +#~ msgstr "Informations générales"
++=======
+ #, fuzzy
+ #~ msgid "lieux types"
+ #~ msgstr "lieux types"
+ 
+ #~ msgid "subject"
+ #~ msgstr "discipline"
++>>>>>>> dev
  
  #~ msgid "domain"
  #~ msgstr "discipline"

diff --cc telemeta/models/media.py
Simple merge