Merge branch 'stable'

Conflicts:
	ishtar_common/locale/fr/LC_MESSAGES/django.po

2 files changed, 553 insertions, 281 deletions

diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index f9926d744..aa3a0a5bf 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
 # Ishtar po translation.
-# Copyright (C) 2010-2013
+# Copyright (C) 2010-2015
 # This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2013.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-31 12:21+0100\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-05-20 00:22+0200\n"
+"PO-Revision-Date: 2015-01-25\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -32,7 +32,7 @@ msgstr "courriel"
 msgid "Archaeological file"
 msgstr "Dossier"
 
-#: context_processors.py:35
+#: context_processors.py:35 models.py:983
 msgid "Operation"
 msgstr "Opération"
 
@@ -44,75 +44,93 @@ msgstr "Unité d'Enregistrement"
 msgid "Find"
 msgstr "Mobilier"
 
-#: data_importer.py:117
+#: data_importer.py:134
 #, python-format
 msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
 msgstr ""
-"\"%(value)s\" est trop long. La longeur maximale est de %(length)d caractères."
+"\"%(value)s\" est trop long. La longueur maximum est de  %(length)d "
+"caractères."
 
-#: data_importer.py:129
+#: data_importer.py:148
 #, python-format
 msgid "\"%(value)s\" not equal to yes or no"
-msgstr "\"%(value)s\" n'est pas égal à oui ou non"
+msgstr "\"%(value)s\" diffère de oui ou non"
 
-#: data_importer.py:140
+#: data_importer.py:159
 #, python-format
 msgid "\"%(value)s\" is not a float"
-msgstr "\"%(value)s\" n'est pas un chiffre à virgule"
+msgstr "\"%(value)s\" n'est pas un flottant"
 
-#: data_importer.py:152 data_importer.py:164 data_importer.py:248
+#: data_importer.py:171 data_importer.py:183 data_importer.py:372
 #, python-format
 msgid "\"%(value)s\" is not a valid date"
 msgstr "\"%(value)s\" n'est pas une date valide"
 
-#: data_importer.py:175
+#: data_importer.py:194
 #, python-format
 msgid "\"%(value)s\" is not an integer"
 msgstr "\"%(value)s\" n'est pas un entier"
 
-#: data_importer.py:203
+#: data_importer.py:236 data_importer.py:408
 #, python-format
 msgid "Choice for \"%s\" is not available. Which one is relevant?\n"
 msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n"
 
-#: data_importer.py:207
+#: data_importer.py:243
 #, python-format
-msgid "%d. None of the above"
-msgstr "%d. Aucun des choix"
+msgid "%d. None of the above - create new"
+msgstr "%d. Aucun de ceux-là - créer un nouveau"
 
-#: data_importer.py:260
+#: data_importer.py:246
+#, python-format
+msgid "%d. None of the above - skip"
+msgstr "%d. Aucun de ceux-là - passer"
+
+#: data_importer.py:474
 msgid ""
 "The given file is not correct. Check the file format. If you use a CSV file: "
 "check that column separator and encoding are similar to the ones used by the "
 "reference file."
 msgstr ""
 "Le fichier fourni n'est pas correct. Vérifiez le format du fichier. Si vous "
-"utilisez un fichier CSV : vérifiez que les séparateurs de colonne et le "
-"codage des caractères correspond au fichier de référence."
+"utilisez un fichier CSV : vérifiez que le séparateur de colonne et "
+"l'encodage sont similaires à ceux du fichier de référence."
 
-#: data_importer.py:264
+#: data_importer.py:478
 #, python-format
 msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
-msgstr "Trop de colonnes (%(user_col)d) quand le maximum est %(ref_col)d"
+msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d"
 
-#: data_importer.py:266
+#: data_importer.py:480
 msgid "No data provided"
-msgstr "Pas de donnée fourni"
+msgstr "Aucune donnée fournie"
 
-#: data_importer.py:267
+#: data_importer.py:481
 msgid "Value is required"
-msgstr "Une valeur est attendue"
+msgstr "Valeur requise"
 
-#: data_importer.py:268
+#: data_importer.py:482
 #, python-format
 msgid "At least %d columns must be filled"
 msgstr "Au moins %d colonnes doivent être remplies"
 
-#: data_importer.py:269
+#: data_importer.py:483
 msgid "The regexp doesn't match."
-msgstr "L'espression régulière ne correspond pas."
+msgstr "L'expression régulière ne fonctionne pas"
+
+#: data_importer.py:963
+msgid "line"
+msgstr "ligne"
+
+#: data_importer.py:963
+msgid "col"
+msgstr "colonne"
+
+#: data_importer.py:963
+msgid "error"
+msgstr "erreur"
 
-#: data_importer.py:857
+#: data_importer.py:976
 #, python-format
 msgid "\"%(value)s\" not in %(values)s"
 msgstr "\"%(value)s\" n'est pas dans %(values)s"
@@ -121,13 +139,13 @@ msgstr "\"%(value)s\" n'est pas dans %(values)s"
 msgid "Enter a valid name consisting of letters, spaces and hyphens."
 msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
 
-#: forms.py:76 forms_common.py:331
+#: forms.py:76 forms_common.py:377
 msgid "Confirm"
 msgstr "Confirmation"
 
 #: forms.py:80
 msgid "Are you sure you want to delete?"
-msgstr "Êtes vous sûr de vouloir supprimer ?"
+msgstr "Êtes-vous sûr de vouloir supprimer ?"
 
 #: forms.py:88
 msgid "There are identical items."
@@ -135,7 +153,7 @@ msgstr "Il y a des éléments identiques."
 
 #: forms.py:122 forms.py:123
 msgid "Closing date"
-msgstr "Date de clotûre"
+msgstr "Date de clôture"
 
 #: forms.py:127
 msgid "You should select an item."
@@ -145,12 +163,12 @@ msgstr "Vous devez sélectionner un élément."
 msgid "Add a new item"
 msgstr "Ajouter un nouvel élément"
 
-#: forms.py:164 models.py:780
+#: forms.py:164 models.py:851
 msgid "Template"
 msgstr "Patron"
 
