From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 2 Sep 2014 15:49:51 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=86559c9488c84e894e5781f83cba403d39d8848d;p=telemeta.git

Merge branch 'dev' into crem
---

86559c9488c84e894e5781f83cba403d39d8848d
diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 11e8e2e2,f32ff053..39eb1512
--- a/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 3492eb0c,ea2de8d4..61ad400c
--- a/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