Update french translation

2 files changed, 489 insertions, 213 deletions

diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 2a957a357..ee4efc4f2 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-25 01:39+0100\n"
+"POT-Creation-Date: 2015-05-20 00:17+0200\n"
 "PO-Revision-Date: 2015-01-25\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -32,7 +32,7 @@ msgstr "courriel"
 msgid "Archaeological file"
 msgstr "Dossier"
 
-#: context_processors.py:35
+#: context_processors.py:35 models.py:970
 msgid "Operation"
 msgstr "Opération"
 
@@ -44,74 +44,93 @@ msgstr "Unité d'Enregistrement"
 msgid "Find"
 msgstr "Mobilier"
 
-#: data_importer.py:117
+#: data_importer.py:123
 #, python-format
 msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
-msgstr "\"%(value)s\" est trop long. La longueur maximum est de  %(length)d caractères." 
+msgstr ""
+"\"%(value)s\" est trop long. La longueur maximum est de  %(length)d "
+"caractères."
 
-#: data_importer.py:129
+#: data_importer.py:137
 #, python-format
 msgid "\"%(value)s\" not equal to yes or no"
-msgstr "\"%(value)s\" diffère de oui ou non" 
+msgstr "\"%(value)s\" diffère de oui ou non"
 
-#: data_importer.py:140
+#: data_importer.py:148
 #, python-format
 msgid "\"%(value)s\" is not a float"
 msgstr "\"%(value)s\" n'est pas un flottant"
 
-#: data_importer.py:152 data_importer.py:164 data_importer.py:248
+#: data_importer.py:160 data_importer.py:172 data_importer.py:346
 #, python-format
 msgid "\"%(value)s\" is not a valid date"
-msgstr "\"%(value)s\" n'est pas une date valide" 
+msgstr "\"%(value)s\" n'est pas une date valide"
 
-#: data_importer.py:175
+#: data_importer.py:183
 #, python-format
 msgid "\"%(value)s\" is not an integer"
-msgstr "\"%(value)s\" n'est pas un entier" 
+msgstr "\"%(value)s\" n'est pas un entier"
 
-#: data_importer.py:203
+#: data_importer.py:223 data_importer.py:380
 #, 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" 
+msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n"
+
+#: data_importer.py:230
+#, python-format
+msgid "%d. None of the above - create new"
+msgstr "%d. Aucun de ceux-là - créer un nouveau"
 
-#: data_importer.py:207
+#: data_importer.py:233
 #, python-format
-msgid "%d. None of the above"
-msgstr "%d. Aucun de ceux-là"
+msgid "%d. None of the above - skip"
+msgstr "%d. Aucun de ceux-là - passer"
 
-#: data_importer.py:260
+#: data_importer.py:430
 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 le séparateur de colonne et "
+"Le fichier fourni n'est pas correct. Vérifiez le format du fichier. Si vous "
+"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:434
 #, python-format
 msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
 msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d"
 
-#: data_importer.py:266
+#: data_importer.py:436
 msgid "No data provided"
 msgstr "Aucune donnée fournie"
 
-#: data_importer.py:267
+#: data_importer.py:437
 msgid "Value is required"
 msgstr "Valeur requise"
 
-#: data_importer.py:268
+#: data_importer.py:438
 #, 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:439
 msgid "The regexp doesn't match."
 msgstr "L'expression régulière ne fonctionne pas"
 
-#: data_importer.py:857
+#: data_importer.py:896
+msgid "line"
+msgstr "ligne"
+
+#: data_importer.py:896
+msgid "col"
+msgstr "colonne"
+
+#: data_importer.py:896
+msgid "error"
+msgstr "erreur"
+
+#: data_importer.py:909
 #, python-format
 msgid "\"%(value)s\" not in %(values)s"
 msgstr "\"%(value)s\" n'est pas dans %(values)s"
@@ -120,7 +139,7 @@ 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:283
+#: forms.py:76 forms_common.py:329
 msgid "Confirm"
 msgstr "Confirmation"
 
@@ -144,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:105 forms_common.py:186
-#: forms_common.py:191 models.py:829 models.py:1204
+#: forms_common.py:43 forms_common.py:151 forms_common.py:232
+#: forms_common.py:237 models.py:901 models.py:1770
 #: templates/ishtar/sheet_organization.html:17
 #: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
 msgid "Town"
