17 files changed, 37 insertions, 37 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 72cb24097..3b99042ec 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -72,7 +72,7 @@ class RecordSelect(TableSelect):
             associated_model=ArchaeologicalSite),
         validators=[valid_id(ArchaeologicalSite)])
     ope_relation_types = forms.MultipleChoiceField(
-        label=_(u"Search within operation relations"), choices=[],
+        label=_(u"Search within related operations"), choices=[],
         widget=forms.CheckboxSelectMultiple)
     datings__period = forms.ChoiceField(label=_(u"Period"), choices=[])
     unit = forms.ChoiceField(label=_(u"Unit type"), choices=[])
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 9b8d4f000..8ce2fd9d5 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -155,7 +155,7 @@ class ContextRecordTest(ContextRecordInit, TestCase):
                          {'label': 'cr 1',
                           'relation_types_0': self.cr_rel_type.pk})
         self.assertEqual(json.loads(response.content)['total'], 2)
-        # test search between operation relations
+        # test search between related operations
         first_ope = self.operations[0]
         first_ope.year = 2010
         first_ope.save()
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 42a645171..45a05b9b1 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -290,7 +290,7 @@ class FileFormPreventive(ManageOldType, forms.Form):
         validators=[valid_id(Person)])
     responsible_town_planning_service = forms.IntegerField(
         required=False,
-        label=_(u"Responsible for town planning service"),
+        label=_(u"Responsible for planning service"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -389,7 +389,7 @@ class FinalFileClosingForm(FinalForm):
 
 class FinalFileDeleteForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to delete this archaelogical file ?")
+    confirm_end_msg = _(u"Would you like to delete this archaeological file ?")
 
 
 class AdministrativeActFileModifySelect(TableSelect):
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 1d8317b31..7f5655c0c 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -135,16 +135,16 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
     responsible_town_planning_service = models.ForeignKey(
         Person, related_name='responsible_town_planning_service_files',
         blank=True, null=True,
-        verbose_name=_(u"Responsible for town planning service"),
+        verbose_name=_(u"Responsible for planning service"),
         on_delete=models.SET_NULL,)  # service instructeur - personne
     raw_town_planning_service = models.CharField(
-        _(u"Town planning service (raw)"), max_length=200,
+        _(u"Planning service (raw)"), max_length=200,
         blank=True, null=True)
     planning_service = models.ForeignKey(
         Organization,
         related_name='planning_service_files',
         blank=True, null=True,
-        verbose_name=_(u"Town planning service organization"),
+        verbose_name=_(u"Planning service organization"),
         on_delete=models.SET_NULL,)  # service instructeur
     permit_type = models.ForeignKey(
         PermitType, verbose_name=_(u"Permit type"), blank=True, null=True)
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index f228531e1..249a9846c 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -59,18 +59,18 @@
 
 {% if item.is_preventive %}
 
-<h3>{% trans "Preventive archaelogical file"%}</h3>
+<h3>{% trans "Preventive archaeological file"%}</h3>
 <ul class='form-flex'>
 {% if item.total_developed_surface %}<li><label>{%trans "Developed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></li>{% endif %}
 
 {% field_li "Saisine type" item.saisine_type %}
 
-{% field_li_detail "Responsible for town planning service" item.responsible_town_planning_service %}
-{% field_li "Responsible for town planning service address" item.responsible_town_planning_service.full_address %}
+{% field_li_detail "Responsible for planning service" item.responsible_town_planning_service %}
+{% field_li "Responsible for planning service address" item.responsible_town_planning_service.full_address %}
 {% if item.town_planning_service %}
-  {% field_li "Town planning service organization" item.town_planning_service.full_address %}
+  {% field_li "Planning service organization" item.town_planning_service.full_address %}
 {% else %}
-  {% field_li "Town planning service organization" item.responsible_town_planning_service.attached_to.full_address %}
+  {% field_li "Planning service organization" item.responsible_town_planning_service.attached_to.full_address %}
 {% endif %}
 
 {% field_li "Permit type" item.permit_type %}
@@ -132,7 +132,7 @@
     <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
   </tr>
   {% empty %}
-  <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr>
+  <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaeological file" %}</td></tr>
   {% endfor %}
 </table>
 </div>
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 3b800dc8a..4890eb5d6 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -345,7 +345,7 @@ class FileFormGeneralContractor(PersonOrgaForm):
 
 
 class FileFormPlanningService(forms.Form):
-    form_label = _(u"Town planning service")
+    form_label = _(u"Planning service")
     associated_models = {'responsible_town_planning_service': models.Person,
                          'planning_service': models.Organization}
 
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 66ba9f8ea..724576ec6 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -233,7 +233,7 @@ class FindSelect(TableSelect):
             associated_model=ArchaeologicalSite),
         validators=[valid_id(ArchaeologicalSite)])
     ope_relation_types = forms.MultipleChoiceField(
-        label=_(u"Search within operation relations"), choices=[],
+        label=_(u"Search within related operations"), choices=[],
         widget=forms.CheckboxSelectMultiple)
     datings__period = forms.ChoiceField(label=_(u"Period"), choices=[])
     # TODO search by warehouse
@@ -454,9 +454,9 @@ class UpstreamFindFormSelection(FindFormSelection):
         super(UpstreamFindFormSelection, self).__init__(*args, **kwargs)
         self.fields['pk'].required = True
 
-#############################################
-# Source management for archaelogical finds #
-#############################################
+##############################################
+# Source management for archaeological finds #
+##############################################
 
 SourceFindFormSelection = get_form_selection(
     'SourceFindFormSelection', _(u"Archaeological find search"), 'find',
@@ -475,11 +475,11 @@ class FindSourceSelect(SourceSelect):
                 widget=OAWidget,
                 label="Code PATRIARCHE")
     find__datings__period = forms.ChoiceField(
-        label=_(u"Period of the archaelogical find"), choices=[])
+        label=_(u"Period of the archaeological find"), choices=[])
     find__material_type = forms.ChoiceField(
-        label=_("Material type of the archaelogical find"), choices=[])
+        label=_("Material type of the archaeological find"), choices=[])
     find__description = forms.CharField(
-        label=_(u"Description of the archaelogical find"))
+        label=_(u"Description of the archaeological find"))
 
     def __init__(self, *args, **kwargs):
         super(FindSourceSelect, self).__init__(*args, **kwargs)
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 37c35f4be..c8bb5e8a1 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -1158,7 +1158,7 @@ ArchaeologicalSiteFormSet.form_label = _("Archaeological sites")
 
 
 class ArchaeologicalSiteSelectionForm(forms.Form):
