Update french translation

1 files changed, 335 insertions, 156 deletions

diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 62122c4ad..2a957a357 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-10-30 00:55+0100\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-25 01:39+0100\n"
+"PO-Revision-Date: 2015-01-25\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -44,17 +44,89 @@ msgstr "Unité d'Enregistrement"
 msgid "Find"
 msgstr "Mobilier"
 
+#: data_importer.py:117
+#, 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." 
+
+#: data_importer.py:129
+#, python-format
+msgid "\"%(value)s\" not equal to yes or no"
+msgstr "\"%(value)s\" diffère de oui ou non" 
+
+#: data_importer.py:140
+#, 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
+#, python-format
+msgid "\"%(value)s\" is not a valid date"
+msgstr "\"%(value)s\" n'est pas une date valide" 
+
+#: data_importer.py:175
+#, python-format
+msgid "\"%(value)s\" is not an integer"
+msgstr "\"%(value)s\" n'est pas un entier" 
+
+#: data_importer.py:203
+#, 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
+#, python-format
+msgid "%d. None of the above"
+msgstr "%d. Aucun de ceux-là"
+
+#: data_importer.py:260
+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 "
+"l'encodage sont similaires à ceux du fichier de référence."
+
+#: data_importer.py:264
+#, 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
+msgid "No data provided"
+msgstr "Aucune donnée fournie"
+
+#: data_importer.py:267
+msgid "Value is required"
+msgstr "Valeur requise"
+
+#: data_importer.py:268
+#, python-format
+msgid "At least %d columns must be filled"
+msgstr "Au moins %d colonnes doivent être remplies"
+
+#: data_importer.py:269
+msgid "The regexp doesn't match."
+msgstr "L'expression régulière ne fonctionne pas"
+
+#: data_importer.py:857
+#, python-format
+msgid "\"%(value)s\" not in %(values)s"
+msgstr "\"%(value)s\" n'est pas dans %(values)s"
+
 #: forms.py:63
 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:282
+#: forms.py:76 forms_common.py:283
 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."
@@ -62,7 +134,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."
@@ -72,18 +144,18 @@ msgstr "Vous devez sélectionner un élément."
 msgid "Add a new item"
 msgstr "Ajouter un nouvel élément"
 
-#: forms.py:164 models.py:762
+#: forms.py:164 models.py:780
 msgid "Template"
 msgstr "Patron"
 
-#: forms_common.py:42 forms_common.py:104 forms_common.py:185
-#: forms_common.py:190 models.py:811 models.py:1066
+#: forms_common.py:43 forms_common.py:105 forms_common.py:186
+#: forms_common.py:191 models.py:829 models.py:1204
 #: templates/ishtar/sheet_organization.html:17
 #: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
 msgid "Town"
 msgstr "Commune"
 
-#: forms_common.py:43
+#: forms_common.py:44
 msgid ""
 "<p>Type name, department code and/or postal code of the town you would like "
 "to select. The search is insensitive to case.</p>\n"
@@ -95,74 +167,74 @@ 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:56 forms_common.py:354 ishtar_menu.py:40 models.py:884
-#: models.py:951 models.py:991 templates/ishtar/sheet_person.html:6
+#: 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
 msgid "Person"
 msgstr "Individu"
 
-#: forms_common.py:92 forms_common.py:152 ishtar_menu.py:52 models.py:836
+#: forms_common.py:93 forms_common.py:153 ishtar_menu.py:55 models.py:945
 #: templates/ishtar/sheet_organization.html:6
 msgid "Organization"
 msgstr "Organisation"
 
-#: forms_common.py:94 forms_common.py:130 forms_common.py:148
-#: forms_common.py:177 models.py:761 models.py:831 models.py:877
-#: models.py:1052 templates/ishtar/sheet_organization.html:12
+#: 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
 #: 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:96 models.py:825
+#: forms_common.py:97 models.py:893
 msgid "Organization type"
 msgstr "Type d'organisation"
 
-#: forms_common.py:98 forms_common.py:179 models.py:806
+#: forms_common.py:99 forms_common.py:180 models.py:824
 #: 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:100 forms_common.py:181 models.py:807
