Merge branch 'dev' into crem2

diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index 72c4beb7e937f2b440ab83ac540332f8e426e038,cdb5357de2a828b3a38c6da9318c9749cff1167c..a47fae30f45bd9f60a9659255a922ac87af24390
--- 1/telemeta/locale/de/LC_MESSAGES/django.po
--- 2/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -87,9 -87,9 +87,9 @@@ msgstr "HerausgeberIn
  msgid "population / social group"
  msgstr "Bevölkerung / soziale Gruppe"
  
- #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
+ #: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
  #: models/language.py:54 models/location.py:51 models/location.py:158
 -#: models/media.py:562
 +#: models/media.py:554
  msgid "name"
  msgstr "Name"
  
@@@ -1016,8 -1017,13 +1021,13 @@@ msgstr "zurück
  msgid "Administration"
  msgstr "Verwaltung"
  
+ #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
+ #: templates/telemeta/base.html:117
+ msgid "General"
+ msgstr "allgemein"
+ 
  #: templates/telemeta/admin_enumerations.html:6
 -#: templates/telemeta/base.html:118 templates/telemeta/enumeration_edit.html:7
 +#: templates/telemeta/base.html:122 templates/telemeta/enumeration_edit.html:7
  msgid "Enumerations"
  msgstr "Aufzählung"
  
@@@ -1116,9 -1122,9 +1126,9 @@@ msgstr "erweiterte Suche
  msgid "Admin"
  msgstr "Verwaltung"
  
 -#: templates/telemeta/base.html:119 templates/telemeta/instrument_edit.html:4
 +#: templates/telemeta/base.html:123 templates/telemeta/instrument_edit.html:4
  #: templates/telemeta/instrument_edit.html:7
- #: templates/telemeta/instrument_edit_value.html:5
+ #: templates/telemeta/instrument_edit_value.html:24
  msgid "Instruments"
  msgstr "Instrumente"
  

diff --cc telemeta/locale/fr/LC_MESSAGES/django.po
index 5ff506f600e7a8d92f391c44dd47d9b6b0b92623,341b888629becdb1b3330e7fa3b7097a20808f96..cc0cc100f3ba6e1d4bbc7538776f91cda73df021
--- 1/telemeta/locale/fr/LC_MESSAGES/django.po
--- 2/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@@ -86,9 -86,9 +86,9 @@@ msgstr "éditeur
  msgid "population / social group"
  msgstr "population / groupe social"
  
- #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
+ #: models/enum.py:166 models/instrument.py:43 models/instrument.py:53
  #: models/language.py:54 models/location.py:51 models/location.py:158
 -#: models/media.py:562
 +#: models/media.py:554
  msgid "name"
  msgstr "nom"
  
@@@ -1008,8 -1009,13 +1013,13 @@@ msgstr "
  msgid "Administration"
  msgstr "Administration"
  
+ #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5
+ #: templates/telemeta/base.html:117
+ msgid "General"
+ msgstr "Générale"
+ 
  #: templates/telemeta/admin_enumerations.html:6
 -#: templates/telemeta/base.html:118 templates/telemeta/enumeration_edit.html:7
 +#: templates/telemeta/base.html:122 templates/telemeta/enumeration_edit.html:7
  msgid "Enumerations"
  msgstr "Énumérations"
  
@@@ -1108,9 -1114,9 +1118,9 @@@ msgstr "Recherche avancée
  msgid "Admin"
  msgstr "Admin"
  
 -#: templates/telemeta/base.html:119 templates/telemeta/instrument_edit.html:4
 +#: templates/telemeta/base.html:123 templates/telemeta/instrument_edit.html:4
  #: templates/telemeta/instrument_edit.html:7
- #: templates/telemeta/instrument_edit_value.html:5
+ #: templates/telemeta/instrument_edit_value.html:24
  msgid "Instruments"
  msgstr "Instruments"
  

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

diff --cc telemeta/urls.py
Simple merge