-#: forms_common.py:43 forms_common.py:57 forms_common.py:113
-#: forms_common.py:201 forms_common.py:206 models.py:842 models.py:1223
+#: forms_common.py:43 forms_common.py:57 forms_common.py:159
+#: forms_common.py:247 forms_common.py:252 models.py:914 models.py:1798
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:17
 #: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
@@ -169,196 +187,198 @@ msgstr ""
 "<p>Tapez le nom, le numéro de département et - ou le code postal de la "
 "commune que vous voulez sélectionner. La recherche n'est pas sensible à la "
 "casse.</p>\n"
-"<p>Seuls les vingt premiers résultats sont affichés mais en plus du nom "
+"<p>Seuls les vingt premiers résultats sont affichés mais en plus du nom, "
 "préciser le numéro de département est généralement suffisant pour obtenir le "
 "résultat souhaité.</p>\n"
 "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
 "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
 
-#: forms_common.py:65 forms_common.py:519 ishtar_menu.py:40 models.py:1018
-#: models.py:1108 models.py:1148 templates/ishtar/sheet_person.html:6
+#: forms_common.py:65 forms_common.py:565 ishtar_menu.py:40 models.py:1559
+#: models.py:1660 models.py:1700 templates/ishtar/sheet_person.html:6
 msgid "Person"
 msgstr "Individu"
 
-#: forms_common.py:101 forms_common.py:168 ishtar_menu.py:55 models.py:958
+#: forms_common.py:147 forms_common.py:214 ishtar_menu.py:58 models.py:1497
 #: templates/ishtar/sheet_organization.html:6
 msgid "Organization"
 msgstr "Organisation"
 
-#: forms_common.py:103 forms_common.py:139 forms_common.py:164
-#: forms_common.py:193 models.py:779 models.py:924 models.py:953
-#: models.py:1008 models.py:1209 templates/ishtar/sheet_organization.html:12
+#: forms_common.py:149 forms_common.py:185 forms_common.py:210
+#: forms_common.py:239 models.py:850 models.py:1018 models.py:1176
+#: models.py:1492 models.py:1549 models.py:1784
+#: templates/ishtar/sheet_organization.html:12
 #: templates/ishtar/sheet_organization.html:25
 #: templates/ishtar/sheet_person.html:12 templates/ishtar/sheet_person.html:26
 msgid "Name"
 msgstr "Nom"
 
-#: forms_common.py:105 models.py:906
+#: forms_common.py:151 models.py:978 models.py:1255
 msgid "Organization type"
 msgstr "Type d'organisation"
 
-#: forms_common.py:107 forms_common.py:195 models.py:837
+#: forms_common.py:153 forms_common.py:241 models.py:909
 #: templates/ishtar/sheet_organization.html:14
 #: templates/ishtar/sheet_person.html:17 templates/ishtar/sheet_person.html:27
 msgid "Address"
 msgstr "Adresse"
 
-#: forms_common.py:109 forms_common.py:197 models.py:838
+#: forms_common.py:155 forms_common.py:243 models.py:910
 #: templates/ishtar/sheet_organization.html:15
 #: templates/ishtar/sheet_person.html:18 templates/ishtar/sheet_person.html:28
 msgid "Address complement"
 msgstr "Complément d'adresse"
 
-#: forms_common.py:111 forms_common.py:199 models.py:840
+#: forms_common.py:157 forms_common.py:245 models.py:912
 #: templates/ishtar/sheet_organization.html:16
 #: templates/ishtar/sheet_person.html:19 templates/ishtar/sheet_person.html:29
 msgid "Postal code"
 msgstr "Code postal"
 
-#: forms_common.py:114 forms_common.py:202 models.py:843
+#: forms_common.py:160 forms_common.py:248 models.py:915
 msgid "Country"
 msgstr "Pays"
 
-#: forms_common.py:116 forms_common.py:166 forms_common.py:204
-#: forms_common.py:289 models.py:848 templates/ishtar/sheet_person.html:15
+#: forms_common.py:162 forms_common.py:212 forms_common.py:250
+#: forms_common.py:335 models.py:920 templates/ishtar/sheet_person.html:15
 msgid "Email"
 msgstr "Courriel"
 
-#: forms_common.py:117 forms_common.py:205 models.py:845
+#: forms_common.py:163 forms_common.py:251 models.py:917
 #: templates/ishtar/sheet_organization.html:18
 #: templates/ishtar/sheet_person.html:21 templates/ishtar/sheet_person.html:31
 msgid "Phone"
 msgstr "Téléphone"
 
-#: forms_common.py:118 models.py:846
+#: forms_common.py:164 models.py:918
 #: templates/ishtar/sheet_organization.html:19
 #: templates/ishtar/sheet_person.html:22 templates/ishtar/sheet_person.html:32
 msgid "Mobile phone"
 msgstr "Téléphone portable"
 
-#: forms_common.py:140 forms_common.py:167 models.py:955 models.py:1172
-#: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
-#: templates/sheet_ope.html:126 templates/ishtar/sheet_organization.html:27
+#: forms_common.py:186 forms_common.py:213 models.py:1270 models.py:1494
+#: models.py:1736 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
+#: templates/sheet_ope.html:126 templates/ishtar/import_list.html:13
+#: templates/ishtar/sheet_organization.html:27
 #: templates/ishtar/sheet_person.html:42 templates/ishtar/sheet_person.html:95
 #: templates/ishtar/blocks/window_tables/documents.html:6
 msgid "Type"
 msgstr "Type"
 
-#: forms_common.py:148
+#: forms_common.py:194 views.py:106
 msgid "Organization search"
 msgstr "Recherche d'organisations"
 
-#: forms_common.py:165 forms_common.py:191 models.py:1006
+#: forms_common.py:211 forms_common.py:237 models.py:1547
 #: templates/ishtar/sheet_organization.html:26
 #: templates/ishtar/sheet_person.html:13
 msgid "Surname"
 msgstr "Prénom"
 
-#: forms_common.py:179
+#: forms_common.py:225 views.py:80
 msgid "Person search"
 msgstr "Recherche d'individus"
 
-#: forms_common.py:188
+#: forms_common.py:234
 msgid "Identity"
 msgstr "Identité"
 