@@ -173,190 +192,192 @@ msgstr ""
 "<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:57 forms_common.py:471 ishtar_menu.py:40 models.py:1005
-#: models.py:1089 models.py:1129 templates/ishtar/sheet_person.html:6
+#: forms_common.py:57 forms_common.py:517 ishtar_menu.py:40 models.py:1546
+#: models.py:1632 models.py:1672 templates/ishtar/sheet_person.html:6
 msgid "Person"
 msgstr "Individu"
 
-#: forms_common.py:93 forms_common.py:153 ishtar_menu.py:55 models.py:945
+#: forms_common.py:139 forms_common.py:199 ishtar_menu.py:55 models.py:1484
 #: templates/ishtar/sheet_organization.html:6
 msgid "Organization"
 msgstr "Organisation"
 
-#: forms_common.py:95 forms_common.py:131 forms_common.py:149
-#: forms_common.py:178 models.py:779 models.py:911 models.py:940 models.py:995
-#: models.py:1190 templates/ishtar/sheet_organization.html:12
+#: forms_common.py:141 forms_common.py:177 forms_common.py:195
+#: forms_common.py:224 models.py:850 models.py:1005 models.py:1163
+#: models.py:1479 models.py:1536 models.py:1756
+#: 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:97 models.py:893
+#: forms_common.py:143 models.py:965 models.py:1242
 msgid "Organization type"
 msgstr "Type d'organisation"
 
-#: forms_common.py:99 forms_common.py:180 models.py:824
+#: forms_common.py:145 forms_common.py:226 models.py:896
 #: 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:101 forms_common.py:182 models.py:825
+#: forms_common.py:147 forms_common.py:228 models.py:897
 #: 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:103 forms_common.py:184 models.py:827
+#: forms_common.py:149 forms_common.py:230 models.py:899
 #: 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:106 forms_common.py:187 models.py:830
+#: forms_common.py:152 forms_common.py:233 models.py:902
 msgid "Country"
 msgstr "Pays"
 
-#: forms_common.py:108 forms_common.py:151 forms_common.py:189
-#: forms_common.py:241 models.py:835 templates/ishtar/sheet_person.html:15
+#: forms_common.py:154 forms_common.py:197 forms_common.py:235
+#: forms_common.py:287 models.py:907 templates/ishtar/sheet_person.html:15
 msgid "Email"
 msgstr "Courriel"
 
-#: forms_common.py:109 forms_common.py:190 models.py:832
+#: forms_common.py:155 forms_common.py:236 models.py:904
 #: 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:110 models.py:833
+#: forms_common.py:156 models.py:905
 #: 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:132 forms_common.py:152 models.py:942 models.py:1153
-#: 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:178 forms_common.py:198 models.py:1257 models.py:1481
+#: models.py:1708 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:140
+#: forms_common.py:186
 msgid "Organization search"
 msgstr "Recherche d'organisations"
 
-#: forms_common.py:150 forms_common.py:176 models.py:993
+#: forms_common.py:196 forms_common.py:222 models.py:1534
 #: templates/ishtar/sheet_organization.html:26
 #: templates/ishtar/sheet_person.html:13
 msgid "Surname"
 msgstr "Prénom"
 
-#: forms_common.py:164
+#: forms_common.py:210
 msgid "Person search"
 msgstr "Recherche d'individus"
 
-#: forms_common.py:173
+#: forms_common.py:219
 msgid "Identity"
 msgstr "Identité"
 
-#: forms_common.py:175 forms_common.py:428 models.py:992 models.py:1152
+#: forms_common.py:221 forms_common.py:474 models.py:1532 models.py:1705
 #: 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:193
+#: forms_common.py:239
 msgid "Current organization"
 msgstr "Organisation actuelle"
 
-#: forms_common.py:200 forms_common.py:223 forms_common.py:226 models.py:978
+#: forms_common.py:246 forms_common.py:269 forms_common.py:272 models.py:1517
 msgid "Person type"
 msgstr "Type d'individu"
 