+#: forms_common.py:101 forms_common.py:182 models.py:825
 #: 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:102 forms_common.py:183 models.py:809
+#: forms_common.py:103 forms_common.py:184 models.py:827
 #: 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:105 forms_common.py:186 models.py:812
+#: forms_common.py:106 forms_common.py:187 models.py:830
 msgid "Country"
 msgstr "Pays"
 
-#: forms_common.py:107 forms_common.py:150 forms_common.py:188
-#: forms_common.py:240 models.py:817 templates/ishtar/sheet_person.html:15
+#: 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
 msgid "Email"
 msgstr "Courriel"
 
-#: forms_common.py:108 forms_common.py:189 models.py:814
+#: forms_common.py:109 forms_common.py:190 models.py:832
 #: 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:109 models.py:815
+#: forms_common.py:110 models.py:833
 #: 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:131 forms_common.py:151 models.py:833 models.py:1015
+#: 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
 #: templates/ishtar/sheet_person.html:42 templates/ishtar/sheet_person.html:95
@@ -170,117 +242,121 @@ msgstr "Téléphone portable"
 msgid "Type"
 msgstr "Type"
 
-#: forms_common.py:139
+#: forms_common.py:140
 msgid "Organization search"
 msgstr "Recherche d'organisations"
 
-#: forms_common.py:149 forms_common.py:175 models.py:875
+#: forms_common.py:150 forms_common.py:176 models.py:993
 #: templates/ishtar/sheet_organization.html:26
 #: templates/ishtar/sheet_person.html:13
 msgid "Surname"
 msgstr "Prénom"
 
-#: forms_common.py:163
+#: forms_common.py:164
 msgid "Person search"
 msgstr "Recherche d'individus"
 
-#: forms_common.py:172
+#: forms_common.py:173
 msgid "Identity"
 msgstr "Identité"
 
-#: forms_common.py:174 forms_common.py:311 models.py:874 models.py:1014
+#: forms_common.py:175 forms_common.py:428 models.py:992 models.py:1152
 #: 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:192
+#: forms_common.py:193
 msgid "Current organization"
 msgstr "Organisation actuelle"
 
-#: forms_common.py:199 forms_common.py:222 forms_common.py:225 models.py:861
+#: forms_common.py:200 forms_common.py:223 forms_common.py:226 models.py:978
 msgid "Person type"
 msgstr "Type d'individu"
 
-#: forms_common.py:235 forms_common.py:239
+#: forms_common.py:236 forms_common.py:240
 msgid "Account"
 msgstr "Compte"
 
-#: forms_common.py:242 wizards.py:938
+#: forms_common.py:243 wizards.py:938
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms_common.py:246
+#: forms_common.py:247
 msgid "New password (confirmation)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: forms_common.py:264
+#: forms_common.py:265
 msgid "Your password and confirmation password do not match."
 msgstr "La vérification du mot de passe a échoué."
 
-#: forms_common.py:269
+#: forms_common.py:270
 msgid "You must provide a correct password."
 msgstr "Vous devez fournir un mot de passe correct."
 
-#: forms_common.py:277
+#: forms_common.py:278
 msgid "This username already exists."
 msgstr "Ce nom d'utilisateur existe déjà."
 
-#: forms_common.py:283
+#: forms_common.py:284
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: forms_common.py:291 forms_common.py:303 models.py:1067
+#: forms_common.py:292 forms_common.py:304 models.py:1205
 #: templates/ishtar/sheet_person.html:72
 msgid "Towns"
 msgstr "Communes"
 
-#: forms_common.py:300
+#: forms_common.py:301
 msgid "There are identical towns."
 msgstr "Il y a des communes identiques."
 
-#: forms_common.py:309
+#: forms_common.py:380
+msgid "Only one choice can be checked."
+msgstr "Seul un choix peut être coché."
+
+#: forms_common.py:426
 msgid "Documentation informations"
 msgstr "Information sur le document"
 
-#: forms_common.py:313 forms_common.py:332 models.py:1010
+#: forms_common.py:430 forms_common.py:449 models.py:1148
 msgid "Source type"
 msgstr "Type de source"
 