-#: forms_common.py:190 forms_common.py:476 models.py:1005 models.py:1171
+#: forms_common.py:236 forms_common.py:522 models.py:1545 models.py:1733
 #: templates/sheet_ope.html:104 templates/ishtar/sheet_person.html:94
 #: templates/ishtar/blocks/window_tables/documents.html:5
 msgid "Title"
 msgstr "Titre"
 
-#: forms_common.py:208
+#: forms_common.py:254
 msgid "Current organization"
 msgstr "Organisation actuelle"
 
-#: forms_common.py:248 forms_common.py:271 forms_common.py:274 models.py:991
+#: forms_common.py:294 forms_common.py:317 forms_common.py:320 models.py:1530
 msgid "Person type"
 msgstr "Type d'individu"
 
-#: forms_common.py:284 forms_common.py:288
+#: forms_common.py:330 forms_common.py:334
 msgid "Account"
 msgstr "Compte"
 
-#: forms_common.py:291 wizards.py:941
+#: forms_common.py:337 wizards.py:948
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms_common.py:295
+#: forms_common.py:341
 msgid "New password (confirmation)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: forms_common.py:313
+#: forms_common.py:359
 msgid "Your password and confirmation password do not match."
 msgstr "La vérification du mot de passe a échoué."
 
-#: forms_common.py:318
+#: forms_common.py:364
 msgid "You must provide a correct password."
 msgstr "Vous devez fournir un mot de passe correct."
 
-#: forms_common.py:326
+#: forms_common.py:372
 msgid "This username already exists."
 msgstr "Ce nom d'utilisateur existe déjà."
 
-#: forms_common.py:332
+#: forms_common.py:378
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: forms_common.py:340 forms_common.py:352 models.py:1224
+#: forms_common.py:386 forms_common.py:398 models.py:1799
 #: templates/ishtar/sheet_person.html:72
 msgid "Towns"
 msgstr "Communes"
 
-#: forms_common.py:349
+#: forms_common.py:395
 msgid "There are identical towns."
 msgstr "Il y a des communes identiques."
 
-#: forms_common.py:428
+#: forms_common.py:474
 msgid "Only one choice can be checked."
-msgstr "Seul un choix peut être sélectionné."
+msgstr "Seul un choix peut être coché."
 
-#: forms_common.py:474
+#: forms_common.py:520
 msgid "Documentation informations"
 msgstr "Information sur le document"
 
-#: forms_common.py:478 forms_common.py:497 models.py:1167
+#: forms_common.py:524 forms_common.py:543 models.py:1256 models.py:1719
 msgid "Source type"
 msgstr "Type de source"
 
-#: forms_common.py:480 models.py:1176
+#: forms_common.py:526 models.py:1746
 msgid "Numerical ressource (web address)"
 msgstr "Ressource numérique (adresse web)"
 
-#: forms_common.py:481 models.py:1178
+#: forms_common.py:527 models.py:1748
 msgid "Receipt date"
 msgstr "Date de réception"
 
-#: forms_common.py:483 models.py:938 models.py:1180
+#: forms_common.py:529 models.py:1366 models.py:1750
 msgid "Creation date"
 msgstr "Date de création"
 
-#: forms_common.py:494 forms_common.py:513 forms_common.py:544 models.py:1153
+#: forms_common.py:540 forms_common.py:559 forms_common.py:590 models.py:1705
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr "Auteur"
 
-#: forms_common.py:506
+#: forms_common.py:552
 msgid "Would you like to delete this documentation?"
-msgstr "Voulez vous supprimer ce document ?"
+msgstr "Voulez-vous supprimer ce document ?"
 
-#: forms_common.py:520 models.py:1144 models.py:1150
+#: forms_common.py:566 models.py:1257 models.py:1696 models.py:1702
 msgid "Author type"
 msgstr "Type d'auteur"
 
-#: forms_common.py:538
+#: forms_common.py:584
 msgid "Author selection"
 msgstr "Sélection d'auteur"
 
-#: forms_common.py:550
+#: forms_common.py:596
 msgid "There are identical authors."
 msgstr "Il y a des auteurs identiques."
 
-#: forms_common.py:554 models.py:1154 models.py:1173
+#: forms_common.py:600 models.py:1706 models.py:1743
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Authors"
@@ -368,11 +388,11 @@ msgstr "Auteurs"
 msgid "Administration"
 msgstr "Administration"
 
-#: ishtar_menu.py:30 views.py:126
+#: ishtar_menu.py:30 views.py:132
 msgid "Account management"
 msgstr "Gestion des comptes"
 
-#: ishtar_menu.py:33 models.py:570 templates/ishtar/formset.html:4
+#: ishtar_menu.py:33 models.py:641 views.py:930
 msgid "Global variables"
 msgstr "Variables globales"
 
@@ -380,302 +400,541 @@ msgstr "Variables globales"
 msgid "Directory"
 msgstr "Annuaire"
 
-#: ishtar_menu.py:42 ishtar_menu.py:57
+#: ishtar_menu.py:42 ishtar_menu.py:60 templates/blocks/JQueryJqGrid.html:4
+msgid "Search"
+msgstr "Recherche"
+
+#: ishtar_menu.py:45 ishtar_menu.py:64 templates/ishtar/import_list.html:15
 msgid "Creation"
 msgstr "Ajout"
 
-#: ishtar_menu.py:45 ishtar_menu.py:61
+#: ishtar_menu.py:48 ishtar_menu.py:68
 msgid "Modification"
 msgstr "Modification"
 
-#: ishtar_menu.py:48 ishtar_menu.py:65 templates/ishtar/merge.html:5
+#: ishtar_menu.py:51 ishtar_menu.py:72 templates/ishtar/merge.html:5
 msgid "Merge"
-msgstr "Rapprochement"
+msgstr "Fusion"
 
-#: ishtar_menu.py:51 ishtar_menu.py:68 widgets.py:82
+#: ishtar_menu.py:54 ishtar_menu.py:75 models.py:1396 widgets.py:108
 msgid "Delete"
-msgstr "Supprimer"
+msgstr "Suppression"
 