-    form_label = _("Associated archaelogical sites")
+    form_label = _("Associated archaeological sites")
     archaeological_sites = forms.IntegerField(
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-archaeologicalsite'),
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py
index 45faae632..999ada690 100644
--- a/archaeological_operations/import_from_csv.py
+++ b/archaeological_operations/import_from_csv.py
@@ -18,7 +18,7 @@
 # See the file COPYING for details.
 
 """
-Utils: import archaelogical operation from a CSV file
+Utils: import archaeological operation from a CSV file
 """
 
 DELIMITER = ";"
diff --git a/archaeological_operations/import_from_dbf.py b/archaeological_operations/import_from_dbf.py
index 3ce41fdfc..fa452d605 100644
--- a/archaeological_operations/import_from_dbf.py
+++ b/archaeological_operations/import_from_dbf.py
@@ -18,7 +18,7 @@
 # See the file COPYING for details.
 
 """
-Utils: import archaelogical operation from a DBF file
+Utils: import archaeological operation from a DBF file
 """
 
 from __future__ import unicode_literals
diff --git a/archaeological_operations/management/commands/import_operations_old.py b/archaeological_operations/management/commands/import_operations_old.py
index a9ecf41c9..4ad229e9a 100755
--- a/archaeological_operations/management/commands/import_operations_old.py
+++ b/archaeological_operations/management/commands/import_operations_old.py
@@ -29,7 +29,7 @@ IMPORTERS = {'csv':import_from_csv,
 
 class Command(BaseCommand):
     args = '<filename> [<lines>]'
-    help = "Import archaelogical operations"
+    help = "Import archaeological operations"
 
     def handle(self, *args, **options):
         if not args or not args[0]:
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index daddb42d6..4fc6c1a28 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -49,11 +49,11 @@
 {% field_li "Deadline for submission of the finds" item.finds_deadline %}
 {% field_li "Finds received" item.finds_received %}
 {% field_li_detail "Associated file" item.associated_file %}
-{% field_li "Responsible for town planning service" item.associated_file.responsible_town_planning_service.full_address %}
+{% field_li "Responsible for planning service" item.associated_file.responsible_town_planning_service.full_address %}
 {% if item.associated_file.town_planning_service %}
-  {% field_li "Town planning service organization" item.associated_file.town_planning_service.full_address %}
+  {% field_li "Planning service organization" item.associated_file.town_planning_service.full_address %}
 {% else %}
-  {% field_li "Town planning service organization" item.associated_file.responsible_town_planning_service.attached_to.full_address %}
+  {% field_li "Planning service organization" item.associated_file.responsible_town_planning_service.attached_to.full_address %}
 {% endif %}
 {% field_li "Permit type" item.associated_file.permit_type %}
 {% field_li "Permit reference" item.associated_file.permit_reference %}
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index eeabef857..c5ddc64e5 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -189,7 +189,7 @@ class OperationWizard(Wizard):
 
     def get_formated_datas(self, forms):
         """
-        Show a specific warning if no archaelogical file is provided
+        Show a specific warning if no archaeological file is provided
         """
         datas = super(OperationWizard, self).get_formated_datas(forms)
         # if the general town form is used the advertissement is relevant
@@ -245,7 +245,7 @@ class OperationWizard(Wizard):
         request = self.request
         post_data = request.POST.copy()
 
-        # add all parcel from available in the archaelogical file
+        # add all parcel from available in the archaeological file
         if not post_data.get('add_all_parcels'):
             return super(OperationWizard, self).post(*args, **kwargs)
 
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 8a47c35f5..1f4bd77b7 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -35,12 +35,12 @@
   {% endfor %}
 </table>
 
-{% trans "General contractor organization of archaelogical files" as af %}
+{% trans "General contractor organization of archaeological files" as af %}
 {% if item.general_contractor_files.count %}
 {% dynamic_table_document af 'files' 'corporation_general_contractor' item.pk '' output %}
 {% endif %}
 
-{% trans "Town planning service of archaelogical files" as af %}
+{% trans "Planning service of archaeological files" as af %}
 {% if item.planning_service_files.count %}
 {% dynamic_table_document af 'files' 'planning_service' item.pk '' output %}
 {% endif %}
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 %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
index 03b941c60..86286fad0 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
@@ -19,7 +19,7 @@
 {% endif %}
 
 {% if current_object.responsible_town_planning_service.count %}
-<h3>{% trans "Responsible town planning service of archaeological files" %}</h3>
+<h3>{% trans "Responsible for planning service of archaeological files" %}</h3>
 <ul class='list'>
 {% for file in current_object.responsible_town_planning_service.all %}
   <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %}
diff --git a/ishtar_common/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html
index 28390af45..1e18e8b7e 100644
--- a/ishtar_common/templates/sheet_ope.html
+++ b/ishtar_common/templates/sheet_ope.html
@@ -33,7 +33,7 @@
 <p><label>{%trans "Related file:"%}</label> <span class='value'><a href='{% url show-file item.related_file.pk ''%}'>{{ item.related_file }}</a></span></p><!-- Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related file -->
 {% if item.related_file.is_preventive %}
 {% if item.operator_reference_code %}<p><label>{%trans "Operator's reference code:"%}</label> <span class='value'>{{ item.operator_reference_code }}</span></p>{% endif %}
-{% if item.related_file.town_planning_service %}<p><label>{%trans "Town planning service:"%}</label> <span class='value'>{{ item.related_file.town_planning_service }}</span></p>{% endif %}
+{% if item.related_file.town_planning_service %}<p><label>{%trans "Planning service:"%}</label> <span class='value'>{{ item.related_file.town_planning_service }}</span></p>{% endif %}
 {% if item.related_file.permit_type %}<p><label>{%trans "Permit type:"%}</label> <span class='value'>{{ item.related_file.permit_type }}</span></p>{% endif %}
 {% if item.related_file.permit_reference %}<p><label>{%trans "Permit reference:"%}</label> <span class='value'>{{ item.related_file.permit_reference }}</span></p>{% endif %}
 {% if item.related_file.general_contractor.attached_to %}<p><label>{%trans "General contractor organisation:"%}</label> <span class='value'>{{ item.related_file.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->