diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
| commit | cb11379a0928b99e7801710040ac90dd1665b5ef (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /archaeological_files | |
| parent | e62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff) | |
| parent | 0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff) | |
| download | Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2 Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip | |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/fixtures/initial_data-fr.json | 2 | ||||
| -rw-r--r-- | archaeological_files/locale/django.pot | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_files/fixtures/initial_data-fr.json b/archaeological_files/fixtures/initial_data-fr.json index 2d45ba017..fff42cfb7 100644 --- a/archaeological_files/fixtures/initial_data-fr.json +++ b/archaeological_files/fixtures/initial_data-fr.json @@ -62,7 +62,7 @@ "available": true, "txt_idx": "impact_study", "delay": 60, - "label": "Etude d'impact (EI)" + "label": "\u00c9tude d'impact (EI)" } }, { diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 111ba45c4..3eecfc8cd 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -5,6 +5,7 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" |