Merge branch 'dev' into crem

diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 11e8e2e201b2dea6551fb73fa7e28b4743e23611,f32ff053518c62f325f7c1ecf72b411815d3bcfb..39eb1512ae93909a6e6592b54947fb6816069491
--- 1/telemeta/locale/de/LC_MESSAGES/django.po
--- 2/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -859,10 -865,10 +859,10 @@@ msgid "g:i A,M j,n/j/y
  msgstr "g:i A,M j,n/j/y"
  
  #: templates/postman/base_folder.html:49 templates/postman/view.html:25
 -#: templates/telemeta/collection_detail.html:222
 +#: templates/telemeta/collection_detail.html:220
  #: templates/telemeta/collection_detail_dc.html:25
  #: templates/telemeta/lists.html:58
- #: templates/telemeta/mediaitem_detail.html:341
+ #: templates/telemeta/mediaitem_detail.html:348
  #: templates/telemeta/mediaitem_detail_dc.html:20
  #: templates/telemeta/resource_detail.html:104
  #: templates/telemeta/resource_detail_dc.html:17

diff --cc telemeta/locale/fr/LC_MESSAGES/django.po
index 3492eb0cb3049d2505a493d12e120c0208bac4f0,ea2de8d40affff1bdedeefb8464010a85c515f5e..61ad400c73f42ff399906d40c7974861d6214657
--- 1/telemeta/locale/fr/LC_MESSAGES/django.po
--- 2/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@@ -852,10 -861,10 +852,10 @@@ msgid "g:i A,M j,n/j/y
  msgstr ""
  
  #: templates/postman/base_folder.html:49 templates/postman/view.html:25
 -#: templates/telemeta/collection_detail.html:222
 +#: templates/telemeta/collection_detail.html:220
  #: templates/telemeta/collection_detail_dc.html:25
  #: templates/telemeta/lists.html:58
- #: templates/telemeta/mediaitem_detail.html:341
+ #: templates/telemeta/mediaitem_detail.html:348
  #: templates/telemeta/mediaitem_detail_dc.html:20
  #: templates/telemeta/resource_detail.html:104
  #: templates/telemeta/resource_detail_dc.html:17