-#: forms_common.py:315 models.py:1019
+#: forms_common.py:432 models.py:1157
 msgid "Numerical ressource (web address)"
 msgstr "Ressource numérique (adresse web)"
 
-#: forms_common.py:316 models.py:1021
+#: forms_common.py:433 models.py:1159
 msgid "Receipt date"
 msgstr "Date de réception"
 
-#: forms_common.py:318 models.py:1023
+#: forms_common.py:435 models.py:925 models.py:1161
 msgid "Creation date"
 msgstr "Date de création"
 
-#: forms_common.py:329 forms_common.py:348 forms_common.py:379 models.py:996
+#: forms_common.py:446 forms_common.py:465 forms_common.py:496 models.py:1134
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr "Auteur"
 
-#: forms_common.py:341
+#: forms_common.py:458
 msgid "Would you like to delete this documentation?"
-msgstr "Voulez vous supprimer ce document ?"
+msgstr "Voulez-vous supprimer ce document ?"
 
-#: forms_common.py:355 models.py:987 models.py:993
+#: forms_common.py:472 models.py:1125 models.py:1131
 msgid "Author type"
 msgstr "Type d'auteur"
 
-#: forms_common.py:373
+#: forms_common.py:490
 msgid "Author selection"
 msgstr "Sélection d'auteur"
 
-#: forms_common.py:385
+#: forms_common.py:502
 msgid "There are identical authors."
 msgstr "Il y a des auteurs identiques."
 
-#: forms_common.py:389 models.py:997 models.py:1016
+#: forms_common.py:506 models.py:1135 models.py:1154
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Authors"
@@ -290,11 +366,11 @@ msgstr "Auteurs"
 msgid "Administration"
 msgstr "Administration"
 
-#: ishtar_menu.py:30 views.py:125
+#: ishtar_menu.py:30 views.py:122
 msgid "Account management"
 msgstr "Gestion des comptes"
 
-#: ishtar_menu.py:33 models.py:552 templates/ishtar/formset.html:4
+#: ishtar_menu.py:33 models.py:570 templates/ishtar/formset.html:4
 msgid "Global variables"
 msgstr "Variables globales"
 
@@ -302,218 +378,303 @@ msgstr "Variables globales"
 msgid "Directory"
 msgstr "Annuaire"
 
-#: ishtar_menu.py:42 ishtar_menu.py:54
+#: ishtar_menu.py:42 ishtar_menu.py:57
 msgid "Creation"
 msgstr "Ajout"
 
-#: ishtar_menu.py:45 ishtar_menu.py:58
+#: ishtar_menu.py:45 ishtar_menu.py:61
 msgid "Modification"
 msgstr "Modification"
 
-#: ishtar_menu.py:48 ishtar_menu.py:62 widgets.py:81
+#: ishtar_menu.py:48 ishtar_menu.py:65 templates/ishtar/merge.html:5
+msgid "Merge"
+msgstr "Fusion"
+
+#: ishtar_menu.py:51 ishtar_menu.py:68 widgets.py:81
 msgid "Delete"
-msgstr "Supprimer"
+msgstr "Suppression"
 
-#: models.py:139
+#: models.py:148
 msgid "Not a valid item."
 msgstr "Élément invalide."
 
-#: models.py:151
+#: models.py:160
 msgid "An item selected is not a valid item."
 msgstr "Un élément sélectionné n'est pas valide."
 
-#: models.py:161
+#: models.py:170
 msgid "This item already exist."
 msgstr "Cet élément existe déjà."
 
-#: models.py:213 models.py:794
+#: models.py:222 models.py:812
 msgid "Label"
 msgstr "Libellé"
 
-#: models.py:214
+#: models.py:223
 msgid "Textual ID"
 msgstr "Identifiant textuel"
 
-#: models.py:216
+#: models.py:225
 msgid "Comment"
 msgstr "Commentaire"
 
-#: models.py:217 models.py:765
+#: models.py:226 models.py:783
 msgid "Available"
 msgstr "Disponible"
 