-#: models.py:148
+#: ishtar_menu.py:82 models.py:1374
+msgid "Imports"
+msgstr "Imports"
+
+#: ishtar_menu.py:84 views.py:937
+msgid "New import"
+msgstr "Nouvel import"
+
+#: ishtar_menu.py:87 views.py:950
+msgid "Current imports"
+msgstr "Imports en cours"
+
+#: ishtar_menu.py:90
+msgid "Old imports"
+msgstr "Anciens imports"
+
+#: models.py:165
 msgid "Not a valid item."
 msgstr "Élément invalide."
 
-#: models.py:160
+#: models.py:177
 msgid "An item selected is not a valid item."
 msgstr "Un élément sélectionné n'est pas valide."
 
-#: models.py:170
+#: models.py:187
 msgid "This item already exist."
 msgstr "Cet élément existe déjà."
 
-#: models.py:222 models.py:812 models.py:823
+#: models.py:239 models.py:884 models.py:895
 msgid "Label"
 msgstr "Libellé"
 
-#: models.py:223
+#: models.py:240
 msgid "Textual ID"
 msgstr "Identifiant textuel"
 
-#: models.py:225
+#: models.py:242 models.py:1757
 msgid "Comment"
 msgstr "Commentaire"
 
-#: models.py:226 models.py:783
+#: models.py:243 models.py:854
 msgid "Available"
 msgstr "Disponible"
 
-#: models.py:415
+#: models.py:415 models.py:1220
+msgid "Key"
+msgstr "Clé"
+
+#: models.py:420
+msgid "Key specific to an import"
+msgstr "Clé spécifique à un import"
+
+#: models.py:486
 msgid "Last editor"
 msgstr "Dernier éditeur"
 
-#: models.py:419
+#: models.py:490
 msgid "Creator"
 msgstr "Créateur"
 
-#: models.py:564
+#: models.py:635
 msgid "Variable name"
 msgstr "Nom de la variable"
 
-#: models.py:565
+#: models.py:636
 msgid "Description of the variable"
 msgstr "Description de la variable"
 
-#: models.py:567
+#: models.py:638 models.py:1221
 msgid "Value"
 msgstr "Valeur"
 
-#: models.py:569
+#: models.py:640
 msgid "Global variable"
 msgstr "Variables globales"
 
-#: models.py:684 models.py:715
+#: models.py:755 models.py:786
 msgid "Total"
 msgstr "Total"
 
-#: models.py:691 models.py:813 models.py:824
+#: models.py:762 models.py:885 models.py:896
 #: templates/ishtar/dashboards/dashboard_main_detail.html:135
 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
 msgid "Number"
 msgstr "Nombre"
 
-#: models.py:778
+#: models.py:849
 msgid "Administrative Act"
 msgstr "Acte administratif"
 
-#: models.py:781
+#: models.py:852
 msgid "Associated object"
 msgstr "Objet associé"
 
-#: models.py:786
+#: models.py:857
 msgid "Document template"
 msgstr "Patron de document"
 
-#: models.py:787
+#: models.py:858
 msgid "Document templates"
 msgstr "Patrons de documents"
 
-#: models.py:816 models.py:825 models.py:937
+#: models.py:888 models.py:897 models.py:1364
 msgid "State"
-msgstr "Région"
+msgstr "État"
 
-#: models.py:829 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:901 templates/blocks/JQueryAdvancedTown.html:12
 msgid "Department"
 msgstr "Département"
 
-#: models.py:830
+#: models.py:902
 msgid "Departments"
 msgstr "Départements"
 
-#: models.py:855
+#: models.py:927
 msgid "Merge key"
-msgstr "Clé de rapprochement"
+msgstr "Clé de fusion"
 
-#: models.py:907
+#: models.py:979
 msgid "Organization types"
 msgstr "Types d'organisation"
 
-#: models.py:910 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:984
+msgid "Parcels"
+msgstr "Parcelles"
+
+#: models.py:986
+msgid "Operation source"
+msgstr "Documentation de l'opération"
+
+#: models.py:989 views.py:761 views.py:817
+msgid "Archaeological files"
+msgstr "Dossiers archéologiques"
+
+#: models.py:993 views.py:764 views.py:826
+msgid "Context records"
+msgstr "Unité d'Enregistrement"
+
+#: models.py:1020 models.py:1177 models.py:1756 templates/sheet_ope.html:128
+msgid "Description"
+msgstr "Description"
+
+#: models.py:1022 templates/ishtar/dashboards/dashboard_main.html:26
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: models.py:1024
+msgid "Associated model"
+msgstr "Modèle associé"
+
+#: models.py:1026
+msgid "Is template"
+msgstr "Est un patron"
+
+#: models.py:1028
+msgid "Importer - Type"
+msgstr "Importeur - Type"
+
+#: models.py:1029
+msgid "Importer - Types"
+msgstr "Importeur - Types"
+
+#: models.py:1098
+msgid "Importer - Default"
+msgstr "Importeur - Par défaut"
+
+#: models.py:1099
+msgid "Importer - Defaults"
+msgstr "Importeur - Par défaut"
+
+#: models.py:1125
+msgid "Importer - Default value"
+msgstr "Importeur - Valeur par défaut"
+
+#: models.py:1126
+msgid "Importer - Default values"
+msgstr "Importeur - Valeurs par défaut"
+
+#: models.py:1157
+msgid "Column number"
+msgstr "Numéro de colonne"
+
+#: models.py:1159
+msgid "Required"
+msgstr "Requis"
+
+#: models.py:1161
+msgid "Importer - Column"
+msgstr "Importeur - Colonne"
+
+#: models.py:1162
+msgid "Importer - Columns"
+msgstr "Importeur - Colonnes"
+
+#: models.py:1169
+msgid "Field name"
+msgstr "Nom du champ"
+
+#: models.py:1172
+msgid "Importer - Duplicate field"
+msgstr "Importeur - Champ dupliqué"
+
+#: models.py:1173
+msgid "Importer - Duplicate fields"
+msgstr "Importeur - Champs dupliqués"
+
+#: models.py:1179
+msgid "Regular expression"
+msgstr "Expression régulière"
+
+#: models.py:1181
+msgid "Importer - Regular expression"
+msgstr "Importeur - Expression régulière"
+
+#: models.py:1182
+msgid "Importer - Regular expressions"
+msgstr "Importeur - Expressions régulières"
+
+#: models.py:1196
+msgid "Importer - Target"
+msgstr "Importeur - Cible"
+
+#: models.py:1197
+msgid "Importer - Targets"
+msgstr "Importeur - Cibles"
+
+#: models.py:1222
+msgid "Is set"
+msgstr "Est défini"
+
+#: models.py:1258 models.py:1729 models.py:1739
+msgid "Format"
+msgstr "Format"
+
+#: models.py:1259
+msgid "Operation type"
+msgstr "Type d'opération"
+
+#: models.py:1260
+msgid "Period"
+msgstr "Périodes"
+
+#: models.py:1266
+msgid "Integer"
+msgstr "Entier"
+
+#: models.py:1267
+msgid "Float"
+msgstr "Nombre à virgule"
+
+#: models.py:1268
+msgid "String"
+msgstr "Chaine de caractères"
+
+#: models.py:1269 templates/sheet_ope.html:86
+msgid "Date"
+msgstr "Date"
+
+#: models.py:1271 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: templates/ishtar/sheet_person.html:39 templates/ishtar/sheet_person.html:68
+#: templates/ishtar/sheet_person.html:93
+#: templates/ishtar/dashboards/dashboard_main_detail.html:120
+msgid "Year"
+msgstr "Année"
+
+#: models.py:1284
+msgid "4 digit year. e.g.: \"2015\""
+msgstr "Année à 4 chiffres. Exemple : « 2015 »"
+
+#: models.py:1285
+msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
+msgstr "Année à 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
+
+#: models.py:1286
+msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
+msgstr "Jour/mois/année à 4 chiffres. Exemple : « 04/02/2015 »"
+
+#: models.py:1295
+msgid "Options"
+msgstr "Options"
+
+#: models.py:1297
+msgid "Split character(s)"
+msgstr "Caractère de séparation"
+
+#: models.py:1300
+msgid "Importer - Formater type"
+msgstr "Importeur - Type de mise en forme"
+
+#: models.py:1301
+msgid "Importer - Formater types"
+msgstr "Importeur - Types de mise en forme"
+
+#: models.py:1340 templates/ishtar/dashboards/dashboard_main_detail.html:61
 msgid "Created"
 msgstr "Créé"
 