-#: forms_common.py:236 forms_common.py:240
+#: forms_common.py:282 forms_common.py:286
 msgid "Account"
 msgstr "Compte"
 
-#: forms_common.py:243 wizards.py:938
+#: forms_common.py:289 wizards.py:938
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms_common.py:247
+#: forms_common.py:293
 msgid "New password (confirmation)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: forms_common.py:265
+#: forms_common.py:311
 msgid "Your password and confirmation password do not match."
 msgstr "La vérification du mot de passe a échoué."
 
-#: forms_common.py:270
+#: forms_common.py:316
 msgid "You must provide a correct password."
 msgstr "Vous devez fournir un mot de passe correct."
 
-#: forms_common.py:278
+#: forms_common.py:324
 msgid "This username already exists."
 msgstr "Ce nom d'utilisateur existe déjà."
 
-#: forms_common.py:284
+#: forms_common.py:330
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: forms_common.py:292 forms_common.py:304 models.py:1205
+#: forms_common.py:338 forms_common.py:350 models.py:1771
 #: templates/ishtar/sheet_person.html:72
 msgid "Towns"
 msgstr "Communes"
 
-#: forms_common.py:301
+#: forms_common.py:347
 msgid "There are identical towns."
 msgstr "Il y a des communes identiques."
 
-#: forms_common.py:380
+#: forms_common.py:426
 msgid "Only one choice can be checked."
 msgstr "Seul un choix peut être coché."
 
-#: forms_common.py:426
+#: forms_common.py:472
 msgid "Documentation informations"
 msgstr "Information sur le document"
 
-#: forms_common.py:430 forms_common.py:449 models.py:1148
+#: forms_common.py:476 forms_common.py:495 models.py:1243 models.py:1691
 msgid "Source type"
 msgstr "Type de source"
 
-#: forms_common.py:432 models.py:1157
+#: forms_common.py:478 models.py:1718
 msgid "Numerical ressource (web address)"
 msgstr "Ressource numérique (adresse web)"
 
-#: forms_common.py:433 models.py:1159
+#: forms_common.py:479 models.py:1720
 msgid "Receipt date"
 msgstr "Date de réception"
 
-#: forms_common.py:435 models.py:925 models.py:1161
+#: forms_common.py:481 models.py:1353 models.py:1722
 msgid "Creation date"
 msgstr "Date de création"
 
-#: forms_common.py:446 forms_common.py:465 forms_common.py:496 models.py:1134
+#: forms_common.py:492 forms_common.py:511 forms_common.py:542 models.py:1677
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr "Auteur"
 
-#: forms_common.py:458
+#: forms_common.py:504
 msgid "Would you like to delete this documentation?"
 msgstr "Voulez-vous supprimer ce document ?"
 
-#: forms_common.py:472 models.py:1125 models.py:1131
+#: forms_common.py:518 models.py:1244 models.py:1668 models.py:1674
 msgid "Author type"
 msgstr "Type d'auteur"
 
-#: forms_common.py:490
+#: forms_common.py:536
 msgid "Author selection"
 msgstr "Sélection d'auteur"
 
-#: forms_common.py:502
+#: forms_common.py:548
 msgid "There are identical authors."
 msgstr "Il y a des auteurs identiques."
 
-#: forms_common.py:506 models.py:1135 models.py:1154
+#: forms_common.py:552 models.py:1678 models.py:1715
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Authors"
@@ -370,7 +391,7 @@ msgstr "Administration"
 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:864
 msgid "Global variables"
 msgstr "Variables globales"
 
@@ -378,7 +399,7 @@ msgstr "Variables globales"
 msgid "Directory"
 msgstr "Annuaire"
 
-#: ishtar_menu.py:42 ishtar_menu.py:57
+#: ishtar_menu.py:42 ishtar_menu.py:57 templates/ishtar/import_list.html:15
 msgid "Creation"
 msgstr "Ajout"
 
@@ -390,291 +411,525 @@ msgstr "Modification"
 msgid "Merge"
 msgstr "Fusion"
 
-#: ishtar_menu.py:51 ishtar_menu.py:68 widgets.py:81
+#: ishtar_menu.py:51 ishtar_menu.py:68 models.py:1383 widgets.py:107
 msgid "Delete"
 msgstr "Suppression"
 
