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 | 41402266b19c94f677c4f5deaba738766b8b1af3 (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /archaeological_files | |
| parent | b7b200e4ba1c54d83bbda5c47c9e96ddb36bbc0d (diff) | |
| parent | c5584da2f1842ff4b593fa78a2f524bcddb86d60 (diff) | |
| download | Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.tar.bz2 Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.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 "" |