diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /ishtar_common/templates/ishtar/sheet_person.html | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'ishtar_common/templates/ishtar/sheet_person.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_person.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index c84c56996..bcf39c363 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -77,17 +77,17 @@ {% dynamic_table_document ao 'operations' 'in_charge' item.pk '' output %} {% endif %} -{% trans "In charge of archaelogical files" as af %} +{% trans "In charge of archaeological files" as af %} {% if item.file_responsability.count %} {% dynamic_table_document af 'files' 'in_charge' item.pk '' output %} {% endif %} -{% trans "General contractor of archaelogical files" as af %} +{% trans "General contractor of archaeological files" as af %} {% if item.general_contractor_files.count %} {% dynamic_table_document af 'files' 'general_contractor' item.pk '' output %} {% endif %} -{% trans "Responsible for town planning service of archaelogical files" as af %} +{% trans "Responsible for planning service of archaeological files" as af %} {% if item.responsible_town_planning_service_files.count %} {% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %} {% endif %} |