-#: models.py:148
+#: ishtar_menu.py:75 models.py:1361
+msgid "Imports"
+msgstr "Imports"
+
+#: ishtar_menu.py:77 views.py:871
+msgid "New import"
+msgstr "Nouvel import"
+
+#: ishtar_menu.py:80 views.py:884
+msgid "Current imports"
+msgstr "Imports en cours"
+
+#: ishtar_menu.py:83
+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:239 models.py:884
 msgid "Label"
 msgstr "Libellé"
 
-#: models.py:223
+#: models.py:240
 msgid "Textual ID"
 msgstr "Identifiant textuel"
 
-#: models.py:225
+#: models.py:242 models.py:1729
 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:1207
+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:1208
 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:762 models.py:885
 #: 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:888
 msgid "Department"
 msgstr "Département"
 
-#: models.py:817
+#: models.py:889
 msgid "Departments"
 msgstr "Départements"
 
-#: models.py:842
+#: models.py:914
 msgid "Merge key"
 msgstr "Clé de fusion"
 
-#: models.py:894
+#: models.py:966
 msgid "Organization types"
 msgstr "Types d'organisation"
 
-#: models.py:897 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:971
+msgid "Parcels"
+msgstr "Parcelles"
+
+#: models.py:973
+msgid "Operation source"
+msgstr "Documentation de l'opération"
+
+#: models.py:976 views.py:709 views.py:765
+msgid "Archaeological files"
+msgstr "Dossiers archéologiques"
+
+#: models.py:980 views.py:712 views.py:774
+msgid "Context records"
+msgstr "Unité d'Enregistrement"
+
+#: models.py:1007 models.py:1164 models.py:1728 templates/sheet_ope.html:128
+msgid "Description"
+msgstr "Description"
+
+#: models.py:1009 templates/ishtar/dashboards/dashboard_main.html:26
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: models.py:1011
+msgid "Associated model"
+msgstr "Modèle associé"
+
+#: models.py:1013
+msgid "Is template"
+msgstr "Est un patron"
+
+#: models.py:1015
+msgid "Importer - Type"
+msgstr "Importeur - Type"
+
+#: models.py:1016
+msgid "Importer - Types"
+msgstr "Importeur - Types"
+
+#: models.py:1085
+msgid "Importer - Default"
+msgstr "Importeur - Par défaut"
+
+#: models.py:1086
+msgid "Importer - Defaults"
+msgstr "Importeur - Par défaut"
+
+#: models.py:1112
+msgid "Importer - Default value"
+msgstr "Importeur - Valeur par défaut"
+
+#: models.py:1113
+msgid "Importer - Default values"
+msgstr "Importeur - Valeurs par défaut"
+
+#: models.py:1144
+msgid "Column number"
+msgstr "Numéro de colonne"
+
+#: models.py:1146
+msgid "Required"
+msgstr "Requis"
+
+#: models.py:1148
+msgid "Importer - Column"
+msgstr "Importeur - Colonne"
+
+#: models.py:1149
+msgid "Importer - Columns"
+msgstr "Importeur - Colonnes"
+
+#: models.py:1156
+msgid "Field name"
+msgstr "Nom du champ"
+
+#: models.py:1159
+msgid "Importer - Duplicate field"
+msgstr "Importeur - Champ dupliqué"
+
+#: models.py:1160
+msgid "Importer - Duplicate fields"
+msgstr "Importeur - Champs dupliqués"
+
+#: models.py:1166
+msgid "Regular expression"
+msgstr "Expression régulière"
+
+#: models.py:1168
+msgid "Importer - Regular expression"
+msgstr "Importeur - Expression régulière"
+
+#: models.py:1169
+msgid "Importer - Regular expressions"
+msgstr "Importeur - Expressions régulières"
+
+#: models.py:1183
+msgid "Importer - Target"
+msgstr "Importeur - Cible"
+
+#: models.py:1184
+msgid "Importer - Targets"
+msgstr "Importeur - Cibles"
+
+#: models.py:1209
+msgid "Is set"
+msgstr "Est défini"
+
+#: models.py:1245 models.py:1701 models.py:1711
+msgid "Format"
+msgstr "Format"
+
+#: models.py:1246
+msgid "Operation type"
+msgstr "Type d'opération"
+
+#: models.py:1247
+msgid "Period"
+msgstr "Périodes"
+
+#: models.py:1253
+msgid "Integer"
+msgstr "Entier"
+
+#: models.py:1254
+msgid "Float"
+msgstr "Nombre à virgule"
+
+#: models.py:1255
+msgid "String"
+msgstr "Chaine de caractères"
+
+#: models.py:1256 templates/sheet_ope.html:86
+msgid "Date"
+msgstr "Date"
+
+#: models.py:1258 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:1271
+msgid "4 digit year. e.g.: \"2015\""
+msgstr "Année à 4 chiffres. Exemple : « 2015 »"
+
+#: models.py:1272
+msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
+msgstr "Année à 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
+
+#: models.py:1273
+msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
+msgstr "Jour/mois/année à 4 chiffres. Exemple : « 04/02/2015 »"
+
+#: models.py:1282
+msgid "Options"
+msgstr "Options"
+
+#: models.py:1284
+msgid "Split character(s)"
+msgstr "Caractère de séparation"
+
+#: models.py:1287
+msgid "Importer - Formater type"
+msgstr "Importeur - Type de mise en forme"
+
+#: models.py:1288
+msgid "Importer - Formater types"
+msgstr "Importeur - Types de mise en forme"
+
+#: models.py:1327 templates/ishtar/dashboards/dashboard_main_detail.html:61
 msgid "Created"
 msgstr "Créé"
 