-#: models.py:399
+#: models.py:415
 msgid "Last editor"
 msgstr "Dernier éditeur"
 
-#: models.py:401
+#: models.py:419
 msgid "Creator"
 msgstr "Créateur"
 
-#: models.py:546
+#: models.py:564
 msgid "Variable name"
 msgstr "Nom de la variable"
 
-#: models.py:547
+#: models.py:565
 msgid "Description of the variable"
 msgstr "Description de la variable"
 
-#: models.py:549
+#: models.py:567
 msgid "Value"
 msgstr "Valeur"
 
-#: models.py:551
+#: models.py:569
 msgid "Global variable"
 msgstr "Variables globales"
 
-#: models.py:666 models.py:697
+#: models.py:684 models.py:715
 msgid "Total"
 msgstr "Total"
 
-#: models.py:673 models.py:795
+#: models.py:691 models.py:813
 #: templates/ishtar/dashboards/dashboard_main_detail.html:135
 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
 msgid "Number"
 msgstr "Nombre"
 
-#: models.py:760
+#: models.py:778
 msgid "Administrative Act"
 msgstr "Acte administratif"
 
-#: models.py:763
+#: models.py:781
 msgid "Associated object"
 msgstr "Objet associé"
 
-#: models.py:768
+#: models.py:786
 msgid "Document template"
 msgstr "Patron de document"
 
-#: models.py:769
+#: models.py:787
 msgid "Document templates"
 msgstr "Patrons de documents"
 
-#: models.py:798
+#: models.py:816
 msgid "Department"
 msgstr "Département"
 
-#: models.py:799
+#: models.py:817
 msgid "Departments"
 msgstr "Départements"
 
-#: models.py:826
+#: models.py:842
+msgid "Merge key"
+msgstr "Clé de fusion"
+
+#: models.py:894
 msgid "Organization types"
 msgstr "Types d'organisation"
 
-#: models.py:837
+#: models.py:897 templates/ishtar/dashboards/dashboard_main_detail.html:61
+msgid "Created"
+msgstr "Créé"
+
+#: models.py:898
+msgid "Analyse in progress"
+msgstr "Analyse en cours"
+
+#: models.py:899
+msgid "Analysed"
+msgstr "Analysé"
+
+#: models.py:900
+msgid "Import pending"
+msgstr "Import en attente"
+
+#: models.py:901
+msgid "Import in progress"
+msgstr "Import en cours"
+
+#: models.py:902
+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:914
+msgid "Imported file"
+msgstr "Fichier importé"
+
+#: models.py:916
+msgid "Error file"
+msgstr "Fichier erreur"
+
+#: models.py:919
+msgid "Result file"
+msgstr "Fichier résultant"
+
+#: models.py:922
+msgid "Importer type"
+msgstr ""
+
+#: models.py:924
+msgid "State"
+msgstr "État"
+
+#: models.py:927
+msgid "End date"
+msgstr "Date de fin"
+
+#: models.py:929
+msgid "Seconds remaining"
+msgstr "Secondes restantes"
+
+#: models.py:932
+msgid "Import"
+msgstr "Import"
+
+#: models.py:933
+msgid "Imports"
+msgstr "Imports"
+
+#: models.py:946
 msgid "Organizations"
 msgstr "Organisations"
 
-#: models.py:839
+#: models.py:948
 msgid "Can view all Organization"
 msgstr "Peut voir toutes les Organisations"
 
-#: models.py:840
+#: models.py:949
 msgid "Can view own Organization"
 msgstr "Peut voir sa propre Organisation"
 
-#: models.py:841
+#: models.py:950
 msgid "Can add own Organization"
 msgstr "Peut ajouter sa propre Organisation"
 
-#: models.py:842
+#: models.py:951
 msgid "Can change own Organization"
 msgstr "Peut changer sa propre Organisation"
 
-#: models.py:843
+#: models.py:952
 msgid "Can delete own Organization"
 msgstr "Peut supprimer sa propre Organisation"
 
-#: models.py:858
+#: models.py:975
 msgid "Groups"
 msgstr "Groupes"
 
-#: models.py:862
+#: models.py:979
 msgid "Person types"
 msgstr "Types d'individu"
 