-#: models.py:911
+#: models.py:1341
 msgid "Analyse in progress"
 msgstr "Analyse en cours"
 
-#: models.py:912
+#: models.py:1342
 msgid "Analysed"
-msgstr "Analisé"
+msgstr "Analysé"
 
-#: models.py:913
+#: models.py:1343
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: models.py:914
+#: models.py:1344
 msgid "Import in progress"
 msgstr "Import en cours"
 
-#: models.py:915
-msgid "Finished"
-msgstr "Fini"
+#: models.py:1345
+msgid "Finished with errors"
+msgstr "Finis avec des erreurs"
 
-#: models.py:919
-msgid "Archaeological files - SRA Pays de la Loire"
-msgstr "Dossiers archéologiques - SRA Pays de la Loire"
+#: models.py:1346
+msgid "Finished"
+msgstr "Terminé"
 
-#: models.py:920
-msgid "Custom"
-msgstr "Personnalisé"
+#: models.py:1347
+msgid "Archived"
+msgstr "Archivé"
 
-#: models.py:927
+#: models.py:1355
 msgid "Imported file"
 msgstr "Fichier importé"
 
-#: models.py:929
+#: models.py:1358 templates/ishtar/import_list.html:47
 msgid "Error file"
-msgstr "Fichier d'erreur"
+msgstr "Fichier erreur"
 
-#: models.py:932
+#: models.py:1361
 msgid "Result file"
-msgstr "Fichier de résultat"
+msgstr "Fichier résultant"
 
-#: models.py:935
-msgid "Importer type"
-msgstr "Type d'importeur"
-
-#: models.py:940
+#: models.py:1368
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:942
+#: models.py:1370
 msgid "Seconds remaining"
 msgstr "Secondes restantes"
 
-#: models.py:945
+#: models.py:1373
 msgid "Import"
 msgstr "Import"
 
-#: models.py:946
-msgid "Imports"
-msgstr "Imports"
+#: models.py:1390
+msgid "Analyse"
+msgstr "Analyser"
+
+#: models.py:1392
+msgid "Re-analyse"
+msgstr "Analyser de nouveau "
+
+#: models.py:1393
+msgid "Launch import"
+msgstr "Lancer l'import"
 
-#: models.py:959
+#: models.py:1395
+msgid "Archive"
+msgstr "Archiver"
+
+#: models.py:1498
 msgid "Organizations"
 msgstr "Organisations"
 
-#: models.py:961
+#: models.py:1500
 msgid "Can view all Organization"
 msgstr "Peut voir toutes les Organisations"
 
-#: models.py:962
+#: models.py:1501
 msgid "Can view own Organization"
 msgstr "Peut voir sa propre Organisation"
 
-#: models.py:963
+#: models.py:1502
 msgid "Can add own Organization"
 msgstr "Peut ajouter sa propre Organisation"
 
-#: models.py:964
+#: models.py:1503
 msgid "Can change own Organization"
 msgstr "Peut changer sa propre Organisation"
 
-#: models.py:965
+#: models.py:1504
 msgid "Can delete own Organization"
 msgstr "Peut supprimer sa propre Organisation"
 
-#: models.py:988
+#: models.py:1527
 msgid "Groups"
 msgstr "Groupes"
 
-#: models.py:992
+#: models.py:1531
 msgid "Person types"
 msgstr "Types d'individu"
 
-#: models.py:997
+#: models.py:1537
 msgid "Mr"
 msgstr "M."
 
-#: models.py:998
+#: models.py:1538
 msgid "Miss"
 msgstr "Mlle"
 
-#: models.py:999
+#: models.py:1539
 msgid "Mr and Miss"
 msgstr "M. et Mme"
 
-#: models.py:1000
+#: models.py:1540
 msgid "Mrs"
 msgstr "Mme"
 
-#: models.py:1001
+#: models.py:1541
 msgid "Doctor"
 msgstr "Dr."
 
-#: models.py:1010
+#: models.py:1551
 msgid "Raw name"
 msgstr "Nom brut"
 
-#: models.py:1012 models.py:1052
+#: models.py:1553 models.py:1593
 msgid "Types"
 msgstr "Types"
 