-#: models.py:898
+#: models.py:1328
 msgid "Analyse in progress"
 msgstr "Analyse en cours"
 
-#: models.py:899
+#: models.py:1329
 msgid "Analysed"
 msgstr "Analysé"
 
-#: models.py:900
+#: models.py:1330
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: models.py:901
+#: models.py:1331
 msgid "Import in progress"
 msgstr "Import en cours"
 
-#: models.py:902
+#: models.py:1332
+msgid "Finished with errors"
+msgstr "Finis avec des erreurs"
+
+#: models.py:1333
 msgid "Finished"
 msgstr "Terminé"
 
-#: models.py:906
-#, fuzzy
-msgid "Archaeological files - SRA Pays de la Loire"
-msgstr "Dossiers archéologiques"
-
-#: models.py:907
-msgid "Custom"
-msgstr ""
+#: models.py:1334
+msgid "Archived"
+msgstr "Archivé"
 
-#: models.py:914
+#: models.py:1342
 msgid "Imported file"
 msgstr "Fichier importé"
 
-#: models.py:916
+#: models.py:1345 templates/ishtar/import_list.html:47
 msgid "Error file"
 msgstr "Fichier erreur"
 
-#: models.py:919
+#: models.py:1348
 msgid "Result file"
 msgstr "Fichier résultant"
 
-#: models.py:922
-msgid "Importer type"
-msgstr ""
-
-#: models.py:924
+#: models.py:1351
 msgid "State"
 msgstr "État"
 
-#: models.py:927
+#: models.py:1355
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:929
+#: models.py:1357
 msgid "Seconds remaining"
 msgstr "Secondes restantes"
 
-#: models.py:932
+#: models.py:1360
 msgid "Import"
 msgstr "Import"
 
-#: models.py:933
-msgid "Imports"
-msgstr "Imports"
+#: models.py:1377
+msgid "Analyse"
+msgstr "Analyser"
 
-#: models.py:946
+#: models.py:1379
+msgid "Re-analyse"
+msgstr "Analyser de nouveau "
+
+#: models.py:1380
+msgid "Launch import"
+msgstr "Lancer l'import"
+
+#: models.py:1382
+msgid "Archive"
+msgstr "Archiver"
+
+#: models.py:1485
 msgid "Organizations"
 msgstr "Organisations"
 
-#: models.py:948
+#: models.py:1487
 msgid "Can view all Organization"
 msgstr "Peut voir toutes les Organisations"
 
-#: models.py:949
+#: models.py:1488
 msgid "Can view own Organization"
 msgstr "Peut voir sa propre Organisation"
 
-#: models.py:950
+#: models.py:1489
 msgid "Can add own Organization"
 msgstr "Peut ajouter sa propre Organisation"
 
