summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-11-17 19:31:54 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-11-17 19:31:54 +0100
commit8af8e41836ba5eebc6d1d7c784b05a0f5d8672ab (patch)
treed6ad52c536ef33e3a50534ae470031a352025bc9
parent00bcf6e97dab7bc3c23248d3073a56221571c365 (diff)
downloadIshtar-8af8e41836ba5eebc6d1d7c784b05a0f5d8672ab.tar.bz2
Ishtar-8af8e41836ba5eebc6d1d7c784b05a0f5d8672ab.zip
Update french translation
-rw-r--r--archaeological_context_records/locale/fr/LC_MESSAGES/django.po103
-rw-r--r--archaeological_files/locale/fr/LC_MESSAGES/django.po260
-rw-r--r--archaeological_finds/locale/fr/LC_MESSAGES/django.po230
-rw-r--r--archaeological_operations/locale/fr/LC_MESSAGES/django.po270
-rw-r--r--archaeological_warehouse/locale/fr/LC_MESSAGES/django.po2
-rw-r--r--ishtar_common/locale/fr/LC_MESSAGES/django.po594
6 files changed, 781 insertions, 678 deletions
diff --git a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po
index 93c3f5acc..d3d8e1d5b 100644
--- a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_context_records/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-09-30 20:22+0200\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2015-01-24\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: forms.py:43 forms.py:96 models.py:119
+#: forms.py:43 forms.py:96 models.py:123
#: templates/ishtar/sheet_contextrecord.html:72
msgid "ID"
msgstr "Identifiant"
@@ -47,7 +47,7 @@ msgstr "Type d'unité"
msgid "Parcel (section/number)"
msgstr "Parcelle (section/numéro)"
-#: forms.py:71 forms.py:229 views.py:60
+#: forms.py:71 forms.py:229 views.py:68
msgid "Context record search"
msgstr "Recherche d'Unité d'Enregistrement"
@@ -59,36 +59,37 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
msgid "General"
msgstr "Général"
-#: forms.py:95 models.py:115 templates/ishtar/sheet_contextrecord.html:76
+#: forms.py:95 models.py:116 models.py:119
+#: templates/ishtar/sheet_contextrecord.html:76
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:98 models.py:120 templates/ishtar/sheet_contextrecord.html:42
+#: forms.py:98 models.py:124 templates/ishtar/sheet_contextrecord.html:42
#: templates/ishtar/sheet_contextrecord.html:75
msgid "Description"
msgstr "Description"
-#: forms.py:100 models.py:125
+#: forms.py:100 models.py:129
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:101 models.py:126
+#: forms.py:101 models.py:130
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:102 models.py:127
+#: forms.py:102 models.py:131
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: forms.py:103 models.py:129
+#: forms.py:103 models.py:133
msgid "Depth (cm)"
msgstr "Profondeur (cm)"
-#: forms.py:104 models.py:135
+#: forms.py:104 models.py:139
msgid "Unit"
msgstr "Unité"
-#: forms.py:106 models.py:131
+#: forms.py:106 models.py:135
msgid "Location"
msgstr "Lieu"
@@ -104,7 +105,7 @@ msgstr "Datation"
msgid "Start date"
msgstr "Date de début"
-#: forms.py:164 models.py:49 models.py:124
+#: forms.py:164 models.py:49 models.py:128
msgid "End date"
msgstr "Date de fin"
@@ -116,40 +117,40 @@ msgstr "Qualité"
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:185 forms.py:192 models.py:140
+#: forms.py:185 forms.py:192 models.py:144
#: templates/ishtar/sheet_contextrecord.html:52
msgid "Interpretation"
msgstr "Interprétation"
-#: forms.py:188 models.py:137
+#: forms.py:188 models.py:141
msgid "Has furniture?"
msgstr "Contient du mobilier ?"
-#: forms.py:190 models.py:139
+#: forms.py:190 models.py:143
msgid "Filling"
msgstr "Remplissage"
-#: forms.py:194 models.py:160
+#: forms.py:194 models.py:164
msgid "Activity"
msgstr "Activité"
-#: forms.py:196 models.py:158
+#: forms.py:196 models.py:162
msgid "Identification"
msgstr "Identification"
-#: forms.py:198 models.py:143
+#: forms.py:198 models.py:147
msgid "TAQ"
msgstr "TAQ"
-#: forms.py:199 models.py:147
+#: forms.py:199 models.py:151
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: forms.py:201 models.py:150
+#: forms.py:201 models.py:154
msgid "TPQ"
msgstr "TPQ"
-#: forms.py:202 models.py:154
+#: forms.py:202 models.py:158
msgid "Estimated TPQ"
msgstr "TPQ estimé"
@@ -193,7 +194,7 @@ msgstr "Recherche de document"
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: ishtar_menu.py:27 models.py:306
+#: ishtar_menu.py:27 models.py:310
msgid "Context record"
msgstr "Unité d'Enregistrement"
@@ -273,27 +274,27 @@ msgstr "Type d'identification"
msgid "Types Identification"
msgstr "Types d'identification"
-#: models.py:113
+#: models.py:117
msgid "External ID"
msgstr "ID externe"
-#: models.py:117 wizards.py:60
+#: models.py:121 wizards.py:60
msgid "Operation"
msgstr "Opération"
-#: models.py:121
+#: models.py:125
msgid "Comment"
msgstr "Commentaires"
-#: models.py:122
+#: models.py:126
msgid "Date d'ouverture"
msgstr "Date d'ouverture"
-#: models.py:132
+#: models.py:136
msgid "A short description of the location of the context record"
msgstr "Une courte description de la situation de l'Unité d'Enregistrement"
-#: models.py:144
+#: models.py:148
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -301,11 +302,11 @@ msgstr ""
"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée "
"après cette date"
-#: models.py:148
+#: models.py:152
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »"
-#: models.py:151
+#: models.py:155
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -313,88 +314,88 @@ msgstr ""
"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée "
"avant cette date"
-#: models.py:155
+#: models.py:159
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »"
-#: models.py:166 models.py:167 templates/ishtar/sheet_contextrecord.html:6
+#: models.py:170 models.py:171 templates/ishtar/sheet_contextrecord.html:6
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:169
+#: models.py:173
msgid "Can view all Context Record"
msgstr "Peut voir toutes les Unités d'Enregistrement"
-#: models.py:171
+#: models.py:175
msgid "Can view own Context Record"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: models.py:173
+#: models.py:177
msgid "Can add own Context Record"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: models.py:175
+#: models.py:179
msgid "Can change own Context Record"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: models.py:177
+#: models.py:181
msgid "Can delete own Context Record"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: models.py:186
+#: models.py:190
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: models.py:278
+#: models.py:282
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:282 templates/ishtar/sheet_contextrecord.html:71
+#: models.py:286 templates/ishtar/sheet_contextrecord.html:71
msgid "Relation type"
msgstr "Type de relation"
-#: models.py:283
+#: models.py:287
msgid "Relation types"
msgstr "Types de relation"
-#: models.py:295
+#: models.py:299
msgid "Record relation"
msgstr "Relation entre Unités d'Enregistrement"
-#: models.py:296
+#: models.py:300
msgid "Record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: models.py:303
+#: models.py:307
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: models.py:304
+#: models.py:308
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
-#: views.py:69
+#: views.py:77
msgid "New context record"
msgstr "Nouvelle Unité d'Enregistrement"
-#: views.py:78
+#: views.py:86
msgid "Context record modification"
msgstr "Modification d'une Unité d'Enregistrement"
-#: views.py:92
+#: views.py:100
msgid "Context record deletion"
msgstr "Suppression d'une Unité d'Enregistrement"
-#: views.py:100
+#: views.py:108
msgid "Context record: new source"
msgstr "Unité d'Enregistrement : nouvelle documentation associée"
-#: views.py:108
+#: views.py:116
msgid "Context record: source modification"
msgstr "Unité d'Enregistrement : modification d'une documentation associée"
-#: views.py:114
+#: views.py:122
msgid "Context record: source deletion"
msgstr "Unité d'Enregistrement : suppression d'une documentation associée"
diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po
index 9342f673d..e0de374b5 100644
--- a/archaeological_files/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_files/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-09-30 20:22+0200\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -19,11 +19,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: forms.py:51 forms.py:191 forms.py:235 forms.py:376 forms.py:421
-#: models.py:74 templates/ishtar/sheet_file.html:132
+#: models.py:75 templates/ishtar/sheet_file.html:137
msgid "Year"
msgstr "Année"
-#: forms.py:52 forms.py:196 forms.py:237 forms.py:420 models.py:77
+#: forms.py:52 forms.py:196 forms.py:237 forms.py:420 models.py:78
msgid "Numeric reference"
msgstr "Référence numérique"
@@ -35,7 +35,7 @@ msgstr "Autre référence"
msgid "File name"
msgstr "Nom du dossier"
-#: forms.py:57 forms.py:137 forms.py:202 models.py:81
+#: forms.py:57 forms.py:137 forms.py:202 models.py:84
msgid "File type"
msgstr "Type de dossier"
@@ -51,7 +51,7 @@ msgstr "Parcelle (section/numéro)"
msgid "Is active?"
msgstr "Est actif ?"
-#: forms.py:62 forms.py:267 forms.py:403 models.py:88
+#: forms.py:62 forms.py:267 forms.py:403 models.py:91
msgid "General contractor"
msgstr "Aménageur"
@@ -59,7 +59,7 @@ msgstr "Aménageur"
msgid "Organization of general contractor"
msgstr "Organisation de l'aménageur"
-#: forms.py:76 forms.py:425 templates/ishtar/sheet_file.html:109
+#: forms.py:76 forms.py:425 templates/ishtar/sheet_file.html:114
msgid "In charge"
msgstr "Responsable"
@@ -67,7 +67,7 @@ msgstr "Responsable"
msgid "Created by"
msgstr "Créé par"
-#: forms.py:90 forms.py:292 forms.py:433 models.py:114
+#: forms.py:90 forms.py:292 forms.py:433 models.py:117
msgid "Permit reference"
msgstr "Référence du permis"
@@ -79,11 +79,11 @@ msgstr "Recherche de dossiers archéologiques"
msgid "You should select a file."
msgstr "Vous devez sélectionner un dossier archéologique."
-#: forms.py:125 forms.py:200 models.py:120
+#: forms.py:125 forms.py:200 models.py:123
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:126 forms.py:302 models.py:122
+#: forms.py:126 forms.py:302 models.py:125
msgid "Reception date"
msgstr "Date de réception"
@@ -111,27 +111,27 @@ msgstr "Date avant"
msgid "General"
msgstr "Général"
-#: forms.py:185 models.py:83
+#: forms.py:185 models.py:86
msgid "Person in charge"
msgstr "Responsable"
-#: forms.py:199 models.py:80
+#: forms.py:199 models.py:83
msgid "Name"
msgstr "Nom"
-#: forms.py:204 models.py:124
+#: forms.py:204 models.py:127
msgid "Related file"
msgstr "Dossier en relation avec"
-#: forms.py:208 forms.py:346 models.py:143 templates/ishtar/sheet_file.html:93
+#: forms.py:208 forms.py:346 models.py:146 templates/ishtar/sheet_file.html:98
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:212 models.py:134
+#: forms.py:212 models.py:137
msgid "Total surface (m²)"
msgstr "Surface totale des terrains (m²)"
-#: forms.py:215 models.py:140
+#: forms.py:215 models.py:143
msgid "Main address"
msgstr "Adresse des terrains"
@@ -152,32 +152,32 @@ msgstr "Un autre dossier avec cet identifiant numérique existe."
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: forms.py:279 models.py:100
+#: forms.py:279 models.py:103
msgid "Responsible for town planning service"
msgstr "Responsable au service instructeur"
-#: forms.py:289 models.py:56 models.py:112
+#: forms.py:289 models.py:57 models.py:115
msgid "Permit type"
msgstr "Type de permis"
-#: forms.py:295 models.py:137
+#: forms.py:295 models.py:140
msgid "Total developed surface (m²)"
msgstr "Surface totale aménagée (m²)"
-#: forms.py:314 templates/ishtar/sheet_file.html:83
+#: forms.py:314 templates/ishtar/sheet_file.html:88
#: templates/ishtar/dashboards/dashboard_file.html:42
msgid "Research archaeology"
msgstr "Archéologie programmée"
-#: forms.py:322 models.py:146 templates/ishtar/sheet_file.html:84
+#: forms.py:322 models.py:149 templates/ishtar/sheet_file.html:89
msgid "Departments"
msgstr "Départements"
-#: forms.py:333 models.py:155
+#: forms.py:333 models.py:158
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:335 models.py:149 templates/ishtar/sheet_file.html:86
+#: forms.py:335 models.py:152 templates/ishtar/sheet_file.html:91
msgid "Requested operation type"
msgstr "Type d'opération demandée"
@@ -185,11 +185,11 @@ msgstr "Type d'opération demandée"
msgid "Lead organization"
msgstr "Organisation porteuse du projet"
-#: forms.py:353 models.py:159 templates/ishtar/sheet_file.html:91
+#: forms.py:353 models.py:162 templates/ishtar/sheet_file.html:96
msgid "Classified area"
msgstr "Au sein d'un site classé"
-#: forms.py:355 models.py:161 templates/ishtar/sheet_file.html:92
+#: forms.py:355 models.py:164 templates/ishtar/sheet_file.html:97
msgid "Protected area"
msgstr "Au sein d'un secteur sauvegardé"
@@ -217,7 +217,7 @@ msgstr "Date de signature après"
msgid "Signature date before"
msgstr "Date de signature avant"
-#: ishtar_menu.py:30 models.py:177 templates/ishtar/sheet_file.html:6
+#: ishtar_menu.py:30 models.py:186 templates/ishtar/sheet_file.html:6
msgid "Archaeological file"
msgstr "Dossier"
@@ -261,128 +261,132 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:77 models.py:178
+#: ishtar_menu.py:77 models.py:187
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: models.py:40
+#: models.py:41
msgid "Archaeological file type"
msgstr "Type de dossier archéologique"
-#: models.py:41
+#: models.py:42
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: models.py:57
+#: models.py:58
msgid "Permit types"
msgstr "Types de permis"
-#: models.py:62
+#: models.py:63
msgid "Delay (in days)"
msgstr "Delai (en jours)"
-#: models.py:78
+#: models.py:79
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:91
+#: models.py:81
+msgid "External ID"
+msgstr "ID externe"
+
+#: models.py:94
msgid "General contractor (raw)"
msgstr "Aménageur (brut)"
-#: models.py:95
+#: models.py:98
msgid "General contractor - corporation"
msgstr "Aménageur - organisation"
-#: models.py:103
+#: models.py:106
msgid "Town planning service (raw)"
msgstr "Service instructeur (brut)"
-#: models.py:109
+#: models.py:112
msgid "Planning service - corporation"
msgstr "Service instructeur - organisation"
-#: models.py:115
+#: models.py:118
msgid "Closing date"
msgstr "Date de clotûre"
-#: models.py:116
+#: models.py:119
msgid "Town"
msgstr "Commune"
-#: models.py:118
+#: models.py:121
msgid "Towns"
msgstr "Communes"
-#: models.py:130
+#: models.py:133
msgid "Ref. number"
msgstr "Réf. numérique"
-#: models.py:132
+#: models.py:135
msgid "Instruction deadline"
msgstr "Date limite d'instruction"
-#: models.py:138
+#: models.py:141
msgid "Locality"
msgstr "Lieu-dit"
-#: models.py:141
+#: models.py:144
msgid "Main address - postal code"
msgstr "Adresse des terrains - code postal"
-#: models.py:151 templates/ishtar/sheet_file.html:87
+#: models.py:154 templates/ishtar/sheet_file.html:92
msgid "Organization"
msgstr "Organisation"
-#: models.py:156
+#: models.py:159
msgid "Research archaeology comment"
msgstr "Commentaire archéologie programmée"
-#: models.py:170
+#: models.py:173
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:172
+#: models.py:174
msgid "Imported line"
msgstr "Ligne importée"
-#: models.py:180
+#: models.py:189
msgid "Can view all Archaelogical file"
msgstr "Peut voir tous les dossier archéologique"
-#: models.py:181
+#: models.py:190
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier"
-#: models.py:182
+#: models.py:191
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier"
-#: models.py:184
+#: models.py:193
msgid "Can change own Archaelogical file"
msgstr "Peut changer son propre Dossier"
-#: models.py:186
+#: models.py:195
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier"
-#: models.py:187
+#: models.py:196
msgid "Can close File"
msgstr "Peut fermer un dossier"
-#: models.py:193
+#: models.py:202
msgid "FILE"
msgstr "DOSSIER"
-#: models.py:294
+#: models.py:371
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:428
+#: models.py:511
msgid "File"
msgstr "Dossier"
-#: models.py:429
+#: models.py:512
msgid "Department"
msgstr "Département"
@@ -422,7 +426,7 @@ msgstr "Dossier : modification d'acte administratif"
msgid "File: administrative act deletion"
msgstr "Dossier : suppression acte administratif"
-#: wizards.py:112 templates/ishtar/sheet_file.html:104
+#: wizards.py:112 templates/ishtar/sheet_file.html:109
msgid "Associated operations"
msgstr "Opérations associées"
@@ -474,186 +478,146 @@ msgstr "Modifier"
msgid "Add an associated archaeological operation"
msgstr "Ajouter une opération archéologique associée à ce dossier"
-#: templates/ishtar/sheet_file.html:32
-msgid "Year:"
-msgstr "Année :"
-
-#: templates/ishtar/sheet_file.html:33
-msgid "Numerical reference:"
-msgstr "Référence numérique :"
-
-#: templates/ishtar/sheet_file.html:34
-msgid "Other reference:"
-msgstr "Autre référence :"
-
-#: templates/ishtar/sheet_file.html:36
-msgid "Name:"
-msgstr "Nom :"
-
#: templates/ishtar/sheet_file.html:38
msgid "Edition date:"
msgstr "Date d'édition :"
-#: templates/ishtar/sheet_file.html:39
-msgid "Reception date:"
-msgstr "Date de réception :"
-
-#: templates/ishtar/sheet_file.html:40
-msgid "Creation date:"
-msgstr "Date de création :"
-
-#: templates/ishtar/sheet_file.html:41
-msgid "Created by:"
-msgstr "Créé par :"
-
-#: templates/ishtar/sheet_file.html:48
-msgid "In charge:"
-msgstr "Responsable :"
-
-#: templates/ishtar/sheet_file.html:49
+#: templates/ishtar/sheet_file.html:52
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_file.html:49
+#: templates/ishtar/sheet_file.html:52
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_file.html:50
+#: templates/ishtar/sheet_file.html:53
msgid "Closed file"
msgstr "Dossier fermé"
-#: templates/ishtar/sheet_file.html:51
+#: templates/ishtar/sheet_file.html:55
msgid "Closing date:"
msgstr "Date de clotûre :"
-#: templates/ishtar/sheet_file.html:51
+#: templates/ishtar/sheet_file.html:55
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_file.html:54
-msgid "Type:"
-msgstr "Type :"
-
-#: templates/ishtar/sheet_file.html:56
+#: templates/ishtar/sheet_file.html:60
msgid "Related file:"
msgstr "Dossier en relation avec :"
-#: templates/ishtar/sheet_file.html:57
-msgid "Comment:"
-msgstr "Commentaire :"
-
-#: templates/ishtar/sheet_file.html:59
+#: templates/ishtar/sheet_file.html:64
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_file.html:60
+#: templates/ishtar/sheet_file.html:65
msgid "Towns:"
msgstr "Communes :"
-#: templates/ishtar/sheet_file.html:61
+#: templates/ishtar/sheet_file.html:66
msgid "Departments:"
msgstr "Départements :"
-#: templates/ishtar/sheet_file.html:63
+#: templates/ishtar/sheet_file.html:68
msgid "Main address:"
msgstr "Adresse principale :"
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:69
msgid "Complement:"
msgstr "Complément :"
-#: templates/ishtar/sheet_file.html:65
+#: templates/ishtar/sheet_file.html:70
msgid "Postal code:"
msgstr "Code postal :"
-#: templates/ishtar/sheet_file.html:67
+#: templates/ishtar/sheet_file.html:72
msgid "Surface:"
msgstr "Surface :"
-#: templates/ishtar/sheet_file.html:72
+#: templates/ishtar/sheet_file.html:77
msgid "Preventive archaelogical file"
msgstr "Dossier d'archéologie préventive"
-#: templates/ishtar/sheet_file.html:73
+#: templates/ishtar/sheet_file.html:78
msgid "Developed surface:"
msgstr "Surface aménagée :"
-#: templates/ishtar/sheet_file.html:74
+#: templates/ishtar/sheet_file.html:79
msgid "Saisine type:"
msgstr "Type de saisine :"
-#: templates/ishtar/sheet_file.html:75
+#: templates/ishtar/sheet_file.html:80
msgid "Town planning service:"
msgstr "Service instructeur :"
-#: templates/ishtar/sheet_file.html:76
+#: templates/ishtar/sheet_file.html:81
msgid "Permit type:"
msgstr "Type de permis :"
-#: templates/ishtar/sheet_file.html:77
+#: templates/ishtar/sheet_file.html:82
msgid "Permit reference:"
msgstr "Référence du permis :"
-#: templates/ishtar/sheet_file.html:78
+#: templates/ishtar/sheet_file.html:83
msgid "General contractor organisation:"
msgstr "Aménageur (organisation) :"
-#: templates/ishtar/sheet_file.html:79
+#: templates/ishtar/sheet_file.html:84
msgid "General contractor:"
msgstr "Aménageur :"
-#: templates/ishtar/sheet_file.html:84 templates/ishtar/sheet_file.html:85
-#: templates/ishtar/sheet_file.html:86 templates/ishtar/sheet_file.html:87
-#: templates/ishtar/sheet_file.html:93
+#: templates/ishtar/sheet_file.html:89 templates/ishtar/sheet_file.html:90
+#: templates/ishtar/sheet_file.html:91 templates/ishtar/sheet_file.html:92
+#: templates/ishtar/sheet_file.html:98
#: templates/ishtar/dashboards/dashboard_file.html:14
msgid ":"
msgstr " :"
-#: templates/ishtar/sheet_file.html:85
+#: templates/ishtar/sheet_file.html:90
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: templates/ishtar/sheet_file.html:97
+#: templates/ishtar/sheet_file.html:102
msgid "Associated parcels"
msgstr "Opérations associées"
-#: templates/ishtar/sheet_file.html:100
+#: templates/ishtar/sheet_file.html:105
msgid "Administrativ acts"
msgstr "Actes administratif"
-#: templates/ishtar/sheet_file.html:106 templates/ishtar/sheet_file.html:133
+#: templates/ishtar/sheet_file.html:111 templates/ishtar/sheet_file.html:138
msgid "Ref."
msgstr "Ref."
-#: templates/ishtar/sheet_file.html:108 templates/ishtar/sheet_file.html:134
+#: templates/ishtar/sheet_file.html:113 templates/ishtar/sheet_file.html:139
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_file.html:110
+#: templates/ishtar/sheet_file.html:115
msgid "Start date"
msgstr "Date de début"
-#: templates/ishtar/sheet_file.html:111
+#: templates/ishtar/sheet_file.html:116
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: templates/ishtar/sheet_file.html:122
+#: templates/ishtar/sheet_file.html:127
msgid "Details"
msgstr "Détails"
-#: templates/ishtar/sheet_file.html:125
+#: templates/ishtar/sheet_file.html:130
msgid "No operation associated to this archaelogical file"
msgstr "Pas d'opération associée à ce dossier archéologique"
-#: templates/ishtar/sheet_file.html:130
+#: templates/ishtar/sheet_file.html:135
msgid "Admninistrative acts linked to associated operations"
msgstr "Actes administratifs associé à ces opérations"
-#: templates/ishtar/sheet_file.html:135
+#: templates/ishtar/sheet_file.html:140
msgid "Date"
msgstr "Date"
-#: templates/ishtar/sheet_file.html:145
+#: templates/ishtar/sheet_file.html:150
msgid "No administrative act linked to operations"
msgstr "Pas d'acte administratif associé à ces opérations"
@@ -726,6 +690,36 @@ msgstr "Principales communes en nombre"
msgid "Main towns by surface (ha)"
msgstr "Principales communes en surface (ha)"
+#~ msgid "Year:"
+#~ msgstr "Année :"
+
+#~ msgid "Numerical reference:"
+#~ msgstr "Référence numérique :"
+
+#~ msgid "Other reference:"
+#~ msgstr "Autre référence :"
+
+#~ msgid "Name:"
+#~ msgstr "Nom :"
+
+#~ msgid "Reception date:"
+#~ msgstr "Date de réception :"
+
+#~ msgid "Creation date:"
+#~ msgstr "Date de création :"
+
+#~ msgid "Created by:"
+#~ msgstr "Créé par :"
+
+#~ msgid "In charge:"
+#~ msgstr "Responsable :"
+
+#~ msgid "Type:"
+#~ msgstr "Type :"
+
+#~ msgid "Comment:"
+#~ msgstr "Commentaire :"
+
#~ 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"
diff --git a/archaeological_finds/locale/fr/LC_MESSAGES/django.po b/archaeological_finds/locale/fr/LC_MESSAGES/django.po
index 5a2f4c1a7..2174ac69b 100644
--- a/archaeological_finds/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_finds/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-25 12:36+0100\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -17,90 +17,93 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: forms.py:45 ishtar_menu.py:27 models.py:298 models.py:471 models.py:541
+#: forms.py:45 ishtar_menu.py:27 models.py:309 models.py:482 models.py:552
#: templates/ishtar/sheet_find.html:6
msgid "Find"
msgstr "Mobilier"
-#: forms.py:51 forms.py:251 models.py:92 models.py:246
+#: forms.py:51 forms.py:253 models.py:92 models.py:255
msgid "Free-ID"
msgstr "Identifiant libre"
-#: forms.py:53 models.py:286
+#: forms.py:53 models.py:295
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:54 forms.py:140 forms.py:191 models.py:95 models.py:247
-#: models.py:494 templates/ishtar/sheet_find.html:70
+#: forms.py:54 forms.py:142 forms.py:193 models.py:95 models.py:256
+#: models.py:505 templates/ishtar/sheet_find.html:72
msgid "Description"
msgstr "Description"
-#: forms.py:57 forms.py:141 models.py:106
+#: forms.py:57 forms.py:143 models.py:106
msgid "Is isolated?"
msgstr "Est isolé ?"
-#: forms.py:58 models.py:274
+#: forms.py:58 models.py:283
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:61 forms.py:136 forms.py:255 models.py:48
+#: forms.py:61 forms.py:138 forms.py:257 models.py:48
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:62 forms.py:138 models.py:58 models.py:251
+#: forms.py:62 forms.py:140 models.py:58 models.py:260
msgid "Conservatory state"
msgstr "État sanitaire"
-#: forms.py:65 models.py:76 models.py:277
+#: forms.py:65 models.py:76 models.py:286
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:66 models.py:278
+#: forms.py:66 models.py:287
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:67 models.py:279
+#: forms.py:67 models.py:288
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:68 models.py:280
+#: forms.py:68 models.py:289
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: forms.py:69 models.py:281
+#: forms.py:69 models.py:290
msgid "Diameter (cm)"
msgstr "Diametre (cm)"
-#: forms.py:70 forms.py:256 models.py:256
+#: forms.py:70 forms.py:258 models.py:265
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:71 forms.py:257 models.py:257
+#: forms.py:71 forms.py:259 models.py:266
msgid "Weight (g)"
msgstr "Poids (g)"
-#: forms.py:72 forms.py:258 models.py:260
+#: forms.py:72 forms.py:260 models.py:269
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:73 models.py:282
+#: forms.py:73 models.py:291
msgid "Mark"
msgstr "Marque"
-#: forms.py:74 models.py:96 models.py:283 models.py:495
-#: templates/ishtar/sheet_find.html:74
+#: forms.py:74 models.py:297
+msgid "Check"
+msgstr "Vérification"
+
+#: forms.py:75 models.py:96 models.py:292 models.py:506
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:77 models.py:284
+#: forms.py:78 models.py:293
msgid "Comment on dating"
msgstr "Commentaire général sur les datations"
-#: forms.py:79
+#: forms.py:80
msgid "Image"
msgstr "Image"
-#: forms.py:80
+#: forms.py:81
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
@@ -109,127 +112,127 @@ msgstr ""
"<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).</p>"
-#: forms.py:97 forms.py:125 models.py:268
+#: forms.py:99 forms.py:127 models.py:277
msgid "Dating"
msgstr "Datation"
-#: forms.py:102 forms.py:134
+#: forms.py:104 forms.py:136
msgid "Period"
msgstr "Période"
-#: forms.py:103 forms.py:193 models.py:506 models.py:547
+#: forms.py:105 forms.py:195 models.py:517 models.py:558
msgid "Start date"
msgstr "Date de début"
-#: forms.py:105 forms.py:195 models.py:507 models.py:548
+#: forms.py:107 forms.py:197 models.py:518 models.py:559
msgid "End date"
msgstr "Date de fin"
-#: forms.py:106
+#: forms.py:108
msgid "Quality"
msgstr "Qualité"
-#: forms.py:108
+#: forms.py:110
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:110
+#: forms.py:112
msgid "Precise dating"
msgstr "Datation précise"
-#: forms.py:131
+#: forms.py:133
msgid "Year"
msgstr "Année"
-#: forms.py:133
+#: forms.py:135
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:137 models.py:75
+#: forms.py:139 models.py:75
msgid "Object type"
msgstr "Type d'objet"
-#: forms.py:142
+#: forms.py:144
msgid "Has an image?"
msgstr "Dispose d'une image ?"
-#: forms.py:161 views.py:90
+#: forms.py:163 views.py:90
msgid "Find search"
msgstr "Recherche de mobilier"
-#: forms.py:174
+#: forms.py:176
msgid "Base treatment"
msgstr "Traitement de base"
-#: forms.py:178 models.py:483 models.py:497
+#: forms.py:180 models.py:494 models.py:508
msgid "Treatment type"
msgstr "Type de traitement"
-#: forms.py:180 models.py:504 models.py:545
+#: forms.py:182 models.py:515 models.py:556
msgid "Person"
msgstr "Individu"
-#: forms.py:186 models.py:499
+#: forms.py:188 models.py:510
msgid "Location"
msgstr "Lieu"
-#: forms.py:207
+#: forms.py:209
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:209 models.py:299
+#: forms.py:211 models.py:310
msgid "Finds"
msgstr "Mobilier"
-#: forms.py:219
+#: forms.py:221
msgid "You should at least select one archaeological find."
msgstr "Vous devez sélectionner au moins un mobilier archéologique."
-#: forms.py:248
+#: forms.py:250
msgid "Resulting find"
msgstr "Mobilier résultant"
-#: forms.py:253
+#: forms.py:255
msgid "Precise description"
msgstr "Description précise"
-#: forms.py:267
+#: forms.py:269
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:271
+#: forms.py:273
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:278
+#: forms.py:280
msgid "Archaeological find search"
msgstr "Recherche de mobilier"
-#: forms.py:280
+#: forms.py:282
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:285
+#: forms.py:287
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:287
+#: forms.py:289
msgid "Period of the archaelogical find"
msgstr "Période du mobilier"
-#: forms.py:289
+#: forms.py:291
msgid "Material type of the archaelogical find"
msgstr "Type de matériau du mobilier"
-#: forms.py:291
+#: forms.py:293
msgid "Description of the archaelogical find"
msgstr "Description du mobilier"
-#: forms.py:303
+#: forms.py:305
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:305
+#: forms.py:307
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
@@ -265,7 +268,7 @@ msgstr "Recommandation"
msgid "Parent material"
msgstr "Matériau parent"
-#: models.py:49 models.py:249
+#: models.py:49 models.py:258
msgid "Material types"
msgstr "Types de matériau"
@@ -289,7 +292,7 @@ msgstr "Types de conservation"
msgid "Parent"
msgstr "Parent"
-#: models.py:93 models.py:243 models.py:489
+#: models.py:93 models.py:252 models.py:500
msgid "External ID"
msgstr "ID externe"
@@ -297,7 +300,7 @@ msgstr "ID externe"
msgid "Topographic localisation"
msgstr "Localisation topogaphique"
-#: models.py:99 templates/ishtar/sheet_find.html:78
+#: models.py:99 templates/ishtar/sheet_find.html:77
msgid "Special interest"
msgstr "Intérêt spécifique"
@@ -305,11 +308,11 @@ msgstr "Intérêt spécifique"
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:104 templates/ishtar/sheet_find.html:66
+#: models.py:104 templates/ishtar/sheet_find.html:68
msgid "Discovery date"
msgstr "Date de découverte"
-#: models.py:113 models.py:241
+#: models.py:113 models.py:250
msgid "Base find"
msgstr "Mobilier de base"
@@ -345,131 +348,143 @@ msgstr "g"
msgid "kg"
msgstr "kg"
-#: models.py:239
+#: models.py:205
+msgid "Not checked"
+msgstr "Non vérifié"
+
+#: models.py:206
+msgid "Checked but incorrect"
+msgstr "Vérifié mais non correct"
+
+#: models.py:207
+msgid "Checked and correct"
+msgstr "Vérifié et correct"
+
+#: models.py:245 models.py:248
msgid "Short Id"
msgstr "Id. court"
-#: models.py:240 templates/ishtar/sheet_find.html:62
+#: models.py:246 models.py:249 templates/ishtar/sheet_find.html:64
msgid "Complete ID"
msgstr "ID complet"
-#: models.py:245
+#: models.py:254
msgid "Order"
msgstr "Ordre"
-#: models.py:254
+#: models.py:263
msgid "Type of preservation to consider"
msgstr "Mesures de conservation à envisager"
-#: models.py:258
+#: models.py:267
msgid "Weight unit"
msgstr "Unité de poids"
-#: models.py:264 templates/ishtar/sheet_find.html:52
+#: models.py:273 templates/ishtar/sheet_find.html:54
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models.py:267 templates/ishtar/sheet_find.html:54
+#: models.py:276 templates/ishtar/sheet_find.html:56
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models.py:272 models.py:492 templates/ishtar/sheet_find.html:56
+#: models.py:281 models.py:503 templates/ishtar/sheet_find.html:58
msgid "Container"
msgstr "Contenant"
-#: models.py:301
+#: models.py:312
msgid "Can view all Find"
msgstr "Peut voir tout le Mobilier"
-#: models.py:302
+#: models.py:313
msgid "Can view own Find"
msgstr "Peut voir son propre Mobilier"
-#: models.py:303
+#: models.py:314
msgid "Can add own Find"
msgstr "Peut ajouter son propre Mobilier"
-#: models.py:304
+#: models.py:315
msgid "Can change own Find"
msgstr "Peut changer son propre Mobilier"
-#: models.py:305
+#: models.py:316
msgid "Can delete own Find"
msgstr "Peut supprimer son propre Mobilier"
-#: models.py:310
+#: models.py:321
msgid "FIND"
msgstr "MOBILIER"
-#: models.py:469
+#: models.py:480
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models.py:470
+#: models.py:481
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models.py:480
+#: models.py:491
msgid "Virtual"
msgstr "Virtuel"
-#: models.py:484
+#: models.py:495
msgid "Treatment types"
msgstr "Types de traitement"
-#: models.py:501
+#: models.py:512
msgid "Other location"
msgstr "Autre lieu"
-#: models.py:511 models.py:533
+#: models.py:522 models.py:544
msgid "Treatment"
msgstr "Traitement"
-#: models.py:512
+#: models.py:523
msgid "Treatments"
msgstr "Traitements"
-#: models.py:514
+#: models.py:525
msgid "Can view all Treatment"
msgstr "Peut voir tous les Traitements"
-#: models.py:515
+#: models.py:526
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: models.py:516
+#: models.py:527
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: models.py:517
+#: models.py:528
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: models.py:518
+#: models.py:529
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre Traitement"
-#: models.py:524
+#: models.py:535
msgid "by"
msgstr "par"
-#: models.py:530
+#: models.py:541
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: models.py:531
+#: models.py:542
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: models.py:544
+#: models.py:555
msgid "Administrative act"
msgstr "Acte administratif"
-#: models.py:551
+#: models.py:562
msgid "Property"
msgstr "Propriété"
-#: models.py:552
+#: models.py:563
msgid "Properties"
msgstr "Propriétés"
@@ -529,52 +544,51 @@ msgstr "Fichier PDF"
msgid "Modify"
msgstr "Modifier"
-#: templates/ishtar/sheet_find.html:52 templates/ishtar/sheet_find.html:54
-#: templates/ishtar/sheet_find.html:56 templates/ishtar/sheet_find.html:62
-#: templates/ishtar/sheet_find.html:66 templates/ishtar/sheet_find.html:70
-#: templates/ishtar/sheet_find.html:74 templates/ishtar/sheet_find.html:78
-#: templates/ishtar/sheet_find.html:82 templates/ishtar/sheet_find.html:84
-#: templates/ishtar/sheet_find.html:86
+#: templates/ishtar/sheet_find.html:54 templates/ishtar/sheet_find.html:56
+#: templates/ishtar/sheet_find.html:58 templates/ishtar/sheet_find.html:64
+#: templates/ishtar/sheet_find.html:68 templates/ishtar/sheet_find.html:72
+#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:81
+#: templates/ishtar/sheet_find.html:83 templates/ishtar/sheet_find.html:85
msgid ":"
msgstr " :"
-#: templates/ishtar/sheet_find.html:59
+#: templates/ishtar/sheet_find.html:61
msgid "Associated base finds"
msgstr "Matériel de référence associé"
-#: templates/ishtar/sheet_find.html:82
+#: templates/ishtar/sheet_find.html:81
msgid "Related context record"
msgstr "Unité d'Enregistrement associée"
-#: templates/ishtar/sheet_find.html:84
+#: templates/ishtar/sheet_find.html:83
msgid "Related parcel"
msgstr "Parcelle associée"
-#: templates/ishtar/sheet_find.html:86
+#: templates/ishtar/sheet_find.html:85
msgid "Related operation"
msgstr "Opération associée"
-#: templates/ishtar/sheet_find.html:92
+#: templates/ishtar/sheet_find.html:91
msgid "Documents"
msgstr "Documents"
-#: templates/ishtar/sheet_find.html:94
+#: templates/ishtar/sheet_find.html:93
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:95
+#: templates/ishtar/sheet_find.html:94
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_find.html:96
+#: templates/ishtar/sheet_find.html:95
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:104
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:103
msgid "Link"
msgstr "Lien"
-#: templates/ishtar/sheet_find.html:107
+#: templates/ishtar/sheet_find.html:106
msgid "No document associated to this find"
msgstr "Pas de document associé à ce mobilier"
diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
index 8b75a30eb..896d1f6f9 100644
--- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_operations/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-09-30 20:22+0200\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -19,11 +19,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: forms.py:69 forms.py:336 forms.py:765 forms.py:787 forms.py:791
-#: models.py:767 templates/ishtar/blocks/window_tables/parcels.html:8
+#: models.py:762 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:72 forms.py:188 forms.py:741 models.py:757
+#: forms.py:72 forms.py:188 forms.py:741 models.py:752
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -32,18 +32,18 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:74 forms.py:346 forms.py:599 forms.py:972 models.py:194
-#: models.py:612 models.py:755
+#: forms.py:74 forms.py:346 forms.py:599 forms.py:972 models.py:143
+#: models.py:568 models.py:750
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
msgstr "Année"
-#: forms.py:77 models.py:758
+#: forms.py:77 models.py:753
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Section"
msgstr "Section"
-#: forms.py:80 models.py:759
+#: forms.py:80 models.py:754
msgid "Parcel number"
msgstr "Numéro de parcelle"
@@ -79,29 +79,28 @@ msgstr "Identifiant numérique"
msgid "Name (full text search)"
msgstr "Nom (recherche texte intégral)"
-#: forms.py:353 forms.py:489 forms.py:584 forms.py:949 models.py:47
-#: models.py:203
+#: forms.py:353 forms.py:489 forms.py:584 forms.py:949 models.py:152
msgid "Operation type"
msgstr "Type d'opération"
-#: forms.py:361 models.py:597
+#: forms.py:361 models.py:553
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:370 forms.py:577 models.py:191
+#: forms.py:370 forms.py:577 models.py:140
msgid "In charge"
msgstr "Responsable"
-#: forms.py:372 forms.py:491 forms.py:570 models.py:189
+#: forms.py:372 forms.py:491 forms.py:570 models.py:138
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:377 forms.py:849 models.py:122 models.py:205
+#: forms.py:377 forms.py:849 models.py:71 models.py:154
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:378 forms.py:819 forms.py:839 forms.py:846 models.py:120
-#: models.py:210
+#: forms.py:378 forms.py:819 forms.py:839 forms.py:846 models.py:69
+#: models.py:159
msgid "Periods"
msgstr "Périodes"
@@ -145,7 +144,7 @@ msgstr "Vous devez sélectionner une opération."
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:464 forms.py:690 models.py:609 wizards.py:74
+#: forms.py:464 forms.py:690 models.py:565 wizards.py:75
msgid "Archaelogical file"
msgstr "Dossier"
@@ -157,7 +156,7 @@ msgstr "mois"
msgid "years"
msgstr "années"
-#: forms.py:471 models.py:175
+#: forms.py:471 models.py:124
msgid "Creation date"
msgstr "Date de création"
@@ -169,11 +168,11 @@ msgstr "Début du travail de terrain"
msgid "All"
msgstr "Tous"
-#: forms.py:475 models.py:74
+#: forms.py:475
msgid "Preventive"
msgstr "Préventif"
-#: forms.py:476 models.py:75
+#: forms.py:476
msgid "Research"
msgstr "Programmée"
@@ -218,15 +217,15 @@ msgstr "Général"
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:587 models.py:102 models.py:178 models.py:927
+#: forms.py:587 models.py:51 models.py:127 models.py:922
msgid "Start date"
msgstr "Date de début"
-#: forms.py:589 models.py:180
+#: forms.py:589 models.py:129
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:592 models.py:181
+#: forms.py:592 models.py:130
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
@@ -234,15 +233,15 @@ msgstr "Date de livraison du rapport"
msgid "Total surface (m²)"
msgstr "Surface totale des terrains (m²)"
-#: forms.py:604 forms.py:686 models.py:195 models.py:396
+#: forms.py:604 forms.py:686 models.py:144 models.py:346
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:607 models.py:252
+#: forms.py:607 models.py:201
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:609 models.py:251
+#: forms.py:609 models.py:200
msgid "Operator reference"
msgstr "Référence de l'opérateur"
@@ -250,7 +249,7 @@ msgstr "Référence de l'opérateur"
msgid "Associated archaeological sites"
msgstr "Sites archéologiques associés"
-#: forms.py:636 models.py:254
+#: forms.py:636 models.py:203
msgid "Comment"
msgstr "Commentaire"
@@ -282,20 +281,20 @@ msgstr "Mauvais code d'opération"
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:712 models.py:208
+#: forms.py:712 models.py:157
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (€)"
msgstr "Coût (€)"
-#: forms.py:713 models.py:213
+#: forms.py:713 models.py:162
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:715 models.py:216
+#: forms.py:715 models.py:165
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:717 models.py:219
+#: forms.py:717 models.py:168
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
@@ -303,31 +302,31 @@ msgstr "Jours-hommes effectifs"
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:730 models.py:235
+#: forms.py:730 models.py:184
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:732 models.py:238
+#: forms.py:732 models.py:187
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:735 models.py:240
+#: forms.py:735 models.py:189
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:739 forms.py:761 models.py:207 models.py:664
+#: forms.py:739 forms.py:761 models.py:156 models.py:578
msgid "Towns"
msgstr "Communes"
-#: forms.py:768 models.py:766 models.py:925
+#: forms.py:768 models.py:761 models.py:920
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:795 forms.py:815 models.py:96
+#: forms.py:795 forms.py:815 models.py:45
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:798 models.py:95
+#: forms.py:798 models.py:44
msgid "Remain type"
msgstr "Type de vestige"
@@ -343,11 +342,11 @@ msgstr "Période"
msgid "There are identical periods"
msgstr "Il y a des périodes identiques."
-#: forms.py:843 models.py:117
+#: forms.py:843 models.py:66
msgid "Reference"
msgstr "Référence"
-#: forms.py:844 models.py:118
+#: forms.py:844 models.py:67
msgid "Name"
msgstr "Nom"
@@ -371,7 +370,7 @@ msgstr "Voulez-vous clore cette opération ?"
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:910 forms.py:973 models.py:545 models.py:588
+#: forms.py:910 forms.py:973 models.py:495 models.py:544
msgid "Index"
msgstr "Index"
@@ -400,7 +399,7 @@ msgstr "Recherche de document"
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:977 forms.py:1018 models.py:568 models.py:582
+#: forms.py:977 forms.py:1018 models.py:518 models.py:538
msgid "Act type"
msgstr "Type d'acte"
@@ -412,11 +411,11 @@ msgstr "Recherche d'actes administratifs"
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1023 models.py:613
+#: forms.py:1023 models.py:569
msgid "Object"
msgstr "Objet"
-#: forms.py:1026 models.py:610
+#: forms.py:1026 models.py:566
msgid "Signature date"
msgstr "Date de signature"
@@ -449,8 +448,8 @@ msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
-#: ishtar_menu.py:31 models.py:263 models.py:518 models.py:543 models.py:557
-#: models.py:603 models.py:754 wizards.py:326 wizards.py:337
+#: ishtar_menu.py:31 models.py:212 models.py:468 models.py:493 models.py:507
+#: models.py:559 models.py:749 wizards.py:336 wizards.py:347
#: templates/ishtar/sheet_operation.html:6
msgid "Operation"
msgstr "Opération"
@@ -487,7 +486,7 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:92 models.py:264
+#: ishtar_menu.py:92 models.py:213
#: templates/ishtar/dashboards/dashboard_operation.html:9
msgid "Operations"
msgstr "Opérations"
@@ -496,7 +495,7 @@ msgstr "Opérations"
msgid "Administrative Act"
msgstr "Acte administratif"
-#: ishtar_menu.py:119 models.py:623
+#: ishtar_menu.py:119 models.py:585
#: templates/ishtar/sheet_administrativeact.html:6
msgid "Administrative act"
msgstr "Acte administratif"
@@ -505,290 +504,310 @@ msgstr "Acte administratif"
msgid "Documents"
msgstr "Documents"
-#: models.py:43 models.py:101
+#: models.py:50 models.py:1384
msgid "Order"
msgstr "Ordre"
-#: models.py:44
-msgid "Is preventive"
-msgstr "Préventif"
-
-#: models.py:48
-msgid "Operation types"
-msgstr "Types d'opération"
-
-#: models.py:103 models.py:928
+#: models.py:52 models.py:923
msgid "End date"
msgstr "Date de fin"
-#: models.py:104
+#: models.py:53
msgid "Parent period"
msgstr "Période parente"
-#: models.py:108
+#: models.py:57
msgid "Type Period"
msgstr "Type de période"
-#: models.py:109
+#: models.py:58
msgid "Types Period"
msgstr "Types de période"
-#: models.py:126
+#: models.py:75
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: models.py:127 models.py:258
+#: models.py:76 models.py:207
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: models.py:130
+#: models.py:79
msgid "Can view all Archaeological site"
msgstr "Peut voir toutes les Entités archéologiques"
-#: models.py:132
+#: models.py:81
msgid "Can view own Archaeological site"
msgstr "Peut voir ses propres Entités archéologiques"
-#: models.py:134
+#: models.py:83
msgid "Can add own Archaeological site"
msgstr "Peut ajouter ses propres Entités archéologique"
-#: models.py:136
+#: models.py:85
msgid "Can change own Archaeological site"
msgstr "Peut changer ses propres Entités archéologiques"
-#: models.py:138
+#: models.py:87
msgid "Can delete own Archaeological site"
msgstr "Peut supprimer ses propres Entités archéologiques"
-#: models.py:177
+#: models.py:126
msgid "Closing date"
msgstr "Date de clôture"
-#: models.py:184
+#: models.py:133
msgid "In charge scientist"
msgstr "Responsable scientifique"
-#: models.py:200 models.py:750
+#: models.py:149 models.py:745
msgid "File"
msgstr "Dossier"
-#: models.py:204
+#: models.py:153
msgid "Surface (m²)"
msgstr "Area (m²)"
-#: models.py:255
+#: models.py:204
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:266
+#: models.py:215
msgid "Can view all Operation"
msgstr "Peut voir toutes les Opérations"
-#: models.py:267
+#: models.py:216
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: models.py:268
+#: models.py:217
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: models.py:269
+#: models.py:218
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: models.py:270
+#: models.py:219
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: models.py:271
+#: models.py:220
msgid "Can close Operation"
msgstr "Peut fermer une Opération"
-#: models.py:294
+#: models.py:243
msgid "OPE"
msgstr "OPE"
-#: models.py:354
+#: models.py:303
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:380 models.py:556
+#: models.py:329 models.py:506
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: models.py:422
+#: models.py:330
+msgid "Code patriarche"
+msgstr "Code patriarche"
+
+#: models.py:372
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:491
+#: models.py:441
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:495
+#: models.py:445
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:496
+#: models.py:446
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:508
+#: models.py:458
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:509
+#: models.py:459
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:519 templates/ishtar/dashboards/dashboard_operation.html:273
+#: models.py:469 templates/ishtar/dashboards/dashboard_operation.html:273
#: templates/ishtar/dashboards/dashboard_operation.html:286
#: templates/ishtar/dashboards/dashboard_operation.html:453
#: templates/ishtar/dashboards/dashboard_operation.html:466
msgid "Department"
msgstr "Département"
-#: models.py:529
+#: models.py:479
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:530
+#: models.py:480
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:533
+#: models.py:483
msgid "Can view all Operation source"
msgstr "Peut voir toutes les Sources des opérations"
-#: models.py:535
+#: models.py:485
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Source d'opération"
-#: models.py:537
+#: models.py:487
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Source d'opération"
-#: models.py:539
+#: models.py:489
msgid "Can change own Operation source"
msgstr "Peut changer sa propre Source d'opération"
-#: models.py:541
+#: models.py:491
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Source d'opération"
-#: models.py:559
+#: models.py:509
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:561
+#: models.py:511
msgid "Code"
msgstr "Code"
-#: models.py:564
+#: models.py:514
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:565
+#: models.py:515
msgid "Indexed"
msgstr "Indexé"
-#: models.py:569
+#: models.py:519
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:586
+#: models.py:542
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:592
+#: models.py:548
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:600
+#: models.py:556
msgid "Signatory"
msgstr "Signataire"
-#: models.py:624
+#: models.py:575
+msgid "Departments"
+msgstr "Départements"
+
+#: models.py:576
+msgid "Cached values get from associated departments"
+msgstr "Valeur en cache des départements associés"
+
+#: models.py:579
+msgid "Cached values get from associated towns"
+msgstr "Valeur en cache des communes associées"
+
+#: models.py:586
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:627
+#: models.py:589
msgid "Can view all Administrative act"
msgstr "Peut voir tous les Actes administratifs"
-#: models.py:629
+#: models.py:591
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:631
+#: models.py:593
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:633
+#: models.py:595
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: models.py:635
+#: models.py:597
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:644
+#: models.py:606
#: templates/ishtar/blocks/window_tables/administrativacts.html:5
msgid "Ref."
msgstr "Réf."
-#: models.py:710
+#: models.py:689
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:761
+#: models.py:756
msgid "External ID"
msgstr "ID externe"
-#: models.py:763
+#: models.py:758
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:923
+#: models.py:918
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:931
+#: models.py:926
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:932
+#: models.py:927
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:958
+#: models.py:953
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:959
+#: models.py:954
msgid "Effective"
msgstr "Effectif"
-#: models.py:960
+#: models.py:955
msgid "Active"
msgstr "Actif"
-#: models.py:961
+#: models.py:956
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:962
+#: models.py:957
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:963
+#: models.py:958
msgid "Closed"
msgstr "Fermé"
-#: models.py:964
+#: models.py:959
msgid "Documented and closed"
msgstr "Documenté et clos"
+#: models.py:1385
+msgid "Is preventive"
+msgstr "Préventif"
+
+#: models.py:1388
+msgid "Operation type old"
+msgstr "Type d'opération - ancien"
+
+#: models.py:1389
+msgid "Operation types old"
+msgstr "Types d'opération - ancien"
+
#: views.py:215
msgid "New operation"
msgstr "Nouvelle opération"
@@ -833,7 +852,7 @@ msgstr "Opération : modification d'un acte administratif"
msgid "Operation: administrative act deletion"
msgstr "Opération : suppression d'un acte administratif"
-#: wizards.py:191
+#: wizards.py:200
msgid ""
"Warning: No Archaelogical File is provided. If you have forget it return to "
"the first step."
@@ -1367,9 +1386,6 @@ msgstr "Cet acte est indexé !"
#~ msgid "(no context record)"
#~ msgstr "(pas d'Unité d'Enregistrement)"
-#~ msgid "Documents from associated finds"
-#~ msgstr "Documents concernant le mobilier associé"
-
#~ msgid "Commune"
#~ msgstr "Commune"
diff --git a/archaeological_warehouse/locale/fr/LC_MESSAGES/django.po b/archaeological_warehouse/locale/fr/LC_MESSAGES/django.po
index f0863c36d..e4ce195a7 100644
--- a/archaeological_warehouse/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_warehouse/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-09-30 20:22+0200\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 0efe9ae8a..7de617c2e 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-09-30 20:22+0200\n"
+"POT-Creation-Date: 2015-11-17 19:21+0100\n"
"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -28,65 +28,70 @@ msgstr "identifiant"
msgid "email address"
msgstr "courriel"
-#: context_processors.py:34
+#: context_processors.py:33
msgid "Archaeological file"
msgstr "Dossier"
-#: context_processors.py:35 models.py:1090
+#: context_processors.py:34 models.py:1098
msgid "Operation"
msgstr "Opération"
-#: context_processors.py:38
+#: context_processors.py:37
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: context_processors.py:41
+#: context_processors.py:40
msgid "Find"
msgstr "Mobilier"
-#: data_importer.py:150
+#: data_importer.py:181
#, 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:165
+#: data_importer.py:198
#, python-format
msgid "\"%(value)s\" not equal to yes or no"
msgstr "\"%(value)s\" diffère de oui ou non"
-#: data_importer.py:177
+#: data_importer.py:210
#, python-format
msgid "\"%(value)s\" is not a float"
msgstr "\"%(value)s\" n'est pas un flottant"
-#: data_importer.py:190 data_importer.py:203 data_importer.py:398
+#: data_importer.py:223 data_importer.py:236 data_importer.py:479
#, python-format
msgid "\"%(value)s\" is not a valid date"
msgstr "\"%(value)s\" n'est pas une date valide"
-#: data_importer.py:215
+#: data_importer.py:248
#, python-format
msgid "\"%(value)s\" is not an integer"
msgstr "\"%(value)s\" n'est pas un entier"
-#: data_importer.py:258 data_importer.py:430
+#: data_importer.py:299 data_importer.py:540
#, 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:265
+#: data_importer.py:306
#, python-format
msgid "%d. None of the above - create new"
msgstr "%d. Aucun de ceux-là - créer un nouveau"
-#: data_importer.py:268
+#: data_importer.py:309
#, python-format
msgid "%d. None of the above - skip"
msgstr "%d. Aucun de ceux-là - passer"
-#: data_importer.py:501
+#: data_importer.py:503
+#, python-format
+msgid "\"%(value)s\" is not a valid path for the given archive"
+msgstr "\"%(value)s\" n'est pas un chemin valide pour cette archive"
+
+#: data_importer.py:615
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 "
@@ -96,45 +101,57 @@ msgstr ""
"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:505
+#: data_importer.py:619
#, 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:507
+#: data_importer.py:621
msgid "No data provided"
msgstr "Aucune donnée fournie"
-#: data_importer.py:508
+#: data_importer.py:622
msgid "Value is required"
msgstr "Valeur requise"
-#: data_importer.py:509
+#: data_importer.py:623
#, python-format
msgid "At least %d columns must be filled"
msgstr "Au moins %d colonnes doivent être remplies"
-#: data_importer.py:510
+#: data_importer.py:624
msgid "The regexp doesn't match."
msgstr "L'expression régulière ne fonctionne pas"
-#: data_importer.py:769
+#: data_importer.py:1027
msgid "Not imported"
msgstr "Non importé"
-#: data_importer.py:1029
+#: data_importer.py:1391
msgid "line"
msgstr "ligne"
-#: data_importer.py:1029
+#: data_importer.py:1391
msgid "col"
msgstr "colonne"
-#: data_importer.py:1029
+#: data_importer.py:1391
msgid "error"
msgstr "erreur"
-#: data_importer.py:1043
+#: data_importer.py:1397
+msgid "field"
+msgstr "champ"
+
+#: data_importer.py:1397
+msgid "source"
+msgstr "source"
+
+#: data_importer.py:1397
+msgid "result"
+msgstr "résultat"
+
+#: data_importer.py:1413
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr "\"%(value)s\" n'est pas dans %(values)s"
@@ -143,7 +160,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:71 forms_common.py:413
+#: forms.py:71 forms_common.py:414
msgid "Confirm"
msgstr "Confirmation"
@@ -167,12 +184,12 @@ msgstr "Vous devez sélectionner un élément."
msgid "Add a new item"
msgstr "Ajouter un nouvel élément"
-#: forms.py:171 models.py:950
+#: forms.py:171 models.py:958
msgid "Template"
msgstr "Patron"
-#: forms_common.py:39 forms_common.py:57 forms_common.py:168
-#: forms_common.py:266 forms_common.py:271 models.py:1016 models.py:2002
+#: forms_common.py:39 forms_common.py:57 forms_common.py:169
+#: forms_common.py:267 forms_common.py:272 models.py:1024 models.py:2134
#: templates/blocks/JQueryAdvancedTown.html:19
#: templates/ishtar/sheet_organization.html:17
#: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
@@ -197,70 +214,70 @@ 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:66 forms_common.py:615 ishtar_menu.py:40 models.py:1751
-#: models.py:1853 models.py:1895 templates/ishtar/sheet_person.html:6
+#: forms_common.py:66 forms_common.py:616 ishtar_menu.py:40 models.py:1883
+#: models.py:1985 models.py:2027 templates/ishtar/sheet_person.html:6
msgid "Person"
msgstr "Individu"
-#: forms_common.py:156 forms_common.py:230 ishtar_menu.py:58 models.py:1684
+#: forms_common.py:157 forms_common.py:231 ishtar_menu.py:58 models.py:1812
#: templates/ishtar/sheet_organization.html:6
msgid "Organization"
msgstr "Organisation"
-#: forms_common.py:159 forms_common.py:195 forms_common.py:225
-#: forms_common.py:258 models.py:949 models.py:1133 models.py:1307
-#: models.py:1678 models.py:1741 models.py:1988
+#: forms_common.py:160 forms_common.py:196 forms_common.py:226
+#: forms_common.py:259 models.py:957 models.py:1146 models.py:1363
+#: models.py:1806 models.py:1873 models.py:2120
#: 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:160 models.py:1085 models.py:1413
+#: forms_common.py:161 models.py:1093 models.py:1494
msgid "Organization type"
msgstr "Type d'organisation"
-#: forms_common.py:162 forms_common.py:260 models.py:1011
+#: forms_common.py:163 forms_common.py:261 models.py:1019
#: 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:164 forms_common.py:262 models.py:1012
+#: forms_common.py:165 forms_common.py:263 models.py:1020
#: 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:166 forms_common.py:264 models.py:1014
+#: forms_common.py:167 forms_common.py:265 models.py:1022
#: 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:169 forms_common.py:267 models.py:1017
+#: forms_common.py:170 forms_common.py:268 models.py:1025
msgid "Country"
msgstr "Pays"
-#: forms_common.py:171 forms_common.py:227 forms_common.py:269
-#: forms_common.py:369 models.py:1023 templates/ishtar/sheet_person.html:15
+#: forms_common.py:172 forms_common.py:228 forms_common.py:270
+#: forms_common.py:370 models.py:1031 templates/ishtar/sheet_person.html:15
msgid "Email"
msgstr "Courriel"
-#: forms_common.py:172 forms_common.py:270 models.py:1019
+#: forms_common.py:173 forms_common.py:271 models.py:1027
#: 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:173 models.py:1020
+#: forms_common.py:174 models.py:1028
#: 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:196 forms_common.py:228 models.py:1434 models.py:1680
-#: models.py:1936 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
+#: forms_common.py:197 forms_common.py:229 models.py:1517 models.py:1808
+#: models.py:2068 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
@@ -268,121 +285,121 @@ msgstr "Téléphone portable"
msgid "Type"
msgstr "Type"
-#: forms_common.py:205 views.py:109
+#: forms_common.py:206 views.py:109
msgid "Organization search"
msgstr "Recherche d'organisations"
-#: forms_common.py:226 forms_common.py:256 models.py:1739
+#: forms_common.py:227 forms_common.py:257 models.py:1871
#: templates/ishtar/sheet_organization.html:26
#: templates/ishtar/sheet_person.html:13
msgid "Surname"
msgstr "Prénom"
-#: forms_common.py:242 views.py:83
+#: forms_common.py:243 views.py:83
msgid "Person search"
msgstr "Recherche d'individus"
-#: forms_common.py:253
+#: forms_common.py:254
msgid "Identity"
msgstr "Identité"
-#: forms_common.py:255 forms_common.py:567 models.py:1737 models.py:1933
+#: forms_common.py:256 forms_common.py:568 models.py:1869 models.py:2065
#: 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:274
+#: forms_common.py:275
msgid "Current organization"
msgstr "Organisation actuelle"
-#: forms_common.py:318 forms_common.py:348 forms_common.py:352 models.py:1721
+#: forms_common.py:319 forms_common.py:349 forms_common.py:353 models.py:1853
msgid "Person type"
msgstr "Type d'individu"
-#: forms_common.py:363 forms_common.py:368
+#: forms_common.py:364 forms_common.py:369
msgid "Account"
msgstr "Compte"
-#: forms_common.py:372 wizards.py:997
+#: forms_common.py:373 wizards.py:1019
msgid "New password"
msgstr "Nouveau mot de passe"
-#: forms_common.py:375
+#: forms_common.py:376
msgid "New password (confirmation)"
msgstr "Nouveau mot de passe (confirmation)"
-#: forms_common.py:394
+#: forms_common.py:395
msgid "Your password and confirmation password do not match."
msgstr "La vérification du mot de passe a échoué."
-#: forms_common.py:399
+#: forms_common.py:400
msgid "You must provide a correct password."
msgstr "Vous devez fournir un mot de passe correct."
-#: forms_common.py:407
+#: forms_common.py:408
msgid "This username already exists."
msgstr "Ce nom d'utilisateur existe déjà."
-#: forms_common.py:414
+#: forms_common.py:415
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:423 forms_common.py:436 models.py:2003
+#: forms_common.py:424 forms_common.py:437 models.py:2135
#: templates/ishtar/sheet_person.html:72
msgid "Towns"
msgstr "Communes"
-#: forms_common.py:433
+#: forms_common.py:434
msgid "There are identical towns."
msgstr "Il y a des communes identiques."
-#: forms_common.py:517
+#: forms_common.py:518
msgid "Only one choice can be checked."
msgstr "Seul un choix peut être coché."
-#: forms_common.py:565
+#: forms_common.py:566
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:569 forms_common.py:590 models.py:1414 models.py:1916
+#: forms_common.py:570 forms_common.py:591 models.py:1495 models.py:2048
msgid "Source type"
msgstr "Type de source"
-#: forms_common.py:571 models.py:1947
+#: forms_common.py:572 models.py:2079
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:572 models.py:1949
+#: forms_common.py:573 models.py:2081
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:574 models.py:1544 models.py:1951
+#: forms_common.py:575 models.py:1644 models.py:2083
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:587 forms_common.py:608 forms_common.py:641 models.py:1900
+#: forms_common.py:588 forms_common.py:609 forms_common.py:642 models.py:2032
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr "Auteur"
-#: forms_common.py:600
+#: forms_common.py:601
msgid "Would you like to delete this documentation?"
msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:616 models.py:1415 models.py:1890 models.py:1897
+#: forms_common.py:617 models.py:1496 models.py:2022 models.py:2029
msgid "Author type"
msgstr "Type d'auteur"
-#: forms_common.py:634
+#: forms_common.py:635
msgid "Author selection"
msgstr "Sélection d'auteur"
-#: forms_common.py:648
+#: forms_common.py:649
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:652 models.py:1901 models.py:1943
+#: forms_common.py:653 models.py:2033 models.py:2075
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Authors"
@@ -396,7 +413,7 @@ msgstr "Administration"
msgid "Account management"
msgstr "Gestion des comptes"
-#: ishtar_menu.py:33 models.py:733 views.py:996
+#: ishtar_menu.py:33 models.py:741 views.py:1049
msgid "Global variables"
msgstr "Variables globales"
@@ -420,19 +437,19 @@ msgstr "Modification"
msgid "Merge"
msgstr "Fusion"
-#: ishtar_menu.py:54 ishtar_menu.py:75 models.py:1581 widgets.py:110
+#: ishtar_menu.py:54 ishtar_menu.py:75 models.py:1681 widgets.py:110
msgid "Delete"
msgstr "Suppression"
-#: ishtar_menu.py:82 models.py:1555
+#: ishtar_menu.py:82 models.py:1655
msgid "Imports"
msgstr "Imports"
-#: ishtar_menu.py:84 views.py:1004
+#: ishtar_menu.py:84 views.py:1057
msgid "New import"
msgstr "Nouvel import"
-#: ishtar_menu.py:87 views.py:1018
+#: ishtar_menu.py:87 views.py:1071
msgid "Current imports"
msgstr "Imports en cours"
@@ -440,581 +457,642 @@ msgstr "Imports en cours"
msgid "Old imports"
msgstr "Anciens imports"
-#: models.py:171
+#: models.py:178
msgid "Not a valid item."
msgstr "Élément invalide."
-#: models.py:184
+#: models.py:191
msgid "An item selected is not a valid item."
msgstr "Un élément sélectionné n'est pas valide."
-#: models.py:195
+#: models.py:202
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: models.py:249 models.py:984 models.py:996
+#: models.py:256 models.py:992 models.py:1004
msgid "Label"
msgstr "Libellé"
-#: models.py:251
+#: models.py:258
msgid "Textual ID"
msgstr "Identifiant textuel"
-#: models.py:253 models.py:1958
+#: models.py:260 models.py:1390 models.py:2090
msgid "Comment"
msgstr "Commentaire"
-#: models.py:254 models.py:953
+#: models.py:261 models.py:961
msgid "Available"
msgstr "Disponible"
-#: models.py:431 models.py:1363
+#: models.py:439 models.py:1436
msgid "Key"
msgstr "Clé"
-#: models.py:437
+#: models.py:445
msgid "Key specific to an import"
msgstr "Clé spécifique à un import"
-#: models.py:508
+#: models.py:516
msgid "Last editor"
msgstr "Dernier éditeur"
-#: models.py:511
+#: models.py:519
msgid "Creator"
msgstr "Créateur"
-#: models.py:644
+#: models.py:652 models.py:2146
msgid "Order"
msgstr "Ordre"
-#: models.py:645
+#: models.py:653
msgid "Symmetrical"
msgstr "Symétrique"
-#: models.py:658
+#: models.py:666
msgid "Cannot have symmetrical and an inverse_relation"
msgstr "Ne pas être symétrique et avoir une relation inverse"
-#: models.py:726
+#: models.py:734
msgid "Variable name"
msgstr "Nom de la variable"
-#: models.py:727
+#: models.py:735
msgid "Description of the variable"
msgstr "Description de la variable"
-#: models.py:729 models.py:1364
+#: models.py:737 models.py:1437
msgid "Value"
msgstr "Valeur"
-#: models.py:732
+#: models.py:740
msgid "Global variable"
msgstr "Variables globales"
-#: models.py:854 models.py:884
+#: models.py:862 models.py:892
msgid "Total"
msgstr "Total"
-#: models.py:861 models.py:985 models.py:997
+#: models.py:869 models.py:993 models.py:1005
#: templates/ishtar/dashboards/dashboard_main_detail.html:135
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
msgid "Number"
msgstr "Nombre"
-#: models.py:948
+#: models.py:956
msgid "Administrative Act"
msgstr "Acte administratif"
-#: models.py:952
+#: models.py:960
msgid "Associated object"
msgstr "Objet associé"
-#: models.py:956
+#: models.py:964
msgid "Document template"
msgstr "Patron de document"
-#: models.py:957
+#: models.py:965
msgid "Document templates"
msgstr "Patrons de documents"
-#: models.py:988 models.py:998 models.py:1542
+#: models.py:996 models.py:1006 models.py:1639
msgid "State"
msgstr "État"
-#: models.py:1002 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1010 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr "Département"
-#: models.py:1003
+#: models.py:1011
msgid "Departments"
msgstr "Départements"
-#: models.py:1031
+#: models.py:1039
msgid "Merge key"
msgstr "Clé de fusion"
-#: models.py:1086
+#: models.py:1094
msgid "Organization types"
msgstr "Types d'organisation"
-#: models.py:1091
+#: models.py:1099
msgid "Parcels"
msgstr "Parcelles"
-#: models.py:1093
+#: models.py:1101
msgid "Operation source"
msgstr "Documentation de l'opération"
-#: models.py:1097 views.py:811 views.py:868
+#: models.py:1107 views.py:864 views.py:921
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: models.py:1101 views.py:814 views.py:878
+#: models.py:1114 views.py:867 views.py:931
msgid "Context records"
msgstr "Unité d'Enregistrement"
-#: models.py:1104 views.py:816 views.py:883
+#: models.py:1117 views.py:869 views.py:936
msgid "Finds"
msgstr "Mobilier"
-#: models.py:1135 models.py:1284 models.py:1308 models.py:1957
+#: models.py:1148
+msgid "Slug"
+msgstr "Identifiant texte"
+
+#: models.py:1150 models.py:1322 models.py:1364 models.py:2089
#: templates/sheet_ope.html:128
msgid "Description"
msgstr "Description"
-#: models.py:1137 templates/ishtar/dashboards/dashboard_main.html:26
+#: models.py:1152 templates/ishtar/dashboards/dashboard_main.html:26
msgid "Users"
msgstr "Utilisateurs"
-#: models.py:1139
+#: models.py:1154
msgid "Associated model"
msgstr "Modèle associé"
-#: models.py:1141
+#: models.py:1156
msgid "Is template"
msgstr "Est un patron"
-#: models.py:1144
+#: models.py:1157
+msgid "Unicity keys (separator \";\")"
+msgstr "Clés d'unicité (séparateur « ; »)"
+
+#: models.py:1161
msgid "Importer - Type"
msgstr "Importeur - Type"
-#: models.py:1145
+#: models.py:1162
msgid "Importer - Types"
msgstr "Importeur - Types"
-#: models.py:1220
+#: models.py:1252
msgid "Importer - Default"
msgstr "Importeur - Par défaut"
-#: models.py:1221
+#: models.py:1253
msgid "Importer - Defaults"
msgstr "Importeur - Par défaut"
-#: models.py:1250
+#: models.py:1288
msgid "Importer - Default value"
msgstr "Importeur - Valeur par défaut"
-#: models.py:1251
+#: models.py:1289
msgid "Importer - Default values"
msgstr "Importeur - Valeurs par défaut"
-#: models.py:1283
+#: models.py:1321
msgid "Column number"
msgstr "Numéro de colonne"
-#: models.py:1286
+#: models.py:1324
msgid "Required"
msgstr "Requis"
-#: models.py:1289
+#: models.py:1327
msgid "Importer - Column"
msgstr "Importeur - Colonne"
-#: models.py:1290
+#: models.py:1328
msgid "Importer - Columns"
msgstr "Importeur - Colonnes"
-#: models.py:1298
+#: models.py:1348
msgid "Field name"
msgstr "Nom du champ"
-#: models.py:1302
+#: models.py:1350 models.py:1384
+msgid "Force creation of new item"
+msgstr "Forcer la création de nouveaux éléments"
+
+#: models.py:1352 models.py:1386
+msgid "Concatenate with existing"
+msgstr "Concaténer avec l'existant"
+
+#: models.py:1354 models.py:1388
+msgid "Concatenate character"
+msgstr "Caractère de concaténation"
+
+#: models.py:1358
msgid "Importer - Duplicate field"
msgstr "Importeur - Champ dupliqué"
-#: models.py:1303
+#: models.py:1359
msgid "Importer - Duplicate fields"
msgstr "Importeur - Champs dupliqués"
-#: models.py:1310
+#: models.py:1366
msgid "Regular expression"
msgstr "Expression régulière"
-#: models.py:1313
+#: models.py:1369
msgid "Importer - Regular expression"
msgstr "Importeur - Expression régulière"
-#: models.py:1314
+#: models.py:1370
msgid "Importer - Regular expressions"
msgstr "Importeur - Expressions régulières"
-#: models.py:1330
+#: models.py:1393
msgid "Importer - Target"
msgstr "Importeur - Cible"
-#: models.py:1331
+#: models.py:1394
msgid "Importer - Targets"
msgstr "Importeur - Cibles"
-#: models.py:1345 views.py:292
+#: models.py:1418 views.py:292
msgid "True"
msgstr "Oui"
-#: models.py:1346 views.py:294
+#: models.py:1419 views.py:294
msgid "False"
msgstr "Non"
-#: models.py:1365
+#: models.py:1438
msgid "Is set"
msgstr "Est défini"
-#: models.py:1372
+#: models.py:1445
msgid "Importer - Target key"
msgstr "Importeur - Rapprochement"
-#: models.py:1373
+#: models.py:1446
msgid "Importer - Targets keys"
msgstr "Importeur - Rapprochements"
-#: models.py:1416 models.py:1928 models.py:1939
+#: models.py:1497 models.py:2060 models.py:2071
msgid "Format"
msgstr "Format"
-#: models.py:1417
+#: models.py:1498 models.py:2150
msgid "Operation type"
msgstr "Type d'opération"
-#: models.py:1418
+#: models.py:1499
msgid "Period"
msgstr "Périodes"
-#: models.py:1419
+#: models.py:1500
msgid "Unit"
msgstr "Unité"
-#: models.py:1420
+#: models.py:1501
msgid "Material"
msgstr "Matériau"
-#: models.py:1422
+#: models.py:1503
msgid "Conservatory state"
msgstr "État de conservation"
-#: models.py:1423
+#: models.py:1504
msgid "Preservation type"
msgstr "Type de conservation"
-#: models.py:1424
+#: models.py:1505
msgid "Object type"
msgstr "Type d'objet"
-#: models.py:1430
+#: models.py:1507
+msgid "Identification type"
+msgstr "Type d'identification"
+
+#: models.py:1513
msgid "Integer"
msgstr "Entier"
-#: models.py:1431
+#: models.py:1514
msgid "Float"
msgstr "Nombre à virgule"
-#: models.py:1432
+#: models.py:1515
msgid "String"
msgstr "Chaine de caractères"
-#: models.py:1433 templates/sheet_ope.html:86
+#: models.py:1516 templates/sheet_ope.html:86
msgid "Date"
msgstr "Date"
-#: models.py:1435 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:1518 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:1436
+#: models.py:1519
msgid "String to boolean"
msgstr "Chaîne de caractère vers booléen"
-#: models.py:1450
+#: models.py:1520
+msgctxt "filesystem"
+msgid "File"
+msgstr "Fichier"
+
+#: models.py:1521
+msgid "Unknow type"
+msgstr "Type inconnu"
+
+#: models.py:1537
msgid "4 digit year. e.g.: \"2015\""
msgstr "Année à 4 chiffres. Exemple : « 2015 »"
-#: models.py:1451
+#: models.py:1538
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr "Année à 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
-#: models.py:1452
+#: models.py:1539
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr "Jour/mois/année à 4 chiffres. Exemple : « 04/02/2015 »"
-#: models.py:1462
+#: models.py:1549
msgid "Options"
msgstr "Options"
-#: models.py:1464
+#: models.py:1551
msgid "Split character(s)"
msgstr "Caractère de séparation"
-#: models.py:1468
+#: models.py:1555
msgid "Importer - Formater type"
msgstr "Importeur - Type de mise en forme"
-#: models.py:1469
+#: models.py:1556
msgid "Importer - Formater types"
msgstr "Importeur - Types de mise en forme"
-#: models.py:1512 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:1603 templates/ishtar/dashboards/dashboard_main_detail.html:61
msgid "Created"
msgstr "Créé"
-#: models.py:1513
+#: models.py:1604
msgid "Analyse in progress"
msgstr "Analyse en cours"
-#: models.py:1514
+#: models.py:1605
msgid "Analysed"
msgstr "Analysé"
-#: models.py:1515
+#: models.py:1606
msgid "Import pending"
msgstr "Import en attente"
-#: models.py:1516
+#: models.py:1607
msgid "Import in progress"
msgstr "Import en cours"
-#: models.py:1517
+#: models.py:1608
msgid "Finished with errors"
msgstr "Finis avec des erreurs"
-#: models.py:1518
+#: models.py:1609
msgid "Finished"
msgstr "Terminé"
-#: models.py:1519
+#: models.py:1610
msgid "Archived"
msgstr "Archivé"
-#: models.py:1531
+#: models.py:1622
msgid "Imported file"
msgstr "Fichier importé"
-#: models.py:1533
+#: models.py:1625
+msgid "Associated images (zip file)"
+msgstr "Images associées (fichier zip)"
+
+#: models.py:1627
msgid "Encoding"
msgstr "Codage"
-#: models.py:1535
+#: models.py:1629
msgid "Skip lines"
msgstr "Nombre de lignes d'entête"
-#: models.py:1536 templates/ishtar/import_list.html:47
+#: models.py:1630 templates/ishtar/import_list.html:47
msgid "Error file"
msgstr "Fichier erreur"
-#: models.py:1539
+#: models.py:1633
msgid "Result file"
msgstr "Fichier résultant"
-#: models.py:1547
+#: models.py:1636 templates/ishtar/import_list.html:53
+msgid "Match file"
+msgstr "Fichier de correspondance"
+
+#: models.py:1642
+msgid "Conservative import"
+msgstr "Import conservateur"
+
+#: models.py:1647
msgid "End date"
msgstr "Date de fin"
-#: models.py:1549
+#: models.py:1649
msgid "Seconds remaining"
msgstr "Secondes restantes"
-#: models.py:1554
+#: models.py:1654
msgid "Import"
msgstr "Import"
-#: models.py:1571
+#: models.py:1671
msgid "Analyse"
msgstr "Analyser"
-#: models.py:1573 models.py:1576
+#: models.py:1673 models.py:1676
msgid "Re-analyse"
msgstr "Analyser de nouveau "
-#: models.py:1574
+#: models.py:1674
msgid "Launch import"
msgstr "Lancer l'import"
-#: models.py:1577
+#: models.py:1677
msgid "Re-import"
msgstr "re-import"
-#: models.py:1578
+#: models.py:1678
msgid "Archive"
msgstr "Archiver"
-#: models.py:1580
+#: models.py:1680
msgid "Unarchive"
msgstr "Dé-archiver"
-#: models.py:1685
+#: models.py:1813
msgid "Organizations"
msgstr "Organisations"
-#: models.py:1687
+#: models.py:1815
msgid "Can view all Organization"
msgstr "Peut voir toutes les Organisations"
-#: models.py:1688
+#: models.py:1816
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: models.py:1689
+#: models.py:1817
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: models.py:1691
+#: models.py:1819
msgid "Can change own Organization"
msgstr "Peut changer sa propre Organisation"
-#: models.py:1693
+#: models.py:1821
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: models.py:1717
+#: models.py:1849
msgid "Groups"
msgstr "Groupes"
-#: models.py:1722
+#: models.py:1854
msgid "Person types"
msgstr "Types d'individu"
-#: models.py:1729
+#: models.py:1861
msgid "Mr"
msgstr "M."
-#: models.py:1730
+#: models.py:1862
msgid "Miss"
msgstr "Mlle"
-#: models.py:1731
+#: models.py:1863
msgid "Mr and Miss"
msgstr "M. et Mme"
-#: models.py:1732
+#: models.py:1864
msgid "Mrs"
msgstr "Mme"
-#: models.py:1733
+#: models.py:1865
msgid "Doctor"
msgstr "Dr."
-#: models.py:1743
+#: models.py:1875
msgid "Raw name"
msgstr "Nom brut"
-#: models.py:1745 models.py:1785
+#: models.py:1877 models.py:1917
msgid "Types"
msgstr "Types"
-#: models.py:1748
+#: models.py:1880
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:1752
+#: models.py:1884
msgid "Persons"
msgstr "Individus"
-#: models.py:1754
+#: models.py:1886
msgid "Can view all Person"
msgstr "Peut voir toutes les Personnes"
-#: models.py:1755
+#: models.py:1887
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: models.py:1756
+#: models.py:1888
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: models.py:1757
+#: models.py:1889
msgid "Can change own Person"
msgstr "Peut changer sa propre Personne"
-#: models.py:1758
+#: models.py:1890
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: models.py:1857
+#: models.py:1989
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:1858
+#: models.py:1990
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:1891
+#: models.py:2023
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:1917
+#: models.py:2049
msgid "Source types"
msgstr "Types de source"
-#: models.py:1922
+#: models.py:2054
msgid "Support type"
msgstr "Type de support"
-#: models.py:1923
+#: models.py:2055
msgid "Support types"
msgstr "Types de support"
-#: models.py:1929
+#: models.py:2061
msgid "Formats"
msgstr "Formats"
-#: models.py:1934
+#: models.py:2066
msgid "External ID"
msgstr "Identifiant extern"
-#: models.py:1937
+#: models.py:2069
msgid "Support"
msgstr "Support"
-#: models.py:1941
+#: models.py:2073
msgid "Scale"
msgstr "Échelle"
-#: models.py:1952
+#: models.py:2084
msgid "Item number"
msgstr "Numéro d'élément"
-#: models.py:1953 templates/ishtar/sheet_person.html:40
+#: models.py:2085 templates/ishtar/sheet_person.html:40
#: templates/ishtar/sheet_person.html:67
msgid "Ref."
msgstr "Réf."
-#: models.py:1955
+#: models.py:2087
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:1959
+#: models.py:2091
msgid "Additional information"
msgstr "Informations supplémentaires"
-#: models.py:1989
+#: models.py:2121
msgid "Surface (m²)"
msgstr "Surface (m²)"
-#: models.py:1990 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2122 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr "Localisation"
+#: models.py:2147
+msgid "Is preventive"
+msgstr "Est du préventif"
+
+#: models.py:2151
+msgid "Operation types"
+msgstr "Types d'opération"
+
+#: models.py:2177
+msgid "Preventive"
+msgstr "Préventif"
+
+#: models.py:2178
+msgid "Research"
+msgstr "Recherche"
+
#: utils.py:48
msgid " (...)"
msgstr " (...)"
@@ -1043,34 +1121,34 @@ msgstr "Modification d'une organisation"
msgid "Organization deletion"
msgstr "Suppression d'une organisation"
-#: views.py:526 templates/base.html:76
+#: views.py:568 templates/base.html:80
#: 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:742 views.py:794
+#: views.py:795 views.py:847
msgid "Operation not permitted."
msgstr "Opération non permise."
-#: views.py:744
+#: views.py:797
#, python-format
msgid "New %s"
msgstr "Nouveau %s"
-#: views.py:812 views.py:872
+#: views.py:865 views.py:925
msgid "Operations"
msgstr "Opérations"
-#: views.py:1065 templates/ishtar/import_list.html:43
+#: views.py:1118 templates/ishtar/import_list.html:43
msgid "Link unmatched items"
msgstr "Associer les éléments non rapprochés"
-#: views.py:1080
+#: views.py:1133
msgid "Delete import"
msgstr "Suppression de l'import"
-#: views.py:1133 views.py:1149
+#: views.py:1192 views.py:1208
msgid "Corporation manager"
msgstr "Représentant de la personne morale"
@@ -1078,27 +1156,27 @@ msgstr "Représentant de la personne morale"
msgid "Search..."
msgstr "Recherche..."
-#: widgets.py:578 templatetags/window_tables.py:59
+#: widgets.py:595 templatetags/window_tables.py:65
msgid "No results"
msgstr "Pas de résultats"
-#: widgets.py:579 templatetags/window_tables.py:60
+#: widgets.py:596 templatetags/window_tables.py:66
msgid "Loading..."
msgstr "Chargement..."
-#: widgets.py:580
+#: widgets.py:597
msgid "Remove"
msgstr "Enlever"
-#: wizards.py:241 templates/ishtar/import_delete.html:14
+#: wizards.py:242 templates/ishtar/import_delete.html:20
msgid "Yes"
msgstr "Oui"
-#: wizards.py:243
+#: wizards.py:244
msgid "No"
msgstr "Non"
-#: wizards.py:1053
+#: wizards.py:1075
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr "[%(app_name)s] Ajout - modification du compte"
@@ -1137,40 +1215,39 @@ 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:30
+#: templates/base.html:34
msgid "Logged in"
msgstr "Connecté"
-#: templates/base.html:31
+#: templates/base.html:35
msgid "Log out"
msgstr "Déconnexion"
-#: templates/base.html:32
+#: templates/base.html:36
msgid "Change password"
msgstr "Changement de mot de passe"
-#: templates/base.html:34 templates/registration/activate.html:10
+#: templates/base.html:38 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:40
+#: templates/base.html:44
msgid "Lang"
msgstr "Langue"
-#: templates/base.html:40 templates/base.html.py:87
-#: templates/ishtar/import_delete.html:10
+#: templates/base.html:44 templates/base.html.py:91
#: templates/ishtar/blocks/window_field.html:2
#: templates/ishtar/blocks/window_field_multiple.html:2
msgid ":"
msgstr " :"
-#: templates/base.html:65
+#: templates/base.html:69
msgid "Default selected items"
msgstr "Éléments sélectionnés par défaut"
-#: templates/base.html:85
+#: templates/base.html:89
msgid "Current items"
msgstr "Éléments courants"
@@ -1438,7 +1515,7 @@ msgstr "simple"
msgid "full"
msgstr "complet"
-#: templates/blocks/JQueryJqGrid.html:81
+#: templates/blocks/JQueryJqGrid.html:86
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
msgid "An error as occured during search. Check your query fields."
msgstr ""
@@ -1450,8 +1527,8 @@ msgid "Help"
msgstr "Aide"
#: 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/import_list.html:58 templates/ishtar/merge.html:31
+#: templates/ishtar/wizard/confirm_wizard.html:42
#: templates/ishtar/wizard/default_wizard.html:29
#: templates/ishtar/wizard/search.html:13
#: templates/ishtar/wizard/validation_bar.html:4
@@ -1462,15 +1539,15 @@ msgstr "Valider"
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
+#: templates/ishtar/import_delete.html:18
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
+#: templates/ishtar/import_delete.html:19
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: templates/ishtar/import_delete.html:16
+#: templates/ishtar/import_delete.html:22
msgid "Back"
msgstr "Retour"
@@ -1527,32 +1604,36 @@ msgstr "A doublonne B"
msgid "Is not duplicate"
msgstr "N'est pas un doublon"
-#: templates/ishtar/organization_person_form.html:9
-#: templates/ishtar/person_form.html:9
-msgid "Identification"
-msgstr "Identification"
-
+#: templates/ishtar/organization_form.html:37
#: templates/ishtar/organization_person_form.html:32
#: templates/ishtar/person_form.html:43
msgid "Modify"
msgstr "Modifier"
+#: templates/ishtar/organization_form.html:38
#: templates/ishtar/organization_person_form.html:33
#: templates/ishtar/person_form.html:44
msgid "New"
msgstr "Nouveau"
+#: templates/ishtar/organization_form.html:39
#: templates/ishtar/organization_person_form.html:34
#: templates/ishtar/person_form.html:45
msgid "Save"
msgstr "Enregistrer"
+#: templates/ishtar/organization_form.html:40
#: templates/ishtar/organization_person_form.html:35
#: templates/ishtar/person_form.html:46
#: templates/ishtar/wizard/validation_bar.html:6
msgid "Cancel"
msgstr "Annuler"
+#: templates/ishtar/organization_person_form.html:9
+#: templates/ishtar/person_form.html:9
+msgid "Identification"
+msgstr "Identification"
+
#: templates/ishtar/person_form.html:24
msgid "Contact informations"
msgstr "Coordonnées"
@@ -1733,12 +1814,12 @@ msgstr "Mois"
msgid "User type"
msgstr "Type d'utilisateur"
-#: templates/ishtar/wizard/confirm_wizard.html:16
+#: templates/ishtar/wizard/confirm_wizard.html:17
#: templates/ishtar/wizard/wizard_done_summary.html:6
msgid "You have entered the following informations:"
msgstr "Vous avez entré les informations suivantes :"
-#: templates/ishtar/wizard/confirm_wizard.html:40
+#: templates/ishtar/wizard/confirm_wizard.html:41
msgid "Would you like to save them?"
msgstr "Voulez-vous sauver ces informations ?"
@@ -2116,9 +2197,6 @@ msgstr ""
#~ msgid "Excavation end date:"
#~ msgstr "Date de fin de chantier :"
-#~ msgid "Associated file:"
-#~ msgstr "Dossier associé :"
-
#~ msgid "No acts associated to this operation"
#~ msgstr "Pas d'acte associé à cette opération"