-#: models.py:1015
+#: models.py:1556
 msgid "Is attached to"
 msgstr "Est rattaché à"
 
-#: models.py:1019
+#: models.py:1560
 msgid "Persons"
 msgstr "Individus"
 
-#: models.py:1021
+#: models.py:1562
 msgid "Can view all Person"
 msgstr "Peut voir toutes les Personnes"
 
-#: models.py:1022
+#: models.py:1563
 msgid "Can view own Person"
 msgstr "Peut voir sa propre Personne"
 
-#: models.py:1023
+#: models.py:1564
 msgid "Can add own Person"
 msgstr "Peut ajouter sa propre Personne"
 
-#: models.py:1024
+#: models.py:1565
 msgid "Can change own Person"
 msgstr "Peut changer sa propre Personne"
 
-#: models.py:1025
+#: models.py:1566
 msgid "Can delete own Person"
 msgstr "Peut supprimer sa propre Personne"
 
-#: models.py:1112
+#: models.py:1664
 msgid "Ishtar user"
 msgstr "Utilisateur d'Ishtar"
 
-#: models.py:1113
+#: models.py:1665
 msgid "Ishtar users"
 msgstr "Utilisateurs d'Ishtar"
 
-#: models.py:1145
+#: models.py:1697
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: models.py:1168
+#: models.py:1720
 msgid "Source types"
 msgstr "Types de source"
 
-#: models.py:1181 templates/ishtar/sheet_person.html:40
+#: models.py:1724
+msgid "Support type"
+msgstr "Type de support"
+
+#: models.py:1725
+msgid "Support types"
+msgstr "Types de support"
+
+#: models.py:1730
+msgid "Formats"
+msgstr "Formats"
+
+#: models.py:1734
+msgid "External ID"
+msgstr "Identifiant extern"
+
+#: models.py:1737
+msgid "Support"
+msgstr "Support"
+
+#: models.py:1741
+msgid "Scale"
+msgstr "Échelle"
+
+#: models.py:1751
+msgid "Item number"
+msgstr "Numéro d'élément"
+
+#: models.py:1752 templates/ishtar/sheet_person.html:40
 #: templates/ishtar/sheet_person.html:67
 msgid "Ref."
 msgstr "Réf."
 
-#: models.py:1183
+#: models.py:1754
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: models.py:1210
+#: models.py:1758
+msgid "Additional information"
+msgstr "Informations supplémentaires"
+
+#: models.py:1785
 msgid "Surface (m²)"
-msgstr "Area (m²)"
+msgstr "Surface (m²)"
 
-#: models.py:1211 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:1786 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr "Localisation"
 
@@ -683,90 +942,90 @@ msgstr "Localisation"
 msgid " (...)"
 msgstr " (...)"
 
-#: views.py:86
+#: views.py:87
 msgid "New person"
 msgstr "Nouvelle personne"
 
-#: views.py:94
+#: views.py:95
 msgid "Person modification"
 msgstr "Modification d'une personne"
 
-#: views.py:100
+#: views.py:101
 msgid "Person deletion"
-msgstr "Suppresion de personne"
+msgstr "Suppression de personne"
 
-#: views.py:106
+#: views.py:112
 msgid "New organization"
 msgstr "Nouvelle organisation"
 
-#: views.py:113
+#: views.py:119
 msgid "Organization modification"
 msgstr "Modification d'une organisation"
 
-#: views.py:119
+#: views.py:125
 msgid "Organization deletion"
-msgstr "Suppresion d'une organisation"
+msgstr "Suppression d'une organisation"
 
-#: views.py:255
+#: views.py:261
 msgid "True"
 msgstr "Oui"
 
-#: views.py:257
+#: views.py:263
 msgid "False"
 msgstr "Non"
 
-#: views.py:480 templates/base.html:75
+#: views.py:486 templates/base.html:76
 #: templates/ishtar/sheet_organization.html:35
 #: templates/ishtar/sheet_person.html:57 templates/ishtar/sheet_person.html:83
 msgid "Details"
 msgstr "Détails"
 
-#: views.py:693 views.py:740
+#: views.py:697 views.py:744
 msgid "Operation not permitted."
-msgstr "Opération non permise"
+msgstr "Opération non permise."
 
-#: views.py:695
+#: views.py:699
 #, python-format
 msgid "New %s"
 msgstr "Nouveau %s"
 
-#: views.py:757 views.py:813
-msgid "Archaeological files"
-msgstr "Dossiers archéologiques"
-
-#: views.py:758 views.py:817
+#: views.py:762 views.py:821
 msgid "Operations"
 msgstr "Opérations"
 
-#: views.py:760 views.py:822
-msgid "Context records"
-msgstr "Unité d'Enregistrement"
-
-#: views.py:762 views.py:827
+#: views.py:766 views.py:831
 msgid "Finds"
 msgstr "Mobilier"
 
-#: views.py:954 views.py:969
+#: views.py:994 templates/ishtar/import_list.html:43
+msgid "Link unmatched items"
+msgstr "Associer les éléments non rapprochés"
+
+#: views.py:1008
+msgid "Delete import"
+msgstr "Suppression de l'import"
+
+#: views.py:1056 views.py:1071
 msgid "Corporation manager"
 msgstr "Représentant de la personne morale"
 
-#: widgets.py:196 widgets.py:300 widgets.py:415
+#: widgets.py:222 widgets.py:326 widgets.py:441
 msgid "Search..."
 msgstr "Recherche..."
 
-#: widgets.py:526
+#: widgets.py:552
 msgid "No results"
 msgstr "Pas de résultats"
 
-#: widgets.py:527
+#: widgets.py:553
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: widgets.py:528
+#: widgets.py:554
 msgid "Remove"
 msgstr "Enlever"
 
-#: wizards.py:230
+#: wizards.py:230 templates/ishtar/import_delete.html:14
 msgid "Yes"
 msgstr "Oui"
 
@@ -774,7 +1033,7 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: wizards.py:995
+#: wizards.py:1002
 #, python-format
 msgid "[%(app_name)s] Account creation/modification"
 msgstr "[%(app_name)s] Ajout - modification du compte"