-#: models.py:867
+#: models.py:984
 msgid "Mr"
 msgstr "M."
 
-#: models.py:868
+#: models.py:985
 msgid "Miss"
 msgstr "Mlle"
 
-#: models.py:869
+#: models.py:986
+msgid "Mr and Miss"
+msgstr "M. et Mme"
+
+#: models.py:987
 msgid "Mrs"
 msgstr "Mme"
 
-#: models.py:870
+#: models.py:988
 msgid "Doctor"
 msgstr "Dr."
 
-#: models.py:878 models.py:913
+#: models.py:997
+msgid "Raw name"
+msgstr ""
+
+#: models.py:999 models.py:1036
 msgid "Types"
 msgstr "Types"
 
-#: models.py:881
+#: models.py:1002
 msgid "Is attached to"
 msgstr "Est rattaché à"
 
-#: models.py:885
+#: models.py:1006
 msgid "Persons"
 msgstr "Individus"
 
-#: models.py:887
+#: models.py:1008
 msgid "Can view all Person"
 msgstr "Peut voir toutes les Personnes"
 
-#: models.py:888
+#: models.py:1009
 msgid "Can view own Person"
 msgstr "Peut voir sa propre Personne"
 
-#: models.py:889
+#: models.py:1010
 msgid "Can add own Person"
 msgstr "Peut ajouter sa propre Personne"
 
-#: models.py:890
+#: models.py:1011
 msgid "Can change own Person"
 msgstr "Peut changer sa propre Personne"
 
-#: models.py:891
+#: models.py:1012
 msgid "Can delete own Person"
 msgstr "Peut supprimer sa propre Personne"
 
-#: models.py:955
+#: models.py:1093
 msgid "Ishtar user"
 msgstr "Utilisateur d'Ishtar"
 
-#: models.py:956
+#: models.py:1094
 msgid "Ishtar users"
 msgstr "Utilisateurs d'Ishtar"
 
-#: models.py:988
+#: models.py:1126
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: models.py:1011
+#: models.py:1149
 msgid "Source types"
 msgstr "Types de source"
 
-#: models.py:1024 templates/ishtar/sheet_person.html:40
+#: models.py:1162 templates/ishtar/sheet_person.html:40
 #: templates/ishtar/sheet_person.html:67
 msgid "Ref."
 msgstr "Réf."
 
-#: models.py:1026
+#: models.py:1164
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: models.py:1053
+#: models.py:1191
 msgid "Surface (m²)"
-msgstr "Area (m²)"
+msgstr "Surface (m²)"
 
-#: models.py:1054 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:1192 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr "Localisation"
 
@@ -521,66 +682,66 @@ msgstr "Localisation"
 msgid " (...)"
 msgstr " (...)"
 
-#: views.py:85
+#: views.py:82
 msgid "New person"
 msgstr "Nouvelle personne"
 
-#: views.py:93
+#: views.py:90
 msgid "Person modification"
 msgstr "Modification d'une personne"
 
-#: views.py:99
+#: views.py:96
 msgid "Person deletion"
-msgstr "Suppresion de personne"
+msgstr "Suppression de personne"
 
-#: views.py:105
+#: views.py:102
 msgid "New organization"
 msgstr "Nouvelle organisation"
 
-#: views.py:112
+#: views.py:109
 msgid "Organization modification"
 msgstr "Modification d'une organisation"
 
-#: views.py:118
+#: views.py:115
 msgid "Organization deletion"
-msgstr "Suppresion d'une organisation"
+msgstr "Suppression d'une organisation"
 
-#: views.py:215
+#: views.py:212
 msgid "True"
 msgstr "Oui"
 
-#: views.py:217
+#: views.py:214
 msgid "False"
 msgstr "Non"
 
-#: views.py:440 templates/base.html:75
+#: views.py:437 templates/base.html:75
 #: 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:650 views.py:697
+#: views.py:647 views.py:694
 msgid "Operation not permitted."
-msgstr "Opération non permise"
+msgstr "Opération non permise."
 
-#: views.py:652
+#: views.py:649
 #, python-format
 msgid "New %s"
 msgstr "Nouveau %s"
 
