From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 17 Dec 2013 17:19:42 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~34
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6fb26b8e0d75f997462348c5fcc902191906499;p=telemeta.git

Merge branch 'dev' into crem2
---

a6fb26b8e0d75f997462348c5fcc902191906499
diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 4b6f5854,bebe1aaa..86f77ac7
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -1149,14 -1143,15 +1149,15 @@@ msgstr "juristische Hinweise
  #: templates/telemeta/collection_edit.html:35
  #: templates/telemeta/collection_related_edit.html:12
  #: templates/telemeta/collection_related_edit.html:41
- #: templates/telemeta/enumeration_edit_value.html:19
+ #: templates/telemeta/enumeration_edit_value.html:18
+ #: templates/telemeta/enumeration_edit_value.html:40
  #: templates/telemeta/instrument_edit_value.html:19
  #: templates/telemeta/mediaitem_add.html:14
 -#: templates/telemeta/mediaitem_add.html:43
 +#: templates/telemeta/mediaitem_add.html:50
  #: templates/telemeta/mediaitem_copy.html:16
 -#: templates/telemeta/mediaitem_copy.html:51
 +#: templates/telemeta/mediaitem_copy.html:58
  #: templates/telemeta/mediaitem_edit.html:11
 -#: templates/telemeta/mediaitem_edit.html:63
 +#: templates/telemeta/mediaitem_edit.html:70
  #: templates/telemeta/mediaitem_keywords_edit.html:12
  #: templates/telemeta/mediaitem_keywords_edit.html:40
  #: templates/telemeta/mediaitem_performances_edit.html:12
@@@ -1180,14 -1175,14 +1181,14 @@@ msgstr "abbrechen
  #: templates/telemeta/collection_edit.html:37
  #: templates/telemeta/collection_related_edit.html:14
  #: templates/telemeta/collection_related_edit.html:43
- #: templates/telemeta/enumeration_edit_value.html:17
+ #: templates/telemeta/enumeration_edit_value.html:16
  #: templates/telemeta/instrument_edit_value.html:17
  #: templates/telemeta/mediaitem_add.html:16
 -#: templates/telemeta/mediaitem_add.html:46
 +#: templates/telemeta/mediaitem_add.html:53
  #: templates/telemeta/mediaitem_copy.html:18
 -#: templates/telemeta/mediaitem_copy.html:52
 +#: templates/telemeta/mediaitem_copy.html:59
  #: templates/telemeta/mediaitem_edit.html:13
 -#: templates/telemeta/mediaitem_edit.html:65
 +#: templates/telemeta/mediaitem_edit.html:72
  #: templates/telemeta/mediaitem_keywords_edit.html:13
  #: templates/telemeta/mediaitem_keywords_edit.html:41
  #: templates/telemeta/mediaitem_performances_edit.html:13
diff --cc telemeta/locale/fr/LC_MESSAGES/django.po
index 91067e15,c2aea8a4..3c71ae60
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@@ -1141,14 -1138,15 +1141,15 @@@ msgstr "Mentions légales
  #: templates/telemeta/collection_edit.html:35
  #: templates/telemeta/collection_related_edit.html:12
  #: templates/telemeta/collection_related_edit.html:41
- #: templates/telemeta/enumeration_edit_value.html:19
+ #: templates/telemeta/enumeration_edit_value.html:18
+ #: templates/telemeta/enumeration_edit_value.html:40
  #: templates/telemeta/instrument_edit_value.html:19
  #: templates/telemeta/mediaitem_add.html:14
 -#: templates/telemeta/mediaitem_add.html:43
 +#: templates/telemeta/mediaitem_add.html:50
  #: templates/telemeta/mediaitem_copy.html:16
 -#: templates/telemeta/mediaitem_copy.html:51
 +#: templates/telemeta/mediaitem_copy.html:58
  #: templates/telemeta/mediaitem_edit.html:11
 -#: templates/telemeta/mediaitem_edit.html:63
 +#: templates/telemeta/mediaitem_edit.html:70
  #: templates/telemeta/mediaitem_keywords_edit.html:12
  #: templates/telemeta/mediaitem_keywords_edit.html:40
  #: templates/telemeta/mediaitem_performances_edit.html:12
@@@ -1172,14 -1170,14 +1173,14 @@@ msgstr "Annuler
  #: templates/telemeta/collection_edit.html:37
  #: templates/telemeta/collection_related_edit.html:14
  #: templates/telemeta/collection_related_edit.html:43
- #: templates/telemeta/enumeration_edit_value.html:17
+ #: templates/telemeta/enumeration_edit_value.html:16
  #: templates/telemeta/instrument_edit_value.html:17
  #: templates/telemeta/mediaitem_add.html:16
 -#: templates/telemeta/mediaitem_add.html:46
 +#: templates/telemeta/mediaitem_add.html:53
  #: templates/telemeta/mediaitem_copy.html:18
 -#: templates/telemeta/mediaitem_copy.html:52
 +#: templates/telemeta/mediaitem_copy.html:59
  #: templates/telemeta/mediaitem_edit.html:13
 -#: templates/telemeta/mediaitem_edit.html:65
 +#: templates/telemeta/mediaitem_edit.html:72
  #: templates/telemeta/mediaitem_keywords_edit.html:13
  #: templates/telemeta/mediaitem_keywords_edit.html:41
  #: templates/telemeta/mediaitem_performances_edit.html:13