@@ -813,37 +1072,38 @@ msgstr "Merci pour l'intérêt que vous portez au projet."
 msgid "The %(app_name)s team"
 msgstr "L'équipe %(app_name)s"
 
-#: templates/base.html:29
+#: templates/base.html:30
 msgid "Logged in"
 msgstr "Connecté"
 
-#: templates/base.html:30
+#: templates/base.html:31
 msgid "Log out"
 msgstr "Déconnexion"
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Change password"
 msgstr "Changement de mot de passe"
 
-#: templates/base.html:33 templates/registration/activate.html:10
+#: templates/base.html:34 templates/registration/activate.html:10
 #: templates/registration/login.html:8 templates/registration/login.html:10
 #: templates/registration/password_reset_complete.html:8
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/base.html:39
+#: templates/base.html:40
 msgid "Lang"
 msgstr "Langue"
 
-#: templates/base.html:39 templates/base.html.py:86
+#: templates/base.html:40 templates/base.html.py:87
+#: templates/ishtar/import_delete.html:10
 msgid ":"
 msgstr " :"
 
-#: templates/base.html:64
+#: templates/base.html:65
 msgid "Default selected items"
 msgstr "Éléments sélectionnés par défaut"
 
-#: templates/base.html:84
+#: templates/base.html:85
 msgid "Current items"
 msgstr "Éléments courants"
 
@@ -916,7 +1176,7 @@ msgstr "Opération fermée"
 
 #: templates/sheet_ope.html:22
 msgid "Closing date:"
-msgstr "Date de clotûre :"
+msgstr "Date de clôture :"
 
 #: templates/sheet_ope.html:22
 msgid "by"
@@ -1018,13 +1278,6 @@ msgstr "Parcelles associées"
 msgid "Commune"
 msgstr "Commune"
 
-#: templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
-#: templates/ishtar/sheet_person.html:39 templates/ishtar/sheet_person.html:68
-#: templates/ishtar/sheet_person.html:93
-#: templates/ishtar/dashboards/dashboard_main_detail.html:120
-msgid "Year"
-msgstr "Année"
-
 #: templates/sheet_ope.html:62
 msgid "Section"
 msgstr "Section"
@@ -1049,10 +1302,6 @@ msgstr "Actes administratifs"
 msgid "Reference"
 msgstr "Référence"
 
-#: templates/sheet_ope.html:86
-msgid "Date"
-msgstr "Date"
-
 #: templates/sheet_ope.html:96
 msgid "No administrative act associated to this operation"
 msgstr "Pas d'acte administratif associé aux opérations"
@@ -1081,15 +1330,11 @@ msgstr "Identifiant"
 msgid "Chronology"
 msgstr "Chronologie"
 
-#: templates/sheet_ope.html:128
-msgid "Description"
-msgstr "Description"
-
 #: templates/sheet_ope.html:142
 msgid "No recording unit associated to this operation"
-msgstr "Pas d'Unité d'Enregistrement associée à ce dosser"
+msgstr "Pas d'Unité d'Enregistrement associée à ce dossier"
 
-#: templates/window.html:37 templates/blocks/JQueryJqGrid.html:26
+#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:26
 msgid "Add"
 msgstr "Ajout"
 
@@ -1106,10 +1351,6 @@ msgstr "Région"
 msgid "Choose a state first"
 msgstr "Choisissez une région"
 
-#: templates/blocks/JQueryJqGrid.html:4
-msgid "Search"
-msgstr "Recherche"
-
 #: templates/blocks/JQueryJqGrid.html:10
 msgid "Search and select an item"
 msgstr "Rechercher puis sélectionner un élément"
@@ -1136,18 +1377,56 @@ msgstr ""
 msgid "Help"
 msgstr "Aide"
 
-#: templates/ishtar/formset.html:8 templates/ishtar/merge.html:31
-#: templates/ishtar/wizard/confirm_wizard.html:40
-#: templates/ishtar/wizard/default_wizard.html:28
-#: templates/ishtar/wizard/default_wizard.html:44
-#: templates/ishtar/wizard/parcels_wizard.html:12
-#: templates/ishtar/wizard/parcels_wizard.html:27
+#: templates/ishtar/form.html:10 templates/ishtar/formset.html:8
+#: templates/ishtar/import_list.html:55 templates/ishtar/merge.html:31
+#: templates/ishtar/wizard/confirm_wizard.html:41
+#: templates/ishtar/wizard/default_wizard.html:29
 #: templates/ishtar/wizard/search.html:13
-#: templates/ishtar/wizard/towns_wizard.html:12
-#: templates/ishtar/wizard/towns_wizard.html:32
+#: templates/ishtar/wizard/validation_bar.html:4
 msgid "Validate"
 msgstr "Valider"
 
+#: templates/ishtar/import_delete.html:8
+msgid "The current items are linked to this import:"
+msgstr "Les éléments suivants sont associés à cet import :"
+
+#: templates/ishtar/import_delete.html:12
+msgid "All these items will be deleted with this import."
+msgstr "Tous ces éléments vont être supprimés avec cet import."
+
+#: templates/ishtar/import_delete.html:13
+msgid "Are you sure?"
+msgstr "Êtes-vous sûr ?"
+
+#: templates/ishtar/import_delete.html:16
+msgid "Back"
+msgstr "Retour"
+
+#: templates/ishtar/import_list.html:8
+msgid "No pending imports."
+msgstr "Pas d'imports en attente."
+
+#: templates/ishtar/import_list.html:14
+msgctxt "file"
+msgid "File"
+msgstr "Fichier"
+
+#: templates/ishtar/import_list.html:16
+msgid "Status"
+msgstr "État"
+
+#: templates/ishtar/import_list.html:17
+msgid "Action"
+msgstr "Action"
+
+#: templates/ishtar/import_list.html:25
+msgid "Source file"
+msgstr "Fichier source"
+
+#: templates/ishtar/import_list.html:50
+msgid "Control file"
+msgstr "Fichier de contrôle"
+
 #: templates/ishtar/merge.html:7
 msgid "Every operation on this form is irreversible"
 msgstr "Chaque opération sur ce formulaire est irréversible"
@@ -1198,6 +1477,7 @@ msgstr "Enregistrer"
 
 #: templates/ishtar/organization_person_form.html:35
 #: templates/ishtar/person_form.html:46