-#: views.py:714 views.py:770
+#: views.py:711 views.py:767
 msgid "Archaeological files"
 msgstr "Dossiers archéologiques"
 
-#: views.py:715 views.py:774
+#: views.py:712 views.py:771
 msgid "Operations"
 msgstr "Opérations"
 
-#: views.py:717 views.py:779
+#: views.py:714 views.py:776
 msgid "Context records"
 msgstr "Unité d'Enregistrement"
 
-#: views.py:719 views.py:784
+#: views.py:716 views.py:781
 msgid "Finds"
 msgstr "Mobilier"
 
@@ -746,7 +907,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"
@@ -917,7 +1078,7 @@ 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
 msgid "Add"
@@ -957,10 +1118,10 @@ msgstr ""
 msgid "Help"
 msgstr "Aide"
 
-#: templates/ishtar/formset.html:8
+#: 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:43
+#: templates/ishtar/wizard/default_wizard.html:44
 #: templates/ishtar/wizard/parcels_wizard.html:12
 #: templates/ishtar/wizard/parcels_wizard.html:27
 #: templates/ishtar/wizard/search.html:13
@@ -969,6 +1130,34 @@ msgstr "Aide"
 msgid "Validate"
 msgstr "Valider"
 
+#: templates/ishtar/merge.html:7
+msgid "Every operation on this form is irreversible"
+msgstr ""
+
+#: templates/ishtar/merge.html:9
+msgid "Page "
+msgstr ""
+
+#: templates/ishtar/merge.html:17
+msgid "Item A"
+msgstr ""
+
+#: templates/ishtar/merge.html:18
+msgid "Item B"
+msgstr ""
+
+#: templates/ishtar/merge.html:19
+msgid "B is a duplicate of A"
+msgstr ""
+
+#: templates/ishtar/merge.html:20
+msgid "A is a duplicate of B"
+msgstr ""
+
+#: templates/ishtar/merge.html:21
+msgid "Is not duplicate"
+msgstr ""
+
 #: templates/ishtar/sheet.html:21
 msgid "Previous"
 msgstr "Précédent"
@@ -996,7 +1185,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)"
@@ -1124,10 +1313,6 @@ msgstr "Par opérations"
 msgid "Created last"
 msgstr "Derniers créés"
 
-#: templates/ishtar/dashboards/dashboard_main_detail.html:61
-msgid "Created"
-msgstr "Créé"
-
 #: templates/ishtar/dashboards/dashboard_main_detail.html:65
 #: templates/ishtar/dashboards/dashboard_main_detail.html:76
 msgid "Show"
@@ -1160,7 +1345,7 @@ msgstr "Vous avez entré les informations suivantes :"
 
 #: templates/ishtar/wizard/confirm_wizard.html:39
 msgid "Would you like to save them?"
-msgstr "Voulez vous sauver ces informations ?"
+msgstr "Voulez-vous sauver ces informations ?"
 
 #: templates/ishtar/wizard/default_wizard.html:34
 #: templates/ishtar/wizard/parcels_wizard.html:24
@@ -1169,17 +1354,17 @@ msgstr "Voulez vous sauver ces informations ?"
 msgid "Add/Modify"
 msgstr "Ajouter-Modifier"
 
-#: templates/ishtar/wizard/default_wizard.html:44
+#: 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:54
+#: 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
 msgid "all"
@@ -1195,7 +1380,7 @@ msgstr "Pas de commune dans le dossier associé."
 
 #: 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"
@@ -1312,11 +1497,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."
@@ -1394,7 +1579,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"
@@ -1403,12 +1588,9 @@ 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 "URL name"
-#~ msgstr "Nom de l'URL"
-
 #~ msgid "Wizard"
 #~ msgstr "Assistant"
 
@@ -1529,9 +1711,6 @@ msgstr ""
 #~ msgid "In charge:"
 #~ msgstr "Responsable :"
 
-#~ msgid "Closed file"
-#~ msgstr "Dossier clos"
-
 #~ msgid "Planed surface:"
 #~ msgstr "Surface envisagé :"