-#: models.py:951
+#: models.py:1490
 msgid "Can change own Organization"
 msgstr "Peut changer sa propre Organisation"
 
-#: models.py:952
+#: models.py:1491
 msgid "Can delete own Organization"
 msgstr "Peut supprimer sa propre Organisation"
 
-#: models.py:975
+#: models.py:1514
 msgid "Groups"
 msgstr "Groupes"
 
-#: models.py:979
+#: models.py:1518
 msgid "Person types"
 msgstr "Types d'individu"
 
-#: models.py:984
+#: models.py:1524
 msgid "Mr"
 msgstr "M."
 
-#: models.py:985
+#: models.py:1525
 msgid "Miss"
 msgstr "Mlle"
 
-#: models.py:986
+#: models.py:1526
 msgid "Mr and Miss"
 msgstr "M. et Mme"
 
-#: models.py:987
+#: models.py:1527
 msgid "Mrs"
 msgstr "Mme"
 
-#: models.py:988
+#: models.py:1528
 msgid "Doctor"
 msgstr "Dr."
 
-#: models.py:997
+#: models.py:1538
 msgid "Raw name"
-msgstr ""
+msgstr "Nom brut"
 
-#: models.py:999 models.py:1036
+#: models.py:1540 models.py:1577
 msgid "Types"
 msgstr "Types"
 
-#: models.py:1002
+#: models.py:1543
 msgid "Is attached to"
 msgstr "Est rattaché à"
 
-#: models.py:1006
+#: models.py:1547
 msgid "Persons"
 msgstr "Individus"
 
-#: models.py:1008
+#: models.py:1549
 msgid "Can view all Person"
 msgstr "Peut voir toutes les Personnes"
 
-#: models.py:1009
+#: models.py:1550
 msgid "Can view own Person"
 msgstr "Peut voir sa propre Personne"
 
-#: models.py:1010
+#: models.py:1551
 msgid "Can add own Person"
 msgstr "Peut ajouter sa propre Personne"
 
-#: models.py:1011
+#: models.py:1552
 msgid "Can change own Person"
 msgstr "Peut changer sa propre Personne"
 
-#: models.py:1012
+#: models.py:1553
 msgid "Can delete own Person"
 msgstr "Peut supprimer sa propre Personne"
 
-#: models.py:1093
+#: models.py:1636
 msgid "Ishtar user"
 msgstr "Utilisateur d'Ishtar"
 
-#: models.py:1094
+#: models.py:1637
 msgid "Ishtar users"
 msgstr "Utilisateurs d'Ishtar"
 
-#: models.py:1126
+#: models.py:1669
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: models.py:1149
+#: models.py:1692
 msgid "Source types"
 msgstr "Types de source"
 
-#: models.py:1162 templates/ishtar/sheet_person.html:40
+#: models.py:1696
+msgid "Support type"
+msgstr "Type de support"
+
+#: models.py:1697
+msgid "Support types"
+msgstr "Types de support"
+
+#: models.py:1702
+msgid "Formats"
+msgstr "Formats"
+
+#: models.py:1706
+msgid "External ID"
+msgstr "Identifiant extern"
+
+#: models.py:1709
+msgid "Support"
+msgstr "Support"
+
+#: models.py:1713
+msgid "Scale"
+msgstr "Échelle"
+
+#: models.py:1723
+msgid "Item number"
+msgstr "Numéro d'élément"
+
+#: models.py:1724 templates/ishtar/sheet_person.html:40
 #: templates/ishtar/sheet_person.html:67
 msgid "Ref."
 msgstr "Réf."
 
-#: models.py:1164
+#: models.py:1726
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: models.py:1191
+#: models.py:1730
+msgid "Additional information"
+msgstr "Informations supplémentaires"
+
+#: models.py:1757
 msgid "Surface (m²)"
 msgstr "Surface (m²)"
 
-#: models.py:1192 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:1758 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr "Localisation"
 
@@ -720,44 +975,44 @@ msgstr "Non"
 msgid "Details"
 msgstr "Détails"
 
-#: views.py:647 views.py:694
+#: views.py:645 views.py:692
 msgid "Operation not permitted."
 msgstr "Opération non permise."
 
-#: views.py:649
+#: views.py:647
 #, python-format
 msgid "New %s"
 msgstr "Nouveau %s"
 
-#: views.py:711 views.py:767
-msgid "Archaeological files"
-msgstr "Dossiers archéologiques"
-
-#: views.py:712 views.py:771
+#: views.py:710 views.py:769
 msgid "Operations"
 msgstr "Opérations"
 
-#: views.py:714 views.py:776
-msgid "Context records"
-msgstr "Unité d'Enregistrement"
-
-#: views.py:716 views.py:781
+#: views.py:714 views.py:779
 msgid "Finds"
 msgstr "Mobilier"
 
-#: widgets.py:326
+#: views.py:928 templates/ishtar/import_list.html:43
+msgid "Link unmatched items"
+msgstr "Associer les éléments non rapprochés"
+
+#: views.py:942
+msgid "Delete import"
+msgstr "Suppression de l'import"
+
+#: widgets.py:352
 msgid "No results"
 msgstr "Pas de résultats"
 
-#: widgets.py:327
+#: widgets.py:353
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: widgets.py:328
+#: widgets.py:354
 msgid "Remove"
 msgstr "Enlever"
 
-#: wizards.py:227
+#: wizards.py:227 templates/ishtar/import_delete.html:14
 msgid "Yes"
 msgstr "Oui"
 
@@ -827,6 +1082,7 @@ msgid "Lang"
 msgstr "Langue"
 
 #: templates/base.html:39 templates/base.html.py:86
+#: templates/ishtar/import_delete.html:10
 msgid ":"
 msgstr " :"
 
@@ -1009,13 +1265,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"
@@ -1040,10 +1289,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"
@@ -1072,15 +1317,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 dossier"
 
-#: templates/window.html:37 templates/blocks/JQueryJqGrid.html:26
+#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:26
 msgid "Add"
 msgstr "Ajout"
 
@@ -1118,7 +1359,8 @@ msgstr ""
 msgid "Help"
 msgstr "Aide"
 
-#: templates/ishtar/formset.html:8 templates/ishtar/merge.html:31
+#: 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:40
 #: templates/ishtar/wizard/default_wizard.html:28
 #: templates/ishtar/wizard/default_wizard.html:44
@@ -1130,33 +1372,74 @@ msgstr "Aide"
 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 ""
+msgstr "Chaque opération sur ce formulaire est irréversible"
 
 #: templates/ishtar/merge.html:9
 msgid "Page "
-msgstr ""
+msgstr "Page "
 
 #: templates/ishtar/merge.html:17
 msgid "Item A"
-msgstr ""
+msgstr "Élément A"
 
 #: templates/ishtar/merge.html:18
 msgid "Item B"
-msgstr ""
+msgstr "Élément B"
 
 #: templates/ishtar/merge.html:19
 msgid "B is a duplicate of A"
-msgstr ""
+msgstr "B doublonne A"
 
 #: templates/ishtar/merge.html:20
 msgid "A is a duplicate of B"
-msgstr ""
+msgstr "A doublonne B"
 
 #: templates/ishtar/merge.html:21
 msgid "Is not duplicate"
-msgstr ""
+msgstr "N'est pas un doublon"
 
 #: templates/ishtar/sheet.html:21
 msgid "Previous"
@@ -1246,10 +1529,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"
@@ -1363,8 +1642,8 @@ msgstr "Valider et confirmer"
 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, tous vos changements seront "
-"perdus."
+"Le formulaire a changé. Si vous ne le validez pas, tous vos changements "
+"seront perdus."
 
 #: templates/ishtar/wizard/parcels_wizard.html:20
 msgid "all"
@@ -1591,6 +1870,9 @@ msgstr ""
 "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"
 
@@ -1612,9 +1894,6 @@ msgstr ""
 #~ msgid "Context_record"
 #~ msgstr "Unité d'Enregistrement"
 
-#~ msgid "Periods"
-#~ msgstr "Périodes"
-
 #~ msgid "Weight"
 #~ msgstr "Poids"
 
@@ -1684,9 +1963,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 68c5b3b07..e572045db 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1243,7 +1243,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")),
     ]