Merge branch 'master-trad'

3 files changed, 7 insertions, 7 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index c8bb5e8a1..8d900036d 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -515,7 +515,7 @@ class OperationSelect(TableSelect):
                                           choices=[])
     virtual_operation = forms.NullBooleanField(label=_(u"Virtual operation"))
     archaeological_sites = forms.IntegerField(
-        label=_("Archaelogical site"),
+        label=_("Archaeological site"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-archaeologicalsite'),
             associated_model=models.ArchaeologicalSite),
@@ -637,7 +637,7 @@ class OperationFormFileChoice(forms.Form):
     associated_models = {'associated_file': File, }
     currents = {'associated_file': File}
     associated_file = forms.IntegerField(
-        label=_(u"Archaelogical file"),
+        label=_(u"Archaeological file"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-file'), associated_model=File),
         validators=[valid_id(File)], required=False)
@@ -930,7 +930,7 @@ class OperationFormModifGeneral(OperationFormGeneral):
                                         required=False)
     currents = {'associated_file': File}
     associated_file = forms.IntegerField(
-        label=_(u"Archaelogical file"),
+        label=_(u"Archaeological file"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-file'),
             associated_model=File),
@@ -1143,7 +1143,7 @@ class ArchaeologicalSiteBasicForm(forms.Form):
     base_model = 'archaeological_site'
     associated_models = {'archaeological_site': models.ArchaeologicalSite}
     archaeological_site = forms.IntegerField(
-        label=_("Archaelogical site"),
+        label=_("Archaeological site"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-archaeologicalsite'),
             associated_model=models.ArchaeologicalSite,
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 1e108e98c..c54a060cb 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -987,7 +987,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
         'archaeological_files.File',
         blank=True, null=True,
         related_name='administrative_act',
-        verbose_name=_(u"Archaelogical file"))
+        verbose_name=_(u"Archaeological file"))
     signature_date = models.DateField(_(u"Signature date"), blank=True,
                                       null=True)
     year = models.IntegerField(_(u"Year"), blank=True, null=True)
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index c5ddc64e5..ece14d1d2 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -73,7 +73,7 @@ class OperationWizard(Wizard):
     def get_reminder(self):
         archaeological_file = self.get_current_file()
         if archaeological_file:
-            return ((_("Archaelogical file"),
+            return ((_("Archaeological file"),
                      unicode(archaeological_file)),)
 
     def get_context_data(self, form, **kwargs):
@@ -196,7 +196,7 @@ class OperationWizard(Wizard):
         has_no_af = [form.prefix for form in forms
                      if form.prefix == 'townsgeneral-operation'] and True
         if has_no_af:
-            datas = [[_(u"Warning: No Archaelogical File is provided. "
+            datas = [[_(u"Warning: No Archaeological File is provided. "
                       u"If you have forget it return to the first step."), []]]\
                 + datas
         return datas