+#: templates/ishtar/wizard/validation_bar.html:6
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1232,7 +1512,7 @@ msgstr "Personnes au sein de l'organisation"
 
 #: templates/ishtar/sheet_organization.html:38
 msgid "No person in this organization"
-msgstr "Pas de personne au sein de l'organisation"
+msgstr "Pas de personne au sein de cette organisation"
 
 #: templates/ishtar/sheet_person.html:16
 msgid "Type(s)"
@@ -1293,10 +1573,6 @@ msgstr "Pas de document associé à cette personne"
 msgid "Related to"
 msgstr "Associé à"
 
-#: templates/ishtar/dashboards/dashboard_main.html:26
-msgid "Users"
-msgstr "Utilisateurs"
-
 #: templates/ishtar/dashboards/dashboard_main_detail.html:5
 msgid "Numbers"
 msgstr "Nombre"
@@ -1390,44 +1666,43 @@ msgstr "Type d'utilisateur"
 msgid "You have entered the following informations:"
 msgstr "Vous avez entré les informations suivantes :"
 
-#: templates/ishtar/wizard/confirm_wizard.html:39
+#: templates/ishtar/wizard/confirm_wizard.html:40
 msgid "Would you like to save them?"
-msgstr "Voulez vous enregistrer ces informations ?"
+msgstr "Voulez-vous sauver ces informations ?"
 
-#: templates/ishtar/wizard/default_wizard.html:34
-#: templates/ishtar/wizard/parcels_wizard.html:24
+#: templates/ishtar/wizard/default_wizard.html:35
+#: templates/ishtar/wizard/parcels_wizard.html:23
 #: templates/ishtar/wizard/search.html:20
-#: templates/ishtar/wizard/towns_wizard.html:20
+#: templates/ishtar/wizard/towns_wizard.html:19
 msgid "Add/Modify"
 msgstr "Ajouter-Modifier"
 
-#: templates/ishtar/wizard/default_wizard.html:45
-#: templates/ishtar/wizard/parcels_wizard.html:28
-msgid "Validate and end"
-msgstr "Valider et confirmer"
-
 #: templates/ishtar/wizard/default_wizard.html:56
 msgid ""
 "The form has changed if you don't validate it all your changes will be lost."
 msgstr ""
-"Le formulaire a changé. Si vous ne le validez pas tout vos changements vont "
-"être perdus."
+"Le formulaire a changé. Si vous ne le validez pas, tous vos changements "
+"seront perdus."
 
-#: templates/ishtar/wizard/parcels_wizard.html:20
+#: templates/ishtar/wizard/parcels_wizard.html:19
 msgid "all"
 msgstr "tout"
 
-#: templates/ishtar/wizard/parcels_wizard.html:23
+#: templates/ishtar/wizard/parcels_wizard.html:22
 msgid "Add all parcels from the archaeological file"
 msgstr "Ajouter toutes les parcelles du dossier archéologique associé"
 
-#: templates/ishtar/wizard/towns_wizard.html:28
+#: templates/ishtar/wizard/towns_wizard.html:27
 msgid "No town set in the associated file."
 msgstr "Pas de commune dans le dossier associé."
 
+#: templates/ishtar/wizard/validation_bar.html:5
+msgid "Validate and end"
+msgstr "Valider et confirmer"
+
 #: templates/ishtar/wizard/wizard_closing_done.html:4
 msgid "Item successfully closed"
-msgstr "Élément clôt avec succès"
+msgstr "Élément clos avec succès"
 
 #: templates/ishtar/wizard/wizard_delete_done.html:4
 msgid "Item successfully deleted"
@@ -1544,11 +1819,11 @@ msgstr "Possède des parcelles"
 
 #: templates/registration/activate.html:8
 msgid "Account successfully activated"
-msgstr "Compte crée avec succès"
+msgstr "Compte créé avec succès"
 
 #: templates/registration/activate.html:14
 msgid "Account activation failed"
-msgstr "La création du compte a échouée"
+msgstr "La création du compte a échoué"
 
 #: templates/registration/activation_complete.html:7
 msgid "You may now login with your username and password."
@@ -1626,7 +1901,7 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid "Reset password at %(site_name)s"
-msgstr "Remise à réro du mot de passe pour %(site_name)s"
+msgstr "Remise à zéro du mot de passe pour %(site_name)s"
 
 #: templates/registration/password_reset_form.html:7
 msgid "Reset password"
@@ -1635,9 +1910,12 @@ msgstr "Réinitialisation du mot de passe"
 #: templates/registration/registration_complete.html:6
 msgid "You are now registered. Activation email sent."
 msgstr ""
-"Vous être maintenant enregistré. Un courriel d'activation de votre compte "
+"Vous êtes maintenant enregistré. Un courriel d'activation de votre compte "
 "vous a été envoyé."
 
+#~ msgid "Archaeological files - SRA Pays de la Loire"
+#~ msgstr "Dossiers archéologiques"
+
 #~ msgid "Wizard"
 #~ msgstr "Assistant"
 
@@ -1659,9 +1937,6 @@ msgstr ""
 #~ msgid "Context_record"
 #~ msgstr "Unité d'Enregistrement"
 
-#~ msgid "Periods"
-#~ msgstr "Périodes"
-
 #~ msgid "Weight"
 #~ msgstr "Poids"
 
@@ -1728,9 +2003,6 @@ msgstr ""
 #~ msgid "TPQ estimated:"
 #~ msgstr "TPQ estimé :"
 
-#~ msgid "Operation resume"
-#~ msgstr "Résumé de l'opération"
-
 #~ msgid "No operation linked to this context unit!"
 #~ msgstr "Pas d'opération associée à ce Unité d'Enregistrement"
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index a1f1c1129..cb069216d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1256,7 +1256,7 @@ TARGET_MODELS = [
     ('SourceType', _(u"Source type")),
     ('AuthorType', _(u"Author type")),
     ('Format', _(u"Format")),
-    ('archaeological_operations.models.OperationType', _(u"OperationType")),
+    ('archaeological_operations.models.OperationType', _(u"Operation type")),
     ('archaeological_operations.models.Period', _(u"Period")),
     ]