summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archaeological_context_records/locale/fr/LC_MESSAGES/django.po278
-rw-r--r--archaeological_files/locale/fr/LC_MESSAGES/django.po149
-rw-r--r--archaeological_finds/forms.py4
-rw-r--r--archaeological_finds/locale/fr/LC_MESSAGES/django.po190
-rw-r--r--archaeological_operations/locale/fr/LC_MESSAGES/django.po417
-rw-r--r--ishtar_common/locale/fr/LC_MESSAGES/django.po491
6 files changed, 884 insertions, 645 deletions
diff --git a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po
index 2e4f90629..aa2b59d52 100644
--- a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
# Ishtar po translation.
-# Copyright (C) 2010-2011
+# Copyright (C) 2010-2015
# This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2011.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-27 22:43+0100\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-24 22:42+0100\n"
+"PO-Revision-Date: 2015-01-24\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
"Language: \n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: forms.py:45 forms.py:94 models.py:105
+#: forms.py:45 forms.py:94 models.py:106
msgid "ID"
msgstr "Identifiant"
@@ -34,7 +34,7 @@ msgstr "Année de l'opération"
msgid "Operation's number (index by year)"
msgstr "Numéro de l'opération (index par année)"
-#: forms.py:53 forms.py:157 models.py:42
+#: forms.py:53 forms.py:157 models.py:43
msgid "Period"
msgstr "Période"
@@ -58,36 +58,36 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
msgid "General"
msgstr "Général"
-#: forms.py:93 models.py:101 templates/ishtar/sheet_contextrecord.html:110
+#: forms.py:93 models.py:102 templates/ishtar/sheet_contextrecord.html:112
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:96 models.py:106 templates/ishtar/sheet_contextrecord.html:40
-#: templates/ishtar/sheet_contextrecord.html:107
+#: forms.py:96 models.py:107 templates/ishtar/sheet_contextrecord.html:42
+#: templates/ishtar/sheet_contextrecord.html:109
msgid "Description"
msgstr "Description"
-#: forms.py:98 models.py:107
+#: forms.py:98 models.py:108
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:99 models.py:108
+#: forms.py:99 models.py:109
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:100 models.py:109
+#: forms.py:100 models.py:110
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: forms.py:101 models.py:110
+#: forms.py:101 models.py:111
msgid "Depth (cm)"
msgstr "Profondeur (cm)"
-#: forms.py:102 models.py:115
+#: forms.py:102 models.py:116
msgid "Unit"
msgstr "Unité"
-#: forms.py:103 models.py:111
+#: forms.py:103 models.py:112
msgid "Location"
msgstr "Lieu"
@@ -95,60 +95,60 @@ msgstr "Lieu"
msgid "This ID already exist for this operation."
msgstr "Cet identifiant existe déjà pour cette opération."
-#: forms.py:152 forms.py:176 models.py:51
+#: forms.py:152 forms.py:176 models.py:52
msgid "Dating"
msgstr "Datation"
-#: forms.py:158 models.py:43
+#: forms.py:158 models.py:44
msgid "Start date"
msgstr "Date de début"
-#: forms.py:159 models.py:44
+#: forms.py:159 models.py:45
msgid "End date"
msgstr "Date de fin"
-#: forms.py:160 models.py:47
+#: forms.py:160 models.py:48
msgid "Quality"
msgstr "Qualité"
-#: forms.py:161 models.py:31 models.py:45
+#: forms.py:161 models.py:32 models.py:46
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:179 forms.py:186 models.py:120
-#: templates/ishtar/sheet_contextrecord.html:49
+#: forms.py:179 forms.py:186 models.py:121
+#: templates/ishtar/sheet_contextrecord.html:51
msgid "Interpretation"
-msgstr "Interpretation"
+msgstr "Interprétation"
#: forms.py:182
msgid "Has furniture?"
-msgstr "A du matériel ?"
+msgstr "Contient du mobilier ?"
-#: forms.py:184 models.py:119
+#: forms.py:184 models.py:120
msgid "Filling"
msgstr "Remplissage"
-#: forms.py:188 models.py:135
+#: forms.py:188 models.py:136
msgid "Activity"
msgstr "Activité"
-#: forms.py:190 models.py:133
+#: forms.py:190 models.py:134
msgid "Identification"
msgstr "Identification"
-#: forms.py:192 models.py:122
+#: forms.py:192 models.py:123
msgid "TAQ"
msgstr "TAQ"
-#: forms.py:193 models.py:125
+#: forms.py:193 models.py:126
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: forms.py:195 models.py:127
+#: forms.py:195 models.py:128
msgid "TPQ"
msgstr "TPQ"
-#: forms.py:196 models.py:130
+#: forms.py:196 models.py:131
msgid "Estimated TPQ"
msgstr "TPQ estimé"
@@ -162,7 +162,7 @@ msgstr "Vous devez sélectionner une opération."
#: forms.py:216
msgid "Would you like to delete this context record?"
-msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?"
+msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?"
#: forms.py:225
msgid "You should select a context record."
@@ -192,7 +192,7 @@ msgstr "Recherche de document"
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: ishtar_menu.py:28 models.py:235
+#: ishtar_menu.py:28 models.py:290
msgid "Context record"
msgstr "Unité d'Enregistrement"
@@ -220,120 +220,150 @@ msgstr "Documentation"
msgid "Add"
msgstr "Ajout"
-#: models.py:32
+#: models.py:33
msgid "Dating types"
msgstr "Types de datation"
-#: models.py:37
+#: models.py:38
msgid "Dating quality"
msgstr "Qualité de datation"
-#: models.py:38
+#: models.py:39
msgid "Dating qualities"
msgstr "Qualités de datation"
-#: models.py:52
+#: models.py:53
msgid "Datings"
msgstr "Datations"
-#: models.py:62 models.py:75 models.py:86
+#: models.py:63 models.py:76 models.py:87 models.py:246
msgid "Order"
msgstr "Ordre"
-#: models.py:63
+#: models.py:64
msgid "Parent unit"
msgstr "Unité parente"
-#: models.py:67
+#: models.py:68
msgid "Type Unit"
msgstr "Type d'unité"
-#: models.py:68
+#: models.py:69
msgid "Types Unit"
msgstr "Types d'unité"
-#: models.py:78
+#: models.py:79
msgid "Type Activity"
msgstr "Type d'activité"
-#: models.py:79
+#: models.py:80
msgid "Types Activity"
-msgstr "Types d'activités"
+msgstr "Types d'activité"
-#: models.py:88
+#: models.py:89
msgid "Type Identification"
msgstr "Type d'identification"
-#: models.py:89
+#: models.py:90
msgid "Types Identification"
msgstr "Types d'identification"
-#: models.py:103 wizards.py:61
+#: models.py:104 wizards.py:61
msgid "Operation"
msgstr "Opération"
-#: models.py:113
+#: models.py:114
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:123
+#: models.py:124
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
msgstr ""
-"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après "
+"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée après "
"cette date"
-#: models.py:126
+#: models.py:127
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »"
-#: models.py:128
+#: models.py:129
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
msgstr ""
-"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant "
+"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée avant "
"cette date"
-#: models.py:131
+#: models.py:132
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »"
-#: models.py:139 models.py:140 templates/ishtar/sheet_contextrecord.html:6
+#: models.py:143 models.py:144 templates/ishtar/sheet_contextrecord.html:6
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:142
+#: models.py:146
msgid "Can view all Context Record"
msgstr "Peut voir toutes les Unités d'Enregistrement"
-#: models.py:143
+#: models.py:147
msgid "Can view own Context Record"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: models.py:144
+#: models.py:148
msgid "Can add own Context Record"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: models.py:145
+#: models.py:149
msgid "Can change own Context Record"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: models.py:146
+#: models.py:150
msgid "Can delete own Context Record"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: models.py:151 templates/ishtar/sheet_contextrecord.html:105
+#: models.py:155 templates/ishtar/sheet_contextrecord.html:107
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: models.py:232
+#: models.py:247
+msgid "Symmetrical"
+msgstr "Symétrique"
+
+#: models.py:249
+msgid "Inverse relation"
+msgstr "Relation inverse"
+
+#: models.py:252
+msgid "Relation type"
+msgstr "Type de relation"
+
+#: models.py:253
+msgid "Relation types"
+msgstr "Types de relation"
+
+#: models.py:260
+msgid "Cannot have symmetrical and an inverse_relation"
+msgstr ""
+"Une relation ne peut pas être à la fois symétrique et avoir "
+"une relation inverse"
+
+#: models.py:282
+msgid "Record relation"
+msgstr "Relation entre Unités d'Enregistrement"
+
+#: models.py:283
+msgid "Record relations"
+msgstr "Relations entre Unités d'Enregistrement"
+
+#: models.py:287
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: models.py:233
+#: models.py:288
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
@@ -391,199 +421,207 @@ msgstr "Modifier"
#: templates/ishtar/sheet_contextrecord.html:26
msgid "Complete ID:"
-msgstr "Id. complet :"
+msgstr "ID complet :"
#: templates/ishtar/sheet_contextrecord.html:28
-#: templates/ishtar/sheet_contextrecord.html:71
+#: templates/ishtar/sheet_contextrecord.html:73
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
#: templates/ishtar/sheet_contextrecord.html:29
msgid "Temporary ID:"
-msgstr "Id. temporaire :"
+msgstr "ID temporaire :"
+
+#: templates/ishtar/sheet_contextrecord.html:32
+msgid "Creation date:"
+msgstr "Date de création"
#: templates/ishtar/sheet_contextrecord.html:33
-#: templates/ishtar/sheet_contextrecord.html:84
+msgid "Created by:"
+msgstr "Créé par :"
+
+#: templates/ishtar/sheet_contextrecord.html:35
+#: templates/ishtar/sheet_contextrecord.html:86
msgid "Type:"
msgstr "Type :"
-#: templates/ishtar/sheet_contextrecord.html:35
+#: templates/ishtar/sheet_contextrecord.html:37
msgid "Chronology:"
msgstr "Chronologie :"
-#: templates/ishtar/sheet_contextrecord.html:36
+#: templates/ishtar/sheet_contextrecord.html:38
msgid "Place:"
msgstr "Lieu :"
-#: templates/ishtar/sheet_contextrecord.html:37
+#: templates/ishtar/sheet_contextrecord.html:39
msgid "Parcel:"
msgstr "Parcelle :"
-#: templates/ishtar/sheet_contextrecord.html:42
+#: templates/ishtar/sheet_contextrecord.html:44
msgid "Description:"
msgstr "Description :"
-#: templates/ishtar/sheet_contextrecord.html:43
+#: templates/ishtar/sheet_contextrecord.html:45
msgid "Length (cm):"
msgstr "Longueur (cm) :"
-#: templates/ishtar/sheet_contextrecord.html:44
+#: templates/ishtar/sheet_contextrecord.html:46
msgid "Width (cm):"
msgstr "Largeur (cm) :"
-#: templates/ishtar/sheet_contextrecord.html:45
+#: templates/ishtar/sheet_contextrecord.html:47
msgid "Depth (cm):"
msgstr "Profondeur (cm) :"
-#: templates/ishtar/sheet_contextrecord.html:51
+#: templates/ishtar/sheet_contextrecord.html:53
msgid "Activity:"
msgstr "Activité :"
-#: templates/ishtar/sheet_contextrecord.html:52
+#: templates/ishtar/sheet_contextrecord.html:54
msgid "Identification:"
msgstr "Identification :"
-#: templates/ishtar/sheet_contextrecord.html:53
+#: templates/ishtar/sheet_contextrecord.html:55
msgid "Interpretation:"
-msgstr "Interpretation :"
+msgstr "Interprétation :"
-#: templates/ishtar/sheet_contextrecord.html:57
+#: templates/ishtar/sheet_contextrecord.html:59
msgid "Datations"
msgstr "Datations"
-#: templates/ishtar/sheet_contextrecord.html:58
+#: templates/ishtar/sheet_contextrecord.html:60
msgid "TAQ:"
msgstr "TAQ :"
-#: templates/ishtar/sheet_contextrecord.html:59
+#: templates/ishtar/sheet_contextrecord.html:61
msgid "TAQ estimated:"
msgstr "TAQ estimé :"
-#: templates/ishtar/sheet_contextrecord.html:60
+#: templates/ishtar/sheet_contextrecord.html:62
msgid "TPQ:"
msgstr "TPQ :"
-#: templates/ishtar/sheet_contextrecord.html:61
+#: templates/ishtar/sheet_contextrecord.html:63
msgid "TPQ estimated:"
msgstr "TPQ estimé :"
-#: templates/ishtar/sheet_contextrecord.html:65
+#: templates/ishtar/sheet_contextrecord.html:67
msgid "Operation resume"
msgstr "Résumé de l'opération"
-#: templates/ishtar/sheet_contextrecord.html:66
+#: templates/ishtar/sheet_contextrecord.html:68
msgid "Year:"
msgstr "Année :"
-#: templates/ishtar/sheet_contextrecord.html:67
+#: templates/ishtar/sheet_contextrecord.html:69
msgid "Numerical reference:"
msgstr "Référence numérique :"
-#: templates/ishtar/sheet_contextrecord.html:69
+#: templates/ishtar/sheet_contextrecord.html:71
msgid "Patriarche OA code:"
msgstr "Code d'opération Patriarche"
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:76
msgid "Head scientist:"
msgstr "Responsable scientifique :"
-#: templates/ishtar/sheet_contextrecord.html:76
+#: templates/ishtar/sheet_contextrecord.html:78
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_contextrecord.html:78
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_contextrecord.html:80
+#: templates/ishtar/sheet_contextrecord.html:82
msgid "Closed operation"
msgstr "Opération fermée"
-#: templates/ishtar/sheet_contextrecord.html:81
+#: templates/ishtar/sheet_contextrecord.html:83
msgid "Closing date:"
-msgstr "Date de clotûre :"
+msgstr "Date de clôture :"
-#: templates/ishtar/sheet_contextrecord.html:82
+#: templates/ishtar/sheet_contextrecord.html:84
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_contextrecord.html:85
+#: templates/ishtar/sheet_contextrecord.html:87
msgid "Remains:"
msgstr "Vestiges :"
-#: templates/ishtar/sheet_contextrecord.html:86
+#: templates/ishtar/sheet_contextrecord.html:88
msgid "Periods:"
msgstr "Périodes :"
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:89
msgid "Comment:"
msgstr "Commentaires :"
-#: templates/ishtar/sheet_contextrecord.html:88
+#: templates/ishtar/sheet_contextrecord.html:90
msgid "Localisation"
msgstr "Lieu"
-#: templates/ishtar/sheet_contextrecord.html:89
+#: templates/ishtar/sheet_contextrecord.html:91
msgid "Towns:"
msgstr "Villes :"
-#: templates/ishtar/sheet_contextrecord.html:90
+#: templates/ishtar/sheet_contextrecord.html:92
msgid "Related operation:"
msgstr "Opération associée :"
-#: templates/ishtar/sheet_contextrecord.html:93
+#: templates/ishtar/sheet_contextrecord.html:95
msgid "No operation linked to this context unit!"
-msgstr "Pas d'opération attachée à cette UE !"
+msgstr "Pas d'opération rattachée à cette UE !"
-#: templates/ishtar/sheet_contextrecord.html:96
+#: templates/ishtar/sheet_contextrecord.html:98
msgid "Document from this context record"
-msgstr "Document associée à cette Unité d'Enregistrement"
+msgstr "Document associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:100
+#: templates/ishtar/sheet_contextrecord.html:102
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_contextrecord.html:102
+#: templates/ishtar/sheet_contextrecord.html:104
msgid "Complete Id"
-msgstr "Id. complet"
+msgstr "ID complet"
-#: templates/ishtar/sheet_contextrecord.html:103
+#: templates/ishtar/sheet_contextrecord.html:105
msgid "Short Id"
-msgstr "Id. court"
+msgstr "ID court"
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:106
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_contextrecord.html:106
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "Periods"
msgstr "Périodes"
-#: templates/ishtar/sheet_contextrecord.html:108
+#: templates/ishtar/sheet_contextrecord.html:110
msgid "Weight"
msgstr "Poids"
-#: templates/ishtar/sheet_contextrecord.html:109
+#: templates/ishtar/sheet_contextrecord.html:111
msgid "Numbers"
msgstr "Nombre"
-#: templates/ishtar/sheet_contextrecord.html:111
+#: templates/ishtar/sheet_contextrecord.html:113
msgid "Container ref."
msgstr "Ref. contenant"
-#: templates/ishtar/sheet_contextrecord.html:112
+#: templates/ishtar/sheet_contextrecord.html:114
msgid "Warehouse"
msgstr "Dépôt"
-#: templates/ishtar/sheet_contextrecord.html:130
+#: templates/ishtar/sheet_contextrecord.html:132
msgid "Details"
msgstr "Détails"
-#: templates/ishtar/sheet_contextrecord.html:134
+#: templates/ishtar/sheet_contextrecord.html:136
msgid "No find associated to this context record"
msgstr "Pas de mobilier associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:138
+#: templates/ishtar/sheet_contextrecord.html:140
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
@@ -609,7 +647,7 @@ msgstr "Documents du mobilier associé"
#~ msgstr "Année"
#~ msgid "Find Id"
-#~ msgstr "Id. mobilier"
+#~ msgstr "ID mobilier"
#~ msgid "Id by material type"
-#~ msgstr "Id. par type matériau"
+#~ msgstr "ID par type matériau"
diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po
index fd733daa3..c358ca579 100644
--- a/archaeological_files/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_files/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
# Ishtar po translation.
-# Copyright (C) 2010-2013
+# Copyright (C) 2010-2015
# This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2011.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 00:45+0200\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-24 23:33+0100\n"
+"PO-Revision-Date: 2015-01-24\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
"Language: \n"
@@ -18,13 +18,18 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
+#: data_importer.py:56
+#, 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"
+
#: forms.py:55 forms.py:188 forms.py:228 forms.py:339 forms.py:379
-#: models.py:68 templates/ishtar/sheet_file.html:98
+#: models.py:70 templates/ishtar/sheet_file.html:98
#: templates/ishtar/sheet_file.html:126
msgid "Year"
msgstr "Année"
-#: forms.py:56 forms.py:192 forms.py:230 forms.py:378 models.py:70
+#: forms.py:56 forms.py:192 forms.py:230 forms.py:378 models.py:72
msgid "Numeric reference"
msgstr "Référence numérique"
@@ -36,7 +41,7 @@ msgstr "Autre référence"
msgid "File name"
msgstr "Nom du dossier"
-#: forms.py:61 forms.py:135 forms.py:199 models.py:75
+#: forms.py:61 forms.py:135 forms.py:199 models.py:77
msgid "File type"
msgstr "Type de dossier"
@@ -52,7 +57,7 @@ msgstr "Parcelle (section/numéro)"
msgid "Is active?"
msgstr "Est actif ?"
-#: forms.py:66 forms.py:241 forms.py:364 models.py:82
+#: forms.py:66 forms.py:241 forms.py:364 models.py:84
msgid "General contractor"
msgstr "Aménageur"
@@ -68,7 +73,7 @@ msgstr "Responsable"
msgid "Created by"
msgstr "Créé par"
-#: forms.py:94 forms.py:260 forms.py:390 models.py:91
+#: forms.py:94 forms.py:260 forms.py:390 models.py:93
msgid "Permit reference"
msgstr "Référence du permis"
@@ -80,11 +85,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:197 models.py:96
+#: forms.py:125 forms.py:197 models.py:98
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:126 forms.py:269 models.py:98
+#: forms.py:126 forms.py:269 models.py:100
msgid "Reception date"
msgstr "Date de réception"
@@ -112,31 +117,31 @@ msgstr "Date avant"
msgid "General"
msgstr "Général"
-#: forms.py:182 models.py:77
+#: forms.py:182 models.py:79
msgid "Person in charge"
msgstr "Responsable"
-#: forms.py:196 models.py:74
+#: forms.py:196 models.py:76
msgid "Name"
msgstr "Nom"
-#: forms.py:200 models.py:100
+#: forms.py:200 models.py:102
msgid "Related file"
msgstr "Dossier en relation avec"
-#: forms.py:204 forms.py:310 models.py:116 templates/ishtar/sheet_file.html:85
+#: forms.py:204 forms.py:310 models.py:118 templates/ishtar/sheet_file.html:85
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:208 models.py:107
+#: forms.py:208 models.py:109
msgid "Total surface (m²)"
msgstr "Surface totale des terrains (m²)"
-#: forms.py:211 models.py:111
+#: forms.py:211 models.py:113
msgid "Main address"
msgstr "Adresse des terrains"
-#: forms.py:212 models.py:112
+#: forms.py:212 models.py:114
msgid "Main address - complement"
msgstr "Adresse des terrains - complément"
@@ -149,15 +154,15 @@ msgstr "<br/>(dernier enregistrement : %s)"
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: forms.py:250 models.py:87
+#: forms.py:250 models.py:89
msgid "Responsible for town planning service"
msgstr "Responsable au service instructeur"
-#: forms.py:258 models.py:52 models.py:89
+#: forms.py:258 models.py:54 models.py:91
msgid "Permit type"
msgstr "Type de permis"
-#: forms.py:263 models.py:110
+#: forms.py:263 models.py:112
msgid "Total developed surface (m²)"
msgstr "Surface totale aménagée (m²)"
@@ -166,15 +171,15 @@ msgstr "Surface totale aménagée (m²)"
msgid "Research archaeology"
msgstr "Archéologie programmée"
-#: forms.py:288 models.py:119 templates/ishtar/sheet_file.html:76
+#: forms.py:288 models.py:121 templates/ishtar/sheet_file.html:76
msgid "Departments"
msgstr "Départements"
-#: forms.py:298 models.py:131
+#: forms.py:298 models.py:133
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:300 models.py:124 templates/ishtar/sheet_file.html:78
+#: forms.py:300 models.py:126 templates/ishtar/sheet_file.html:78
msgid "Requested operation type"
msgstr "Type d'opération demandée"
@@ -182,21 +187,21 @@ msgstr "Type d'opération demandée"
msgid "Lead organization"
msgstr "Organisation porteuse du projet"
-#: forms.py:319 models.py:135 templates/ishtar/sheet_file.html:83
+#: forms.py:319 models.py:137 templates/ishtar/sheet_file.html:83
msgid "Classified area"
msgstr "Au sein d'un site classé"
-#: forms.py:321 models.py:137 templates/ishtar/sheet_file.html:84
+#: forms.py:321 models.py:139 templates/ishtar/sheet_file.html:84
msgid "Protected area"
msgstr "Au sein d'un secteur sauvegardé"
#: forms.py:332
msgid "Would you like to close this archaeological file?"
-msgstr "Voulez vous clore ce dossier archéologique ?"
+msgstr "Voulez-vous clore ce dossier archéologique ?"
#: forms.py:336
msgid "Would you like to delete this archaelogical file ?"
-msgstr "Voulez vous supprimer ce dossier archéologique ?"
+msgstr "Voulez-vous supprimer ce dossier archéologique ?"
#: forms.py:340
msgid "Index"
@@ -214,7 +219,7 @@ msgstr "Date de signature après"
msgid "Signature date before"
msgstr "Date de signature avant"
-#: ishtar_menu.py:30 models.py:151 templates/ishtar/sheet_file.html:6
+#: ishtar_menu.py:30 models.py:154 templates/ishtar/sheet_file.html:6
msgid "Archaeological file"
msgstr "Dossier"
@@ -232,7 +237,7 @@ msgstr "Modification"
#: ishtar_menu.py:41
msgid "Closing"
-msgstr "Clotûre"
+msgstr "Clôture"
#: ishtar_menu.py:44 ishtar_menu.py:58
msgid "Deletion"
@@ -258,128 +263,132 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:73 models.py:152
+#: ishtar_menu.py:73 models.py:155
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: models.py:37
+#: models.py:39
msgid "Archaeological file type"
msgstr "Type de dossier archéologique"
-#: models.py:38
+#: models.py:40
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: models.py:53
+#: models.py:55
msgid "Permit types"
msgstr "Types de permis"
-#: models.py:58
+#: models.py:60
msgid "Delay (in days)"
-msgstr "Delai (en jours)"
+msgstr "Délai (en jours)"
-#: models.py:72
+#: models.py:74
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:93
+#: models.py:95
msgid "Closing date"
-msgstr "Date de clotûre"
+msgstr "Date de clôture"
-#: models.py:94
+#: models.py:96
msgid "Towns"
msgstr "Communes"
-#: models.py:105
+#: models.py:107
msgid "Ref. number"
msgstr "Réf. numérique"
-#: models.py:114
+#: models.py:116
msgid "Main address - postal code"
msgstr "Adresse des terrains - code postal"
-#: models.py:126 templates/ishtar/sheet_file.html:79
+#: models.py:128 templates/ishtar/sheet_file.html:79
msgid "Organization"
msgstr "Organisation"
-#: models.py:132
+#: models.py:134
msgid "Research archaeology comment"
msgstr "Commentaire archéologie programmée"
-#: models.py:146
+#: models.py:148
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:154
+#: models.py:150
+msgid "Imported line"
+msgstr "Ligne importée"
+
+#: models.py:157
msgid "Can view all Archaelogical file"
-msgstr "Peut voir tous les dossier archéologique"
+msgstr "Peut voir tous les dossiers archéologiques"
-#: models.py:155
+#: models.py:158
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier"
-#: models.py:156
+#: models.py:159
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier"
-#: models.py:157
+#: models.py:160
msgid "Can change own Archaelogical file"
msgstr "Peut changer son propre Dossier"
-#: models.py:158
+#: models.py:161
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier"
-#: models.py:159
+#: models.py:162
msgid "Can close File"
msgstr "Peut fermer un dossier"
-#: models.py:165
+#: models.py:168
msgid "FILE"
msgstr "DOSSIER"
-#: models.py:278
+#: models.py:270
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:342
+#: models.py:334
msgid "File"
msgstr "Dossier"
-#: models.py:343
+#: models.py:335
msgid "Department"
msgstr "Département"
-#: views.py:114
+#: views.py:121
msgid "File search"
msgstr "Recherche de dossier archéologique"
-#: views.py:124
+#: views.py:131
msgid "New file"
msgstr "Nouveau dossier archéologique"
-#: views.py:143
+#: views.py:150
msgid "File modification"
msgstr "Modification de dossier archéologique"
-#: views.py:165
+#: views.py:172
msgid "File closing"
-msgstr "Clotûre de dossier"
+msgstr "Clôture de dossier"
-#: views.py:172
+#: views.py:179
msgid "File deletion"
msgstr "Suppression de dossier archéologique"
-#: views.py:180
+#: views.py:187
msgid "File: new administrative act"
msgstr "Dossier : nouvel acte administratif"
-#: views.py:190
+#: views.py:197
msgid "File: administrative act modification"
msgstr "Dossier : modification d'acte administratif"
-#: views.py:199
+#: views.py:206
msgid "File: administrative act deletion"
msgstr "Dossier : suppression acte administratif"
@@ -409,7 +418,7 @@ msgstr "Version précédente"
#: templates/ishtar/sheet_file.html:17
msgid "Are you sure to rollback to this version?"
-msgstr "Êtes vous sûr de vouloir revenir à cette version ?"
+msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
#: templates/ishtar/sheet_file.html:18
msgid "Next version"
@@ -481,7 +490,7 @@ msgstr "Dossier fermé"
#: templates/ishtar/sheet_file.html:44
msgid "Closing date:"
-msgstr "Date de clotûre :"
+msgstr "Date de clôture :"
#: templates/ishtar/sheet_file.html:44
msgid "by"
@@ -549,7 +558,7 @@ msgstr "Référence du permis :"
#: templates/ishtar/sheet_file.html:70
msgid "General contractor organisation:"
-msgstr "Aménageur (organiation) :"
+msgstr "Aménageur (organisation) :"
#: templates/ishtar/sheet_file.html:71
msgid "General contractor:"
@@ -572,7 +581,7 @@ msgstr "Opérations associées"
#: templates/ishtar/sheet_file.html:92
msgid "Administrativ acts"
-msgstr "Actes administratif"
+msgstr "Actes administratifs"
#: templates/ishtar/sheet_file.html:99 templates/ishtar/sheet_file.html:127
msgid "Ref."
@@ -600,7 +609,7 @@ msgstr "Pas d'opération associée à ce dossier archéologique"
#: templates/ishtar/sheet_file.html:124
msgid "Admninistrative acts linked to associated operations"
-msgstr "Actes administratifs associé à ces opérations"
+msgstr "Actes administratifs associés à ces opérations"
#: templates/ishtar/sheet_file.html:129
msgid "Date"
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 41eeaef3b..5a3ff4ec1 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -235,9 +235,9 @@ class UpstreamFindFormSelection(FindFormSelection):
#############################################
SourceFindFormSelection = get_form_selection(
- 'SourceFindFormSelection', _(u"Archaelogical find search"), 'find',
+ 'SourceFindFormSelection', _(u"Archaeological find search"), 'find',
models.Find, FindSelect, 'get-find',
- _(u"You should select an archaelogical find."))
+ _(u"You should select an archaeological find."))
class FindSourceSelect(SourceSelect):
find__base_finds__context_record__operation__year = forms.IntegerField(
diff --git a/archaeological_finds/locale/fr/LC_MESSAGES/django.po b/archaeological_finds/locale/fr/LC_MESSAGES/django.po
index 7470b8e8b..6a0f23a30 100644
--- a/archaeological_finds/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_finds/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
# Ishtar po translation.
-# Copyright (C) 2010-2013
+# Copyright (C) 2010-2015
# This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2013.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-27 22:41+0100\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-25 00:32+0100\n"
+"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
"Language: \n"
@@ -18,42 +18,42 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: forms.py:51 ishtar_menu.py:27 models.py:184 models.py:309 models.py:367
+#: forms.py:51 ishtar_menu.py:27 models.py:193 models.py:333 models.py:393
#: templates/ishtar/sheet_find.html:6
msgid "Find"
msgstr "Mobilier"
-#: forms.py:55 forms.py:212 models.py:56 models.py:157
+#: forms.py:55 forms.py:212 models.py:61 models.py:166
msgid "ID"
msgstr "Identifiant"
-#: forms.py:57 forms.py:118 forms.py:159 models.py:57 models.py:158
-#: models.py:326 templates/ishtar/sheet_find.html:33
+#: forms.py:57 forms.py:118 forms.py:159 models.py:62 models.py:167
+#: models.py:351 templates/ishtar/sheet_find.html:33
msgid "Description"
msgstr "Description"
-#: forms.py:59 forms.py:119 models.py:60
+#: forms.py:59 forms.py:119 models.py:65
msgid "Is isolated?"
msgstr "Est isolé ?"
-#: forms.py:61 forms.py:115 forms.py:216 models.py:42 models.py:160
-#: templates/ishtar/sheet_find.html:35
+#: forms.py:61 forms.py:115 forms.py:216 models.py:47 models.py:169
+#: templates/ishtar/sheet_find.html:36
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:62 forms.py:116 models.py:51 models.py:162
+#: forms.py:62 forms.py:116 models.py:56 models.py:171
msgid "Conservatory state"
msgstr "État de conservation"
-#: forms.py:64 forms.py:217 models.py:163 templates/ishtar/sheet_find.html:39
+#: forms.py:64 forms.py:217 models.py:172 templates/ishtar/sheet_find.html:40
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:65 forms.py:218 models.py:164 templates/ishtar/sheet_find.html:41
+#: forms.py:65 forms.py:218 models.py:173 templates/ishtar/sheet_find.html:42
msgid "Weight (g)"
msgstr "Poids (g)"
-#: forms.py:66 forms.py:219 models.py:165 templates/ishtar/sheet_find.html:43
+#: forms.py:66 forms.py:219 models.py:174 templates/ishtar/sheet_find.html:44
msgid "Find number"
msgstr "Mobilier (en nombre)"
@@ -70,7 +70,7 @@ msgstr ""
"<p>Les images trop grandes sont retaillées à : %(width)dx%(height)d (le "
"ratio est conservé).</p>"
-#: forms.py:84 models.py:170 templates/ishtar/sheet_find.html:37
+#: forms.py:84 models.py:179 templates/ishtar/sheet_find.html:38
msgid "Dating"
msgstr "Datation"
@@ -78,11 +78,11 @@ msgstr "Datation"
msgid "Period"
msgstr "Période"
-#: forms.py:90 forms.py:161 models.py:334 models.py:371
+#: forms.py:90 forms.py:161 models.py:360 models.py:399
msgid "Start date"
msgstr "Date de début"
-#: forms.py:92 forms.py:163 models.py:335 models.py:372
+#: forms.py:92 forms.py:163 models.py:361 models.py:400
msgid "End date"
msgstr "Date de fin"
@@ -114,15 +114,15 @@ msgstr "Recherche de mobilier"
msgid "Base treatment"
msgstr "Traitement de base"
-#: forms.py:149 models.py:319 models.py:328
+#: forms.py:149 models.py:343 models.py:353
msgid "Treatment type"
msgstr "Type de traitement"
-#: forms.py:150 models.py:332 models.py:370
+#: forms.py:150 models.py:357 models.py:397
msgid "Person"
msgstr "Individu"
-#: forms.py:154 models.py:330
+#: forms.py:154 models.py:355
msgid "Location"
msgstr "Lieu"
@@ -130,13 +130,13 @@ msgstr "Lieu"
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:176 models.py:185
+#: forms.py:176 models.py:194
msgid "Finds"
msgstr "Mobilier"
#: forms.py:184
msgid "You should at least select one archaeological find."
-msgstr "Vous devez sélectionner du mobilier archéologique."
+msgstr "Vous devez sélectionner au moins un mobilier archéologique."
#: forms.py:210
msgid "Resulting find"
@@ -206,167 +206,167 @@ msgstr "Documentation"
msgid "Deletion"
msgstr "Suppression"
-#: models.py:36
+#: models.py:40
msgid "Code"
msgstr "Code"
-#: models.py:37
+#: models.py:41
msgid "Recommendation"
-msgstr "Recommendation"
+msgstr "Recommandation"
-#: models.py:39
+#: models.py:44
msgid "Parent material"
msgstr "Matériau parent"
-#: models.py:43
+#: models.py:48
msgid "Material types"
-msgstr "Types de matériaux"
+msgstr "Types de matériau"
-#: models.py:48
+#: models.py:53
msgid "Parent conservatory state"
msgstr "État de conservation - parent"
-#: models.py:52
+#: models.py:57
msgid "Conservatory states"
msgstr "États de conservation"
-#: models.py:59
+#: models.py:64
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:67 models.py:154
+#: models.py:72 models.py:163
msgid "Base find"
msgstr "Mobilier de base"
-#: models.py:68
+#: models.py:73
msgid "Base finds"
msgstr "Mobiliers de base"
-#: models.py:70
+#: models.py:75
msgid "Can view all Base find"
-msgstr "Peut voir tous le mobilier de base"
+msgstr "Peut voir tout le Mobilier de base"
-#: models.py:71
+#: models.py:76
msgid "Can view own Base find"
msgstr "Peut voir son propre Mobilier de base"
-#: models.py:72
+#: models.py:77
msgid "Can add own Base find"
msgstr "Peut ajouter son propre Mobilier de base"
-#: models.py:73
+#: models.py:78
msgid "Can change own Base find"
msgstr "Peut changer son propre Mobilier de base"
-#: models.py:74
+#: models.py:79
msgid "Can delete own Base find"
msgstr "Peut supprimer son propre Mobilier de base"
-#: models.py:156
+#: models.py:165
msgid "Order"
msgstr "Ordre"
-#: models.py:167 templates/ishtar/sheet_find.html:45
+#: models.py:176 templates/ishtar/sheet_find.html:46
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models.py:169 templates/ishtar/sheet_find.html:47
+#: models.py:178 templates/ishtar/sheet_find.html:48
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models.py:172 models.py:324 templates/ishtar/sheet_find.html:49
+#: models.py:181 models.py:349 templates/ishtar/sheet_find.html:50
msgid "Container"
msgstr "Contenant"
-#: models.py:187
+#: models.py:196
msgid "Can view all Find"
-msgstr "Peut voir tout le mobilier"
+msgstr "Peut voir tout le Mobilier"
-#: models.py:188
+#: models.py:197
msgid "Can view own Find"
-msgstr "Peut voir son propre mobilier"
+msgstr "Peut voir son propre Mobilier"
-#: models.py:189
+#: models.py:198
msgid "Can add own Find"
-msgstr "Peut ajouter son propre mobilier"
+msgstr "Peut ajouter son propre Mobilier"
-#: models.py:190
+#: models.py:199
msgid "Can change own Find"
-msgstr "Peut changer son propre mobilier"
+msgstr "Peut changer son propre Mobilier"
-#: models.py:191
+#: models.py:200
msgid "Can delete own Find"
-msgstr "Peut supprimer son propre mobilier"
+msgstr "Peut supprimer son propre Mobilier"
-#: models.py:196
+#: models.py:205
msgid "FIND"
msgstr "MOBILIER"
-#: models.py:307
+#: models.py:331
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models.py:308
+#: models.py:332
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models.py:317
+#: models.py:341
msgid "Virtual"
msgstr "Virtuel"
-#: models.py:320
+#: models.py:344
msgid "Treatment types"
-msgstr "Types de traitements"
+msgstr "Types de traitement"
-#: models.py:339 models.py:359
+#: models.py:365 models.py:385
msgid "Treatment"
msgstr "Traitement"
-#: models.py:340
+#: models.py:366
msgid "Treatments"
msgstr "Traitements"
-#: models.py:342
+#: models.py:368
msgid "Can view all Treatment"
msgstr "Peut voir tous les Traitements"
-#: models.py:343
+#: models.py:369
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: models.py:344
+#: models.py:370
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: models.py:345
+#: models.py:371
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: models.py:346
+#: models.py:372
msgid "Can delete own Treatment"
-msgstr "Peut supprimer son propre traitement"
+msgstr "Peut supprimer son propre Traitement"
-#: models.py:352
+#: models.py:378
msgid "by"
msgstr "par"
-#: models.py:357
+#: models.py:383
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: models.py:358
+#: models.py:384
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: models.py:369
+#: models.py:396
msgid "Administrative act"
msgstr "Acte administratif"
-#: models.py:375
+#: models.py:403
msgid "Property"
msgstr "Propriété"
-#: models.py:376
+#: models.py:404
msgid "Properties"
msgstr "Propriétés"
@@ -404,7 +404,7 @@ msgstr "Version précédente"
#: templates/ishtar/sheet_find.html:18
msgid "Are you sure to rollback to this version?"
-msgstr "Êtes vous sûr de vouloir revenir à cette version ?"
+msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
#: templates/ishtar/sheet_find.html:19
msgid "Next version"
@@ -431,56 +431,60 @@ msgid "Name"
msgstr "Nom"
#: templates/ishtar/sheet_find.html:31 templates/ishtar/sheet_find.html:33
-#: templates/ishtar/sheet_find.html:35 templates/ishtar/sheet_find.html:37
-#: templates/ishtar/sheet_find.html:39 templates/ishtar/sheet_find.html:41
-#: templates/ishtar/sheet_find.html:43 templates/ishtar/sheet_find.html:45
-#: templates/ishtar/sheet_find.html:47 templates/ishtar/sheet_find.html:49
-#: templates/ishtar/sheet_find.html:55 templates/ishtar/sheet_find.html:57
-#: templates/ishtar/sheet_find.html:59 templates/ishtar/sheet_find.html:61
+#: templates/ishtar/sheet_find.html:36 templates/ishtar/sheet_find.html:38
+#: templates/ishtar/sheet_find.html:40 templates/ishtar/sheet_find.html:42
+#: templates/ishtar/sheet_find.html:44 templates/ishtar/sheet_find.html:46
+#: templates/ishtar/sheet_find.html:48 templates/ishtar/sheet_find.html:50
+#: templates/ishtar/sheet_find.html:56 templates/ishtar/sheet_find.html:58
+#: templates/ishtar/sheet_find.html:60 templates/ishtar/sheet_find.html:62
msgid ":"
msgstr " :"
-#: templates/ishtar/sheet_find.html:52
+#: templates/ishtar/sheet_find.html:35
+msgid "Created by:"
+msgstr ""
+
+#: templates/ishtar/sheet_find.html:53
msgid "Associated base finds"
msgstr "Matériel de référence associé"
-#: templates/ishtar/sheet_find.html:55
+#: templates/ishtar/sheet_find.html:56
msgid "Complete ID"
-msgstr "Id. complet"
+msgstr "ID complet"
-#: templates/ishtar/sheet_find.html:57
+#: templates/ishtar/sheet_find.html:58
msgid "Related context record"
msgstr "Unité d'Enregistrement associée"
-#: templates/ishtar/sheet_find.html:59
+#: templates/ishtar/sheet_find.html:60
msgid "Related parcel"
msgstr "Parcelle associée"
-#: templates/ishtar/sheet_find.html:61
+#: templates/ishtar/sheet_find.html:62
msgid "Related operation"
msgstr "Opération associée"
-#: templates/ishtar/sheet_find.html:67
+#: templates/ishtar/sheet_find.html:68
msgid "Documents"
msgstr "Documents"
-#: templates/ishtar/sheet_find.html:69
+#: templates/ishtar/sheet_find.html:70
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:70
+#: templates/ishtar/sheet_find.html:71
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_find.html:71
+#: templates/ishtar/sheet_find.html:72
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:72 templates/ishtar/sheet_find.html:79
+#: templates/ishtar/sheet_find.html:73 templates/ishtar/sheet_find.html:80
msgid "Link"
msgstr "Lien"
-#: templates/ishtar/sheet_find.html:82
+#: templates/ishtar/sheet_find.html:83
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 18bb27bc0..9f80de36d 100644
--- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
# Ishtar po translation.
-# Copyright (C) 2010-2014
+# Copyright (C) 2010-2015
# This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2011.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-21 00:45+0200\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-25 01:13+0100\n"
+"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
"Language: \n"
@@ -19,11 +19,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: forms.py:67 forms.py:190 forms.py:573 forms.py:594 forms.py:598
-#: models.py:654 templates/ishtar/blocks/window_tables/parcels.html:8
+#: models.py:670 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:70 forms.py:110 forms.py:551 models.py:648
+#: forms.py:70 forms.py:110 forms.py:551 models.py:664
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -32,24 +32,24 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:72 forms.py:199 forms.py:427 forms.py:740 models.py:162
-#: models.py:507 models.py:646
+#: forms.py:72 forms.py:199 forms.py:427 forms.py:740 models.py:179
+#: models.py:525 models.py:662
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
msgstr "Année"
-#: forms.py:75 models.py:649
+#: forms.py:75 models.py:665
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Section"
msgstr "Section"
-#: forms.py:77 models.py:650
+#: forms.py:77 models.py:666
msgid "Parcel number"
msgstr "Numéro de parcelle"
#: forms.py:105
msgid "Town section and parcel number fields are required."
-msgstr "La commune, la section et le numéro de parcelle sont obligatoire."
+msgstr "La commune, la section et le numéro de parcelle sont obligatoires."
#: forms.py:112
msgid "Full text input"
@@ -72,28 +72,28 @@ msgid "Name (full text search)"
msgstr "Nom (recherche texte intégral)"
#: forms.py:206 forms.py:327 forms.py:415 forms.py:718 models.py:43
-#: models.py:170
+#: models.py:187
msgid "Operation type"
msgstr "Type d'opération"
-#: forms.py:212 models.py:494
+#: forms.py:212 models.py:512
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:217 forms.py:408 models.py:159
+#: forms.py:217 forms.py:408 models.py:176
msgid "In charge"
msgstr "Responsable"
-#: forms.py:218 forms.py:329 forms.py:402 models.py:157
+#: forms.py:218 forms.py:329 forms.py:402 models.py:174
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:223 models.py:172
+#: forms.py:223 models.py:189
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:224 forms.py:623 forms.py:642 models.py:176
-#: templates/ishtar/sheet_operation.html:128
+#: forms.py:224 forms.py:623 forms.py:642 models.py:193
+#: templates/ishtar/sheet_operation.html:130
msgid "Periods"
msgstr "Périodes"
@@ -125,7 +125,7 @@ msgstr "Est ouvert ?"
msgid "Created by"
msgstr "Créé par"
-#: forms.py:260 forms.py:712 views.py:181
+#: forms.py:260 forms.py:712 views.py:182
msgid "Operation search"
msgstr "Recherche d'opérations"
@@ -137,7 +137,7 @@ msgstr "Vous devez sélectionner une opération."
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:304 forms.py:505 models.py:504 wizards.py:73
+#: forms.py:304 forms.py:505 models.py:522 wizards.py:73
msgid "Archaelogical file"
msgstr "Dossier"
@@ -149,7 +149,7 @@ msgstr "mois"
msgid "years"
msgstr "années"
-#: forms.py:311 models.py:144
+#: forms.py:311 models.py:161
msgid "Creation date"
msgstr "Date de création"
@@ -210,15 +210,15 @@ msgstr "Général"
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:417 models.py:96 models.py:143 models.py:728
+#: forms.py:417 models.py:96 models.py:160 models.py:745
msgid "Start date"
msgstr "Date de début"
-#: forms.py:419 models.py:146
+#: forms.py:419 models.py:163
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:421 models.py:149
+#: forms.py:421 models.py:166
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
@@ -226,15 +226,15 @@ msgstr "Date de livraison du rapport"
msgid "Total surface (m²)"
msgstr "Surface totale des terrains (m²)"
-#: forms.py:431 forms.py:502 models.py:163 models.py:343
+#: forms.py:431 forms.py:502 models.py:180 models.py:362
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:434 models.py:213
+#: forms.py:434 models.py:230
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:436 models.py:211
+#: forms.py:436 models.py:228
msgid "Operator reference"
msgstr "Référence de l'opérateur"
@@ -242,7 +242,7 @@ msgstr "Référence de l'opérateur"
msgid "Associated archaeological sites"
msgstr "Sites archéologiques associés"
-#: forms.py:459 models.py:215
+#: forms.py:459 models.py:232
msgid "Comment"
msgstr "Commentaire"
@@ -255,7 +255,7 @@ msgstr ""
#: forms.py:479
msgid "The excavation end date cannot be before the start date."
-msgstr "La date de fin de chantier ne peut être avant la date de début."
+msgstr "La date de fin de chantier ne peut être antérieure à la date de début."
#: forms.py:493
#, python-format
@@ -274,20 +274,20 @@ msgstr "Mauvais code d'opération"
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:525 models.py:174
+#: forms.py:525 models.py:191
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (€)"
-msgstr "Cout (€)"
+msgstr "Coût (€)"
-#: forms.py:526 models.py:177
+#: forms.py:526 models.py:194
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:528 models.py:179
+#: forms.py:528 models.py:196
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:530 models.py:181
+#: forms.py:530 models.py:198
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
@@ -295,25 +295,25 @@ msgstr "Jours-hommes effectifs"
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:542 models.py:194
+#: forms.py:542 models.py:211
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:544 models.py:197
+#: forms.py:544 models.py:214
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:546 models.py:200
+#: forms.py:546 models.py:217
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:549 forms.py:570 models.py:173 models.py:558
+#: forms.py:549 forms.py:570 models.py:190 models.py:575
msgid "Towns"
msgstr "Communes"
-#: forms.py:575 models.py:653 models.py:727
-#: templates/ishtar/sheet_operation.html:100
-#: templates/ishtar/sheet_operation.html:132
+#: forms.py:575 models.py:669 models.py:744
+#: templates/ishtar/sheet_operation.html:102
+#: templates/ishtar/sheet_operation.html:134
msgid "Parcel"
msgstr "Parcelle"
@@ -353,26 +353,26 @@ msgstr "Cette référence existe déjà."
msgid "Associated archaelogical sites"
msgstr "Entités archéologiques associées"
-#: forms.py:667 ishtar_menu.py:29
+#: forms.py:667 ishtar_menu.py:32
msgid "Search"
msgstr "Recherche"
#: forms.py:671
msgid "Would you like to close this operation?"
-msgstr "Voulez vous clore cette opération ?"
+msgstr "Voulez-vous clore cette opération ?"
#: forms.py:675
msgid "Would you like to delete this operation?"
-msgstr "Voulez vous supprimer cette opération ?"
+msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:683 forms.py:741 models.py:448 models.py:487
+#: forms.py:683 forms.py:741 models.py:467 models.py:505
msgid "Index"
msgstr "Index"
#: forms.py:706
#, python-format
msgid ""
-"Index already exist for operation: %(operation)s - use a value bigger than "
+"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
@@ -394,7 +394,7 @@ msgstr "Recherche de document"
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:745 forms.py:783 models.py:468 models.py:482
+#: forms.py:745 forms.py:783 models.py:487 models.py:500
msgid "Act type"
msgstr "Type d'acte"
@@ -402,99 +402,103 @@ msgstr "Type d'acte"
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: forms.py:775 forms.py:868
+#: forms.py:775 forms.py:826 forms.py:888
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:788 models.py:508
+#: forms.py:788 models.py:526
msgid "Object"
msgstr "Objet"
-#: forms.py:790 models.py:505
+#: forms.py:790 models.py:523
msgid "Signature date"
msgstr "Date de signature"
#: forms.py:805
msgid "Would you like to delete this administrative act?"
-msgstr "Voulez vous supprimer cet acte administratif ?"
+msgstr "Voulez-vous supprimer cet acte administratif ?"
#: forms.py:809
msgid "Template"
msgstr "Patron"
-#: forms.py:834
+#: forms.py:833 forms.py:837
+msgid "This document is not intended for this type of act."
+msgstr "Ce document n'est pas destiné à ce type d'acte."
+
+#: forms.py:854
msgid "Doc generation"
-msgstr "Generation de document"
+msgstr "Génération de document"
-#: forms.py:836
+#: forms.py:856
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:846
+#: forms.py:866
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:855 ishtar_menu.py:94 views.py:323
+#: forms.py:875 ishtar_menu.py:88 views.py:324
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
-#: ishtar_menu.py:27 models.py:223 models.py:423 models.py:446 models.py:458
-#: models.py:499 models.py:645 wizards.py:291 wizards.py:301
+#: ishtar_menu.py:30 models.py:240 models.py:442 models.py:465 models.py:477
+#: models.py:517 models.py:661 wizards.py:292 wizards.py:302
#: templates/ishtar/sheet_operation.html:6
msgid "Operation"
msgstr "Opération"
-#: ishtar_menu.py:33
+#: ishtar_menu.py:36
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:37 ishtar_menu.py:57 ishtar_menu.py:79
+#: ishtar_menu.py:40 ishtar_menu.py:59 ishtar_menu.py:105
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:41
+#: ishtar_menu.py:44
msgid "Closing"
-msgstr "Clotûre"
+msgstr "Clôture"
-#: ishtar_menu.py:44 ishtar_menu.py:62 ishtar_menu.py:84
+#: ishtar_menu.py:47 ishtar_menu.py:64 ishtar_menu.py:110
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:49 models.py:518
-#: templates/ishtar/sheet_administrativeact.html:6
-msgid "Administrative act"
-msgstr "Acte administratif"
+#: ishtar_menu.py:51
+msgid "Documentation"
+msgstr "Documentation"
-#: ishtar_menu.py:52 ishtar_menu.py:74 widgets.py:51
+#: ishtar_menu.py:54 ishtar_menu.py:100 widgets.py:51
msgid "Add"
msgstr "Ajout"
-#: ishtar_menu.py:67
-msgid "Documents"
-msgstr "Documents"
-
#: ishtar_menu.py:71
-msgid "Documentation"
-msgstr "Documentation"
-
-#: ishtar_menu.py:91
-msgid "Administrative Act"
-msgstr "Acte administratif"
-
-#: ishtar_menu.py:100
msgid "Dashboard"
msgstr "Tableau de bord"
-#: ishtar_menu.py:102
+#: ishtar_menu.py:73
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:105 models.py:224
+#: ishtar_menu.py:76 models.py:241
#: templates/ishtar/dashboards/dashboard_operation.html:9
msgid "Operations"
msgstr "Opérations"
+#: ishtar_menu.py:85
+msgid "Administrative Act"
+msgstr "Acte administratif"
+
+#: ishtar_menu.py:97 models.py:536
+#: templates/ishtar/sheet_administrativeact.html:6
+msgid "Administrative act"
+msgstr "Acte administratif"
+
+#: ishtar_menu.py:115
+msgid "Documents"
+msgstr "Documents"
+
#: models.py:40 models.py:95
msgid "Order"
msgstr "Ordre"
@@ -507,7 +511,7 @@ msgstr "Préventif"
msgid "Operation types"
msgstr "Types d'opération"
-#: models.py:97 models.py:729
+#: models.py:97 models.py:746
msgid "End date"
msgstr "Date de fin"
@@ -527,269 +531,269 @@ msgstr "Types de période"
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: models.py:115 models.py:219
+#: models.py:115 models.py:236
msgid "Archaeological sites"
msgstr "Entités archéologiques"
#: models.py:118
msgid "Can view all Archaeological site"
-msgstr "Peut voir toutes les entités archéologiques"
+msgstr "Peut voir toutes les Entités archéologiques"
#: models.py:120
msgid "Can view own Archaeological site"
-msgstr "Peut voir ses propres entités archéologiques"
+msgstr "Peut voir ses propres Entités archéologiques"
#: models.py:122
msgid "Can add own Archaeological site"
-msgstr "Peut ajouter ses propres entités archéologique"
+msgstr "Peut ajouter ses propres Entités archéologique"
#: models.py:124
msgid "Can change own Archaeological site"
-msgstr "Peut changer ses propres entités archéologiques"
+msgstr "Peut changer ses propres Entités archéologiques"
#: models.py:126
msgid "Can delete own Archaeological site"
-msgstr "Peut supprimer ses propres entités archéologiques"
+msgstr "Peut supprimer ses propres Entités archéologiques"
-#: models.py:148
+#: models.py:165
msgid "Closing date"
-msgstr "Date de clotûre"
+msgstr "Date de clôture"
-#: models.py:152
+#: models.py:169
msgid "In charge scientist"
msgstr "Responsable scientifique"
-#: models.py:167 models.py:642
+#: models.py:184 models.py:658
msgid "File"
msgstr "Dossier"
-#: models.py:171
+#: models.py:188
msgid "Surface (m²)"
msgstr "Area (m²)"
-#: models.py:216
+#: models.py:233
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:226
+#: models.py:243
msgid "Can view all Operation"
msgstr "Peut voir toutes les Opérations"
-#: models.py:227
+#: models.py:244
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: models.py:228
+#: models.py:245
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: models.py:229
+#: models.py:246
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: models.py:230
+#: models.py:247
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: models.py:231
+#: models.py:248
msgid "Can close Operation"
-msgstr "Peut ferme une Opération"
+msgstr "Peut fermer une Opération"
-#: models.py:260
+#: models.py:271
msgid "OPE"
msgstr "OPE"
-#: models.py:301
+#: models.py:320
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:328 models.py:457
+#: models.py:347 models.py:476
msgid "Archaeological file"
-msgstr "Dossier"
+msgstr "Dossier archéologique"
-#: models.py:358
+#: models.py:377
msgid "This operation code already exists for this year"
-msgstr "Cet code d'opération existe déjà pour cette année."
+msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:424 templates/ishtar/dashboards/dashboard_operation.html:273
+#: models.py:443 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:432
+#: models.py:451
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:433
+#: models.py:452
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:436
+#: models.py:455
msgid "Can view all Operation source"
-msgstr "Peut voir toutes les sources des opérations"
+msgstr "Peut voir toutes les Sources des opérations"
-#: models.py:438
+#: models.py:457
msgid "Can view own Operation source"
-msgstr "Peut voir sa propre source d'opération"
+msgstr "Peut voir sa propre Source d'opération"
-#: models.py:440
+#: models.py:459
msgid "Can add own Operation source"
-msgstr "Peut ajouter sa propre source d'opération"
+msgstr "Peut ajouter sa propre Source d'opération"
-#: models.py:442
+#: models.py:461
msgid "Can change own Operation source"
-msgstr "Peut changer sa propre source d'opération"
+msgstr "Peut changer sa propre Source d'opération"
-#: models.py:444
+#: models.py:463
msgid "Can delete own Operation source"
-msgstr "Peut supprimer sa propre source d'opération"
+msgstr "Peut supprimer sa propre Source d'opération"
-#: models.py:460
+#: models.py:479
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:462
+#: models.py:481
msgid "Code"
msgstr "Code"
-#: models.py:464
+#: models.py:483
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:466
+#: models.py:485
msgid "Indexed"
msgstr "Indexé"
-#: models.py:469
+#: models.py:488
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:485
+#: models.py:503
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:489
+#: models.py:507
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:496
+#: models.py:514
msgid "Signatory"
msgstr "Signataire"
-#: models.py:519
+#: models.py:537
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:522
+#: models.py:540
msgid "Can view all Administrative act"
-msgstr "Peut voir tout les Actes administratifs"
+msgstr "Peut voir tous les Actes administratifs"
-#: models.py:524
+#: models.py:542
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:526
+#: models.py:544
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:528
+#: models.py:546
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: models.py:530
+#: models.py:548
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:539
+#: models.py:556
#: templates/ishtar/blocks/window_tables/administrativacts.html:5
msgid "Ref."
msgstr "Réf."
-#: models.py:605
+#: models.py:621
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:725
+#: models.py:742
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:732
+#: models.py:749
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:733
+#: models.py:750
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:757
+#: models.py:774
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:758
+#: models.py:775
msgid "Effective"
msgstr "Effectif"
-#: models.py:759
+#: models.py:776
msgid "Active"
msgstr "Actif"
-#: models.py:760
+#: models.py:777
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:761
+#: models.py:778
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:762
+#: models.py:779
msgid "Closed"
msgstr "Fermé"
-#: models.py:763
+#: models.py:780
msgid "Documented and closed"
-msgstr "Documenté et clôt"
+msgstr "Documenté et clos"
-#: views.py:200
+#: views.py:201
msgid "New operation"
msgstr "Nouvelle opération"
-#: views.py:231
+#: views.py:232
msgid "Operation modification"
msgstr "Modification d'une opération"
-#: views.py:261
+#: views.py:262
msgid "Operation closing"
-msgstr "Clotûre de l'opération"
+msgstr "Clôture de l'opération"
-#: views.py:267
+#: views.py:268
msgid "Operation deletion"
msgstr "Suppression d'une opération"
-#: views.py:275
+#: views.py:276
msgid "Operation: source creation"
-msgstr "Operation : nouvelle documentation associée"
+msgstr "Opération : nouvelle documentation associée"
-#: views.py:283
+#: views.py:284
msgid "Operation: source modification"
-msgstr "Operation : modification d'une documentation associée"
+msgstr "Opération : modification d'une documentation associée"
-#: views.py:289
+#: views.py:290
msgid "Operation: source deletion"
-msgstr "Operation : suppression d'une documentation associée"
+msgstr "Opération : suppression d'une documentation associée"
-#: views.py:298
+#: views.py:299
msgid "Operation: new administrative act"
-msgstr "Operation : nouvel acte administratif"
+msgstr "Opération : nouvel acte administratif"
-#: views.py:308
+#: views.py:309
msgid "Operation: administrative act modification"
-msgstr "Operation : modification d'un acte administratif"
+msgstr "Opération : modification d'un acte administratif"
-#: views.py:317
+#: views.py:318
msgid "Operation: administrative act deletion"
-msgstr "Operation : suppression d'un acte administratif"
+msgstr "Opération : suppression d'un acte administratif"
#: wizards.py:165
msgid ""
@@ -797,7 +801,7 @@ msgid ""
"the first step."
msgstr ""
"Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un "
-"oubli, définissez le à la première étape."
+"oubli, définissez-le à la première étape."
#: templates/ishtar/sheet_administrativeact.html:10
#: templates/ishtar/sheet_operation.html:24
@@ -834,33 +838,38 @@ msgid "Type:"
msgstr "Type :"
#: templates/ishtar/sheet_administrativeact.html:16
+#, fuzzy
+msgid "Object:"
+msgstr "Objet"
+
+#: templates/ishtar/sheet_administrativeact.html:17
msgid "Signature date:"
msgstr "Date de signature :"
-#: templates/ishtar/sheet_administrativeact.html:17
+#: templates/ishtar/sheet_administrativeact.html:18
#: templates/ishtar/sheet_operation.html:43
msgid "In charge:"
msgstr "Responsable :"
-#: templates/ishtar/sheet_administrativeact.html:18
+#: templates/ishtar/sheet_administrativeact.html:19
msgid "Archaeological preventive operator:"
msgstr "Opérateur d'archéologie préventive :"
-#: templates/ishtar/sheet_administrativeact.html:20
+#: templates/ishtar/sheet_administrativeact.html:21
#: templates/ishtar/sheet_operation.html:58
msgid "Associated file:"
msgstr "Dossier associé :"
-#: templates/ishtar/sheet_administrativeact.html:21
+#: templates/ishtar/sheet_administrativeact.html:22
msgid "Associated operation:"
msgstr "Opération associée :"
-#: templates/ishtar/sheet_administrativeact.html:23
+#: templates/ishtar/sheet_administrativeact.html:24
#: templates/ishtar/sheet_operation.html:50
msgid "Surface:"
msgstr "Surface :"
-#: templates/ishtar/sheet_administrativeact.html:24
+#: templates/ishtar/sheet_administrativeact.html:25
#: templates/ishtar/sheet_operation.html:37
msgid "Created by:"
msgstr "Créé par :"
@@ -871,7 +880,7 @@ msgstr "Version précédente"
#: templates/ishtar/sheet_operation.html:18
msgid "Are you sure to rollback to this version?"
-msgstr "Êtes vous sûr de vouloir revenir à cette version ?"
+msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
#: templates/ishtar/sheet_operation.html:19
msgid "Next version"
@@ -927,7 +936,7 @@ msgstr "Opération fermée"
#: templates/ishtar/sheet_operation.html:47
msgid "Closing date:"
-msgstr "Date de clotûre :"
+msgstr "Date de clôture :"
#: templates/ishtar/sheet_operation.html:47
msgid "by"
@@ -1001,100 +1010,100 @@ msgstr "Code postal :"
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_operation.html:87
+#: templates/ishtar/sheet_operation.html:88
msgid "Administrativ acts"
msgstr "Actes administratifs"
-#: templates/ishtar/sheet_operation.html:90
+#: templates/ishtar/sheet_operation.html:92
msgid "Document from this operation"
msgstr "Documents de cette opération"
-#: templates/ishtar/sheet_operation.html:94
+#: templates/ishtar/sheet_operation.html:96
msgid "Context records"
-msgstr "Unité d'Enregistrement"
+msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:96
+#: templates/ishtar/sheet_operation.html:98
msgid "ID"
msgstr "Identifiant"
-#: templates/ishtar/sheet_operation.html:97
+#: templates/ishtar/sheet_operation.html:99
#: templates/ishtar/blocks/window_tables/administrativacts.html:6
#: templates/ishtar/dashboards/dashboard_operation.html:82
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_operation.html:98
+#: templates/ishtar/sheet_operation.html:100
msgid "Chronology"
msgstr "Chronologie"
-#: templates/ishtar/sheet_operation.html:99
-#: templates/ishtar/sheet_operation.html:129
+#: templates/ishtar/sheet_operation.html:101
+#: templates/ishtar/sheet_operation.html:131
msgid "Description"
msgstr "Description"
-#: templates/ishtar/sheet_operation.html:110
-#: templates/ishtar/sheet_operation.html:153
+#: templates/ishtar/sheet_operation.html:112
+#: templates/ishtar/sheet_operation.html:155
msgid "Details"
msgstr "Détails"
-#: templates/ishtar/sheet_operation.html:113
+#: templates/ishtar/sheet_operation.html:115
msgid "No context record associated to this operation"
msgstr "Pas d'Unité d'Enregistrement associée à cette opération"
-#: templates/ishtar/sheet_operation.html:117
+#: templates/ishtar/sheet_operation.html:119
msgid "Documents from associated context records"
msgstr "Documents d'Unité d'Enregistrement associés"
-#: templates/ishtar/sheet_operation.html:122
+#: templates/ishtar/sheet_operation.html:124
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:124
+#: templates/ishtar/sheet_operation.html:126
msgid "Complete Id"
msgstr "Id complet"
-#: templates/ishtar/sheet_operation.html:125
+#: templates/ishtar/sheet_operation.html:127
msgid "Short Id"
msgstr "Id court"
-#: templates/ishtar/sheet_operation.html:126
+#: templates/ishtar/sheet_operation.html:128
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_operation.html:127
+#: templates/ishtar/sheet_operation.html:129
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: templates/ishtar/sheet_operation.html:130
+#: templates/ishtar/sheet_operation.html:132
msgid "Weight"
msgstr "Poids"
-#: templates/ishtar/sheet_operation.html:131
+#: templates/ishtar/sheet_operation.html:133
msgid "Numbers"
msgstr "Nombre"
-#: templates/ishtar/sheet_operation.html:133
+#: templates/ishtar/sheet_operation.html:135
msgid "Container ref."
msgstr "Réf. du contenant"
-#: templates/ishtar/sheet_operation.html:134
+#: templates/ishtar/sheet_operation.html:136
msgid "Warehouse"
msgstr "Dépôt"
-#: templates/ishtar/sheet_operation.html:157
+#: templates/ishtar/sheet_operation.html:159
msgid "No find associated to context record"
msgstr "Pas de mobilier associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:160
+#: templates/ishtar/sheet_operation.html:162
msgid "No find associated to parcel"
msgstr "Pas de mobilier associé à cette parcelle"
-#: templates/ishtar/sheet_operation.html:160
+#: templates/ishtar/sheet_operation.html:162
msgid "(no context record)"
msgstr "(pas d'Unité d'Enregistrement)"
-#: templates/ishtar/sheet_operation.html:165
+#: templates/ishtar/sheet_operation.html:167
msgid "Documents from associated finds"
msgstr "Documents concernant le mobilier associé"
@@ -1221,7 +1230,7 @@ msgstr "Jour-homme/hectare"
#: templates/ishtar/dashboards/dashboard_operation.html:165
msgid "Man-day/hectare for effective operations (current year):"
-msgstr "Jour-homme/hectare pour les opération effectives (année en cours) :"
+msgstr "Jour-homme/hectare pour les opérations effectives (année en cours) :"
#: templates/ishtar/dashboards/dashboard_operation.html:169
msgid "Organizations (current year)"
@@ -1236,7 +1245,7 @@ msgstr "Année actuelle (réalisations)"
#: templates/ishtar/dashboards/dashboard_operation.html:383
msgid "Man-day/hectare for effective operations (current realisation year):"
msgstr ""
-"Jour-homme/hectare pour les opération effectives (année de réalisation en "
+"Jour-homme/hectare pour les opérations effectives (année de réalisation en "
"cours) :"
#: templates/ishtar/dashboards/dashboard_operation.html:201
@@ -1301,7 +1310,7 @@ msgstr "Par département"
#: templates/ishtar/dashboards/dashboard_operation.html:284
#: templates/ishtar/dashboards/dashboard_operation.html:464
msgid "Effective operation by department"
-msgstr "Opérations effectives par départements"
+msgstr "Opérations effectives par département"
#: templates/ishtar/dashboards/dashboard_operation.html:289
#: templates/ishtar/dashboards/dashboard_operation.html:469
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 62122c4ad..2a957a357 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
# Ishtar po translation.
-# Copyright (C) 2010-2013
+# Copyright (C) 2010-2015
# This file is distributed under the same license as the Ishtar package.
-# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2013.
+# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-30 00:55+0100\n"
-"PO-Revision-Date: 2010-12-09\n"
+"POT-Creation-Date: 2015-01-25 01:39+0100\n"
+"PO-Revision-Date: 2015-01-25\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
"Language: \n"
@@ -44,17 +44,89 @@ msgstr "Unité d'Enregistrement"
msgid "Find"
msgstr "Mobilier"
+#: data_importer.py:117
+#, python-format
+msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
+msgstr "\"%(value)s\" est trop long. La longueur maximum est de %(length)d caractères."
+
+#: data_importer.py:129
+#, python-format
+msgid "\"%(value)s\" not equal to yes or no"
+msgstr "\"%(value)s\" diffère de oui ou non"
+
+#: data_importer.py:140
+#, python-format
+msgid "\"%(value)s\" is not a float"
+msgstr "\"%(value)s\" n'est pas un flottant"
+
+#: data_importer.py:152 data_importer.py:164 data_importer.py:248
+#, python-format
+msgid "\"%(value)s\" is not a valid date"
+msgstr "\"%(value)s\" n'est pas une date valide"
+
+#: data_importer.py:175
+#, python-format
+msgid "\"%(value)s\" is not an integer"
+msgstr "\"%(value)s\" n'est pas un entier"
+
+#: data_importer.py:203
+#, python-format
+msgid "Choice for \"%s\" is not available. Which one is relevant?\n"
+msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n"
+
+#: data_importer.py:207
+#, python-format
+msgid "%d. None of the above"
+msgstr "%d. Aucun de ceux-là"
+
+#: data_importer.py:260
+msgid ""
+"The given file is not correct. Check the file format. If you use a CSV file: "
+"check that column separator and encoding are similar to the ones used by the "
+"reference file."
+msgstr ""
+"Le fichier fourni n'est pas correct. Vérifiez le format du fichier. "
+"Si vous utilisez un fichier CSV : vérifiez que le séparateur de colonne et "
+"l'encodage sont similaires à ceux du fichier de référence."
+
+#: data_importer.py:264
+#, python-format
+msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
+msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d"
+
+#: data_importer.py:266
+msgid "No data provided"
+msgstr "Aucune donnée fournie"
+
+#: data_importer.py:267
+msgid "Value is required"
+msgstr "Valeur requise"
+
+#: data_importer.py:268
+#, python-format
+msgid "At least %d columns must be filled"
+msgstr "Au moins %d colonnes doivent être remplies"
+
+#: data_importer.py:269
+msgid "The regexp doesn't match."
+msgstr "L'expression régulière ne fonctionne pas"
+
+#: data_importer.py:857
+#, python-format
+msgid "\"%(value)s\" not in %(values)s"
+msgstr "\"%(value)s\" n'est pas dans %(values)s"
+
#: forms.py:63
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
-#: forms.py:76 forms_common.py:282
+#: forms.py:76 forms_common.py:283
msgid "Confirm"
msgstr "Confirmation"
#: forms.py:80
msgid "Are you sure you want to delete?"
-msgstr "Êtes vous sûr de vouloir supprimer ?"
+msgstr "Êtes-vous sûr de vouloir supprimer ?"
#: forms.py:88
msgid "There are identical items."
@@ -62,7 +134,7 @@ msgstr "Il y a des éléments identiques."
#: forms.py:122 forms.py:123
msgid "Closing date"
-msgstr "Date de clotûre"
+msgstr "Date de clôture"
#: forms.py:127
msgid "You should select an item."
@@ -72,18 +144,18 @@ msgstr "Vous devez sélectionner un élément."
msgid "Add a new item"
msgstr "Ajouter un nouvel élément"
-#: forms.py:164 models.py:762
+#: forms.py:164 models.py:780
msgid "Template"
msgstr "Patron"
-#: forms_common.py:42 forms_common.py:104 forms_common.py:185
-#: forms_common.py:190 models.py:811 models.py:1066
+#: forms_common.py:43 forms_common.py:105 forms_common.py:186
+#: forms_common.py:191 models.py:829 models.py:1204
#: templates/ishtar/sheet_organization.html:17
#: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
msgid "Town"
msgstr "Commune"
-#: forms_common.py:43
+#: forms_common.py:44
msgid ""
"<p>Type name, department code and/or postal code of the town you would like "
"to select. The search is insensitive to case.</p>\n"
@@ -95,74 +167,74 @@ msgstr ""
"<p>Tapez le nom, le numéro de département et - ou le code postal de la "
"commune que vous voulez sélectionner. La recherche n'est pas sensible à la "
"casse.</p>\n"
-"<p>Seuls les vingt premiers résultats sont affichés mais en plus du nom "
+"<p>Seuls les vingt premiers résultats sont affichés mais en plus du nom, "
"préciser le numéro de département est généralement suffisant pour obtenir le "
"résultat souhaité.</p>\n"
"<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
"commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
-#: forms_common.py:56 forms_common.py:354 ishtar_menu.py:40 models.py:884
-#: models.py:951 models.py:991 templates/ishtar/sheet_person.html:6
+#: forms_common.py:57 forms_common.py:471 ishtar_menu.py:40 models.py:1005
+#: models.py:1089 models.py:1129 templates/ishtar/sheet_person.html:6
msgid "Person"
msgstr "Individu"
-#: forms_common.py:92 forms_common.py:152 ishtar_menu.py:52 models.py:836
+#: forms_common.py:93 forms_common.py:153 ishtar_menu.py:55 models.py:945
#: templates/ishtar/sheet_organization.html:6
msgid "Organization"
msgstr "Organisation"
-#: forms_common.py:94 forms_common.py:130 forms_common.py:148
-#: forms_common.py:177 models.py:761 models.py:831 models.py:877
-#: models.py:1052 templates/ishtar/sheet_organization.html:12
+#: forms_common.py:95 forms_common.py:131 forms_common.py:149
+#: forms_common.py:178 models.py:779 models.py:911 models.py:940 models.py:995
+#: models.py:1190 templates/ishtar/sheet_organization.html:12
#: templates/ishtar/sheet_organization.html:25
#: templates/ishtar/sheet_person.html:12 templates/ishtar/sheet_person.html:26
msgid "Name"
msgstr "Nom"
-#: forms_common.py:96 models.py:825
+#: forms_common.py:97 models.py:893
msgid "Organization type"
msgstr "Type d'organisation"
-#: forms_common.py:98 forms_common.py:179 models.py:806
+#: forms_common.py:99 forms_common.py:180 models.py:824
#: templates/ishtar/sheet_organization.html:14
#: templates/ishtar/sheet_person.html:17 templates/ishtar/sheet_person.html:27
msgid "Address"
msgstr "Adresse"
-#: forms_common.py:100 forms_common.py:181 models.py:807
+#: forms_common.py:101 forms_common.py:182 models.py:825
#: templates/ishtar/sheet_organization.html:15
#: templates/ishtar/sheet_person.html:18 templates/ishtar/sheet_person.html:28
msgid "Address complement"
msgstr "Complément d'adresse"
-#: forms_common.py:102 forms_common.py:183 models.py:809
+#: forms_common.py:103 forms_common.py:184 models.py:827
#: templates/ishtar/sheet_organization.html:16
#: templates/ishtar/sheet_person.html:19 templates/ishtar/sheet_person.html:29
msgid "Postal code"
msgstr "Code postal"
-#: forms_common.py:105 forms_common.py:186 models.py:812
+#: forms_common.py:106 forms_common.py:187 models.py:830
msgid "Country"
msgstr "Pays"
-#: forms_common.py:107 forms_common.py:150 forms_common.py:188
-#: forms_common.py:240 models.py:817 templates/ishtar/sheet_person.html:15
+#: forms_common.py:108 forms_common.py:151 forms_common.py:189
+#: forms_common.py:241 models.py:835 templates/ishtar/sheet_person.html:15
msgid "Email"
msgstr "Courriel"
-#: forms_common.py:108 forms_common.py:189 models.py:814
+#: forms_common.py:109 forms_common.py:190 models.py:832
#: templates/ishtar/sheet_organization.html:18
#: templates/ishtar/sheet_person.html:21 templates/ishtar/sheet_person.html:31
msgid "Phone"
msgstr "Téléphone"
-#: forms_common.py:109 models.py:815
+#: forms_common.py:110 models.py:833
#: templates/ishtar/sheet_organization.html:19
#: templates/ishtar/sheet_person.html:22 templates/ishtar/sheet_person.html:32
msgid "Mobile phone"
msgstr "Téléphone portable"
-#: forms_common.py:131 forms_common.py:151 models.py:833 models.py:1015
+#: forms_common.py:132 forms_common.py:152 models.py:942 models.py:1153
#: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
#: templates/sheet_ope.html:126 templates/ishtar/sheet_organization.html:27
#: templates/ishtar/sheet_person.html:42 templates/ishtar/sheet_person.html:95
@@ -170,117 +242,121 @@ msgstr "Téléphone portable"
msgid "Type"
msgstr "Type"
-#: forms_common.py:139
+#: forms_common.py:140
msgid "Organization search"
msgstr "Recherche d'organisations"
-#: forms_common.py:149 forms_common.py:175 models.py:875
+#: forms_common.py:150 forms_common.py:176 models.py:993
#: templates/ishtar/sheet_organization.html:26
#: templates/ishtar/sheet_person.html:13
msgid "Surname"
msgstr "Prénom"
-#: forms_common.py:163
+#: forms_common.py:164
msgid "Person search"
msgstr "Recherche d'individus"
-#: forms_common.py:172
+#: forms_common.py:173
msgid "Identity"
msgstr "Identité"
-#: forms_common.py:174 forms_common.py:311 models.py:874 models.py:1014
+#: forms_common.py:175 forms_common.py:428 models.py:992 models.py:1152
#: templates/sheet_ope.html:104 templates/ishtar/sheet_person.html:94
#: templates/ishtar/blocks/window_tables/documents.html:5
msgid "Title"
msgstr "Titre"
-#: forms_common.py:192
+#: forms_common.py:193
msgid "Current organization"
msgstr "Organisation actuelle"
-#: forms_common.py:199 forms_common.py:222 forms_common.py:225 models.py:861
+#: forms_common.py:200 forms_common.py:223 forms_common.py:226 models.py:978
msgid "Person type"
msgstr "Type d'individu"
-#: forms_common.py:235 forms_common.py:239
+#: forms_common.py:236 forms_common.py:240
msgid "Account"
msgstr "Compte"
-#: forms_common.py:242 wizards.py:938
+#: forms_common.py:243 wizards.py:938
msgid "New password"
msgstr "Nouveau mot de passe"
-#: forms_common.py:246
+#: forms_common.py:247
msgid "New password (confirmation)"
msgstr "Nouveau mot de passe (confirmation)"
-#: forms_common.py:264
+#: forms_common.py:265
msgid "Your password and confirmation password do not match."
msgstr "La vérification du mot de passe a échoué."
-#: forms_common.py:269
+#: forms_common.py:270
msgid "You must provide a correct password."
msgstr "Vous devez fournir un mot de passe correct."
-#: forms_common.py:277
+#: forms_common.py:278
msgid "This username already exists."
msgstr "Ce nom d'utilisateur existe déjà."
-#: forms_common.py:283
+#: forms_common.py:284
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:291 forms_common.py:303 models.py:1067
+#: forms_common.py:292 forms_common.py:304 models.py:1205
#: templates/ishtar/sheet_person.html:72
msgid "Towns"
msgstr "Communes"
-#: forms_common.py:300
+#: forms_common.py:301
msgid "There are identical towns."
msgstr "Il y a des communes identiques."
-#: forms_common.py:309
+#: forms_common.py:380
+msgid "Only one choice can be checked."
+msgstr "Seul un choix peut être coché."
+
+#: forms_common.py:426
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:313 forms_common.py:332 models.py:1010
+#: forms_common.py:430 forms_common.py:449 models.py:1148
msgid "Source type"
msgstr "Type de source"
-#: forms_common.py:315 models.py:1019
+#: forms_common.py:432 models.py:1157
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:316 models.py:1021
+#: forms_common.py:433 models.py:1159
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:318 models.py:1023
+#: forms_common.py:435 models.py:925 models.py:1161
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:329 forms_common.py:348 forms_common.py:379 models.py:996
+#: forms_common.py:446 forms_common.py:465 forms_common.py:496 models.py:1134
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr "Auteur"
-#: forms_common.py:341
+#: forms_common.py:458
msgid "Would you like to delete this documentation?"
-msgstr "Voulez vous supprimer ce document ?"
+msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:355 models.py:987 models.py:993
+#: forms_common.py:472 models.py:1125 models.py:1131
msgid "Author type"
msgstr "Type d'auteur"
-#: forms_common.py:373
+#: forms_common.py:490
msgid "Author selection"
msgstr "Sélection d'auteur"
-#: forms_common.py:385
+#: forms_common.py:502
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:389 models.py:997 models.py:1016
+#: forms_common.py:506 models.py:1135 models.py:1154
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Authors"
@@ -290,11 +366,11 @@ msgstr "Auteurs"
msgid "Administration"
msgstr "Administration"
-#: ishtar_menu.py:30 views.py:125
+#: ishtar_menu.py:30 views.py:122
msgid "Account management"
msgstr "Gestion des comptes"
-#: ishtar_menu.py:33 models.py:552 templates/ishtar/formset.html:4
+#: ishtar_menu.py:33 models.py:570 templates/ishtar/formset.html:4
msgid "Global variables"
msgstr "Variables globales"
@@ -302,218 +378,303 @@ msgstr "Variables globales"
msgid "Directory"
msgstr "Annuaire"
-#: ishtar_menu.py:42 ishtar_menu.py:54
+#: ishtar_menu.py:42 ishtar_menu.py:57
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:45 ishtar_menu.py:58
+#: ishtar_menu.py:45 ishtar_menu.py:61
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:48 ishtar_menu.py:62 widgets.py:81
+#: ishtar_menu.py:48 ishtar_menu.py:65 templates/ishtar/merge.html:5
+msgid "Merge"
+msgstr "Fusion"
+
+#: ishtar_menu.py:51 ishtar_menu.py:68 widgets.py:81
msgid "Delete"
-msgstr "Supprimer"
+msgstr "Suppression"
-#: models.py:139
+#: models.py:148
msgid "Not a valid item."
msgstr "Élément invalide."
-#: models.py:151
+#: models.py:160
msgid "An item selected is not a valid item."
msgstr "Un élément sélectionné n'est pas valide."
-#: models.py:161
+#: models.py:170
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: models.py:213 models.py:794
+#: models.py:222 models.py:812
msgid "Label"
msgstr "Libellé"
-#: models.py:214
+#: models.py:223
msgid "Textual ID"
msgstr "Identifiant textuel"
-#: models.py:216
+#: models.py:225
msgid "Comment"
msgstr "Commentaire"
-#: models.py:217 models.py:765
+#: models.py:226 models.py:783
msgid "Available"
msgstr "Disponible"
-#: models.py:399
+#: models.py:415
msgid "Last editor"
msgstr "Dernier éditeur"
-#: models.py:401
+#: models.py:419
msgid "Creator"
msgstr "Créateur"
-#: models.py:546
+#: models.py:564
msgid "Variable name"
msgstr "Nom de la variable"
-#: models.py:547
+#: models.py:565
msgid "Description of the variable"
msgstr "Description de la variable"
-#: models.py:549
+#: models.py:567
msgid "Value"
msgstr "Valeur"
-#: models.py:551
+#: models.py:569
msgid "Global variable"
msgstr "Variables globales"
-#: models.py:666 models.py:697
+#: models.py:684 models.py:715
msgid "Total"
msgstr "Total"
-#: models.py:673 models.py:795
+#: models.py:691 models.py:813
#: templates/ishtar/dashboards/dashboard_main_detail.html:135
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
msgid "Number"
msgstr "Nombre"
-#: models.py:760
+#: models.py:778
msgid "Administrative Act"
msgstr "Acte administratif"
-#: models.py:763
+#: models.py:781
msgid "Associated object"
msgstr "Objet associé"
-#: models.py:768
+#: models.py:786
msgid "Document template"
msgstr "Patron de document"
-#: models.py:769
+#: models.py:787
msgid "Document templates"
msgstr "Patrons de documents"
-#: models.py:798
+#: models.py:816
msgid "Department"
msgstr "Département"
-#: models.py:799
+#: models.py:817
msgid "Departments"
msgstr "Départements"
-#: models.py:826
+#: models.py:842
+msgid "Merge key"
+msgstr "Clé de fusion"
+
+#: models.py:894
msgid "Organization types"
msgstr "Types d'organisation"
-#: models.py:837
+#: models.py:897 templates/ishtar/dashboards/dashboard_main_detail.html:61
+msgid "Created"
+msgstr "Créé"
+
+#: models.py:898
+msgid "Analyse in progress"
+msgstr "Analyse en cours"
+
+#: models.py:899
+msgid "Analysed"
+msgstr "Analysé"
+
+#: models.py:900
+msgid "Import pending"
+msgstr "Import en attente"
+
+#: models.py:901
+msgid "Import in progress"
+msgstr "Import en cours"
+
+#: models.py:902
+msgid "Finished"
+msgstr "Terminé"
+
+#: models.py:906
+#, fuzzy
+msgid "Archaeological files - SRA Pays de la Loire"
+msgstr "Dossiers archéologiques"
+
+#: models.py:907
+msgid "Custom"
+msgstr ""
+
+#: models.py:914
+msgid "Imported file"
+msgstr "Fichier importé"
+
+#: models.py:916
+msgid "Error file"
+msgstr "Fichier erreur"
+
+#: models.py:919
+msgid "Result file"
+msgstr "Fichier résultant"
+
+#: models.py:922
+msgid "Importer type"
+msgstr ""
+
+#: models.py:924
+msgid "State"
+msgstr "État"
+
+#: models.py:927
+msgid "End date"
+msgstr "Date de fin"
+
+#: models.py:929
+msgid "Seconds remaining"
+msgstr "Secondes restantes"
+
+#: models.py:932
+msgid "Import"
+msgstr "Import"
+
+#: models.py:933
+msgid "Imports"
+msgstr "Imports"
+
+#: models.py:946
msgid "Organizations"
msgstr "Organisations"
-#: models.py:839
+#: models.py:948
msgid "Can view all Organization"
msgstr "Peut voir toutes les Organisations"
-#: models.py:840
+#: models.py:949
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: models.py:841
+#: models.py:950
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: models.py:842
+#: models.py:951
msgid "Can change own Organization"
msgstr "Peut changer sa propre Organisation"
-#: models.py:843
+#: models.py:952
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: models.py:858
+#: models.py:975
msgid "Groups"
msgstr "Groupes"
-#: models.py:862
+#: models.py:979
msgid "Person types"
msgstr "Types d'individu"
-#: models.py:867
+#: models.py:984
msgid "Mr"
msgstr "M."
-#: models.py:868
+#: models.py:985
msgid "Miss"
msgstr "Mlle"
-#: models.py:869
+#: models.py:986
+msgid "Mr and Miss"
+msgstr "M. et Mme"
+
+#: models.py:987
msgid "Mrs"
msgstr "Mme"
-#: models.py:870
+#: models.py:988
msgid "Doctor"
msgstr "Dr."
-#: models.py:878 models.py:913
+#: models.py:997
+msgid "Raw name"
+msgstr ""
+
+#: models.py:999 models.py:1036
msgid "Types"
msgstr "Types"
-#: models.py:881
+#: models.py:1002
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:885
+#: models.py:1006
msgid "Persons"
msgstr "Individus"
-#: models.py:887
+#: models.py:1008
msgid "Can view all Person"
msgstr "Peut voir toutes les Personnes"
-#: models.py:888
+#: models.py:1009
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: models.py:889
+#: models.py:1010
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: models.py:890
+#: models.py:1011
msgid "Can change own Person"
msgstr "Peut changer sa propre Personne"
-#: models.py:891
+#: models.py:1012
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: models.py:955
+#: models.py:1093
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:956
+#: models.py:1094
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:988
+#: models.py:1126
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:1011
+#: models.py:1149
msgid "Source types"
msgstr "Types de source"
-#: models.py:1024 templates/ishtar/sheet_person.html:40
+#: models.py:1162 templates/ishtar/sheet_person.html:40
#: templates/ishtar/sheet_person.html:67
msgid "Ref."
msgstr "Réf."
-#: models.py:1026
+#: models.py:1164
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:1053
+#: models.py:1191
msgid "Surface (m²)"
-msgstr "Area (m²)"
+msgstr "Surface (m²)"
-#: models.py:1054 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:1192 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr "Localisation"
@@ -521,66 +682,66 @@ msgstr "Localisation"
msgid " (...)"
msgstr " (...)"
-#: views.py:85
+#: views.py:82
msgid "New person"
msgstr "Nouvelle personne"
-#: views.py:93
+#: views.py:90
msgid "Person modification"
msgstr "Modification d'une personne"
-#: views.py:99
+#: views.py:96
msgid "Person deletion"
-msgstr "Suppresion de personne"
+msgstr "Suppression de personne"
-#: views.py:105
+#: views.py:102
msgid "New organization"
msgstr "Nouvelle organisation"
-#: views.py:112
+#: views.py:109
msgid "Organization modification"
msgstr "Modification d'une organisation"
-#: views.py:118
+#: views.py:115
msgid "Organization deletion"
-msgstr "Suppresion d'une organisation"
+msgstr "Suppression d'une organisation"
-#: views.py:215
+#: views.py:212
msgid "True"
msgstr "Oui"
-#: views.py:217
+#: views.py:214
msgid "False"
msgstr "Non"
-#: views.py:440 templates/base.html:75
+#: views.py:437 templates/base.html:75
#: templates/ishtar/sheet_organization.html:35
#: templates/ishtar/sheet_person.html:57 templates/ishtar/sheet_person.html:83
msgid "Details"
msgstr "Détails"
-#: views.py:650 views.py:697
+#: views.py:647 views.py:694
msgid "Operation not permitted."
-msgstr "Opération non permise"
+msgstr "Opération non permise."
-#: views.py:652
+#: views.py:649
#, python-format
msgid "New %s"
msgstr "Nouveau %s"
-#: views.py:714 views.py:770
+#: views.py:711 views.py:767
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: views.py:715 views.py:774
+#: views.py:712 views.py:771
msgid "Operations"
msgstr "Opérations"
-#: views.py:717 views.py:779
+#: views.py:714 views.py:776
msgid "Context records"
msgstr "Unité d'Enregistrement"
-#: views.py:719 views.py:784
+#: views.py:716 views.py:781
msgid "Finds"
msgstr "Mobilier"
@@ -746,7 +907,7 @@ msgstr "Opération fermée"
#: templates/sheet_ope.html:22
msgid "Closing date:"
-msgstr "Date de clotûre :"
+msgstr "Date de clôture :"
#: templates/sheet_ope.html:22
msgid "by"
@@ -917,7 +1078,7 @@ msgstr "Description"
#: templates/sheet_ope.html:142
msgid "No recording unit associated to this operation"
-msgstr "Pas d'Unité d'Enregistrement associée à ce dosser"
+msgstr "Pas d'Unité d'Enregistrement associée à ce dossier"
#: templates/window.html:37 templates/blocks/JQueryJqGrid.html:26
msgid "Add"
@@ -957,10 +1118,10 @@ msgstr ""
msgid "Help"
msgstr "Aide"
-#: templates/ishtar/formset.html:8
+#: templates/ishtar/formset.html:8 templates/ishtar/merge.html:31
#: templates/ishtar/wizard/confirm_wizard.html:40
#: templates/ishtar/wizard/default_wizard.html:28
-#: templates/ishtar/wizard/default_wizard.html:43
+#: templates/ishtar/wizard/default_wizard.html:44
#: templates/ishtar/wizard/parcels_wizard.html:12
#: templates/ishtar/wizard/parcels_wizard.html:27
#: templates/ishtar/wizard/search.html:13
@@ -969,6 +1130,34 @@ msgstr "Aide"
msgid "Validate"
msgstr "Valider"
+#: templates/ishtar/merge.html:7
+msgid "Every operation on this form is irreversible"
+msgstr ""
+
+#: templates/ishtar/merge.html:9
+msgid "Page "
+msgstr ""
+
+#: templates/ishtar/merge.html:17
+msgid "Item A"
+msgstr ""
+
+#: templates/ishtar/merge.html:18
+msgid "Item B"
+msgstr ""
+
+#: templates/ishtar/merge.html:19
+msgid "B is a duplicate of A"
+msgstr ""
+
+#: templates/ishtar/merge.html:20
+msgid "A is a duplicate of B"
+msgstr ""
+
+#: templates/ishtar/merge.html:21
+msgid "Is not duplicate"
+msgstr ""
+
#: templates/ishtar/sheet.html:21
msgid "Previous"
msgstr "Précédent"
@@ -996,7 +1185,7 @@ msgstr "Personnes au sein de l'organisation"
#: templates/ishtar/sheet_organization.html:38
msgid "No person in this organization"
-msgstr "Pas de personne au sein de l'organisation"
+msgstr "Pas de personne au sein de cette organisation"
#: templates/ishtar/sheet_person.html:16
msgid "Type(s)"
@@ -1124,10 +1313,6 @@ msgstr "Par opérations"
msgid "Created last"
msgstr "Derniers créés"
-#: templates/ishtar/dashboards/dashboard_main_detail.html:61
-msgid "Created"
-msgstr "Créé"
-
#: templates/ishtar/dashboards/dashboard_main_detail.html:65
#: templates/ishtar/dashboards/dashboard_main_detail.html:76
msgid "Show"
@@ -1160,7 +1345,7 @@ msgstr "Vous avez entré les informations suivantes :"
#: templates/ishtar/wizard/confirm_wizard.html:39
msgid "Would you like to save them?"
-msgstr "Voulez vous sauver ces informations ?"
+msgstr "Voulez-vous sauver ces informations ?"
#: templates/ishtar/wizard/default_wizard.html:34
#: templates/ishtar/wizard/parcels_wizard.html:24
@@ -1169,17 +1354,17 @@ msgstr "Voulez vous sauver ces informations ?"
msgid "Add/Modify"
msgstr "Ajouter-Modifier"
-#: templates/ishtar/wizard/default_wizard.html:44
+#: templates/ishtar/wizard/default_wizard.html:45
#: templates/ishtar/wizard/parcels_wizard.html:28
msgid "Validate and end"
msgstr "Valider et confirmer"
-#: templates/ishtar/wizard/default_wizard.html:54
+#: templates/ishtar/wizard/default_wizard.html:56
msgid ""
"The form has changed if you don't validate it all your changes will be lost."
msgstr ""
-"Le formulaire a changé. Si vous ne le validez pas tout vos changements vont "
-"être perdus."
+"Le formulaire a changé. Si vous ne le validez pas, tous vos changements seront "
+"perdus."
#: templates/ishtar/wizard/parcels_wizard.html:20
msgid "all"
@@ -1195,7 +1380,7 @@ msgstr "Pas de commune dans le dossier associé."
#: templates/ishtar/wizard/wizard_closing_done.html:4
msgid "Item successfully closed"
-msgstr "Élément clôt avec succès"
+msgstr "Élément clos avec succès"
#: templates/ishtar/wizard/wizard_delete_done.html:4
msgid "Item successfully deleted"
@@ -1312,11 +1497,11 @@ msgstr "Possède des parcelles"
#: templates/registration/activate.html:8
msgid "Account successfully activated"
-msgstr "Compte crée avec succès"
+msgstr "Compte créé avec succès"
#: templates/registration/activate.html:14
msgid "Account activation failed"
-msgstr "La création du compte a échouée"
+msgstr "La création du compte a échoué"
#: templates/registration/activation_complete.html:7
msgid "You may now login with your username and password."
@@ -1394,7 +1579,7 @@ msgstr ""
#: templates/registration/password_reset_email.html:2
#, python-format
msgid "Reset password at %(site_name)s"
-msgstr "Remise à réro du mot de passe pour %(site_name)s"
+msgstr "Remise à zéro du mot de passe pour %(site_name)s"
#: templates/registration/password_reset_form.html:7
msgid "Reset password"
@@ -1403,12 +1588,9 @@ msgstr "Réinitialisation du mot de passe"
#: templates/registration/registration_complete.html:6
msgid "You are now registered. Activation email sent."
msgstr ""
-"Vous être maintenant enregistré. Un courriel d'activation de votre compte "
+"Vous êtes maintenant enregistré. Un courriel d'activation de votre compte "
"vous a été envoyé."
-#~ msgid "URL name"
-#~ msgstr "Nom de l'URL"
-
#~ msgid "Wizard"
#~ msgstr "Assistant"
@@ -1529,9 +1711,6 @@ msgstr ""
#~ msgid "In charge:"
#~ msgstr "Responsable :"
-#~ msgid "Closed file"
-#~ msgstr "Dossier clos"
-
#~ msgid "Planed surface:"
#~ msgstr "Surface envisagé :"