Update french translation

3 files changed, 145 insertions, 112 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index cf775bf08..d5e94fb48 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -207,7 +207,7 @@ class FileFormPreventive(forms.Form):
         self.fields['permit_type'].help_text = models.PermitType.get_help()
 
 class FileFormResearch(forms.Form):
-    form_label = _("Research informations")
+    form_label = _("Research archaeology")
     base_model = 'department'
     associated_models = {'scientist':Person,
                          'requested_operation_type':OperationType,
diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po
index 69b205bb1..aa0c06381 100644
--- a/archaeological_files/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_files/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-16 22:23+0100\n"
+"POT-Creation-Date: 2014-03-02 19:20+0100\n"
 "PO-Revision-Date: 2010-12-09\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -18,53 +18,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: forms.py:49 forms.py:230
+#: forms.py:49 forms.py:123 forms.py:163 forms.py:266 forms.py:307
+#: models.py:66 templates/ishtar/sheet_file.html:93
+#: templates/ishtar/sheet_file.html:117 templates/ishtar/sheet_file.html:145
+msgid "Year"
+msgstr "Année"
+
+#: forms.py:50 forms.py:127 forms.py:165 forms.py:306 models.py:68
+msgid "Numeric reference"
+msgstr "Référence numérique"
+
+#: forms.py:52 forms.py:129 forms.py:309
+msgid "Other reference"
+msgstr "Autre référence"
+
+#: forms.py:54 forms.py:288
 msgid "File name"
 msgstr "Nom du dossier"
 
-#: forms.py:50 forms.py:134 models.py:73
+#: forms.py:55 forms.py:134 models.py:73
 msgid "File type"
 msgstr "Type de dossier"
 
-#: forms.py:51 forms.py:203
+#: forms.py:56 forms.py:197
 msgid "Saisine type"
 msgstr "Type de saisine"
 
-#: forms.py:52
+#: forms.py:57
 msgid "Parcel (section/number)"
 msgstr "Parcelle (section/numéro)"
 
-#: forms.py:53
+#: forms.py:58
 msgid "Is active?"
 msgstr "Est actif ?"
 
-#: forms.py:55 forms.py:180 forms.py:233 models.py:78
+#: forms.py:60 forms.py:174 forms.py:291 models.py:78
 msgid "General contractor"
 msgstr "Aménageur"
 
-#: forms.py:62 forms.py:240
+#: forms.py:67 forms.py:298
 msgid "Organization of general contractor"
 msgstr "Organisation de l'aménageur"
 
-#: forms.py:70 forms.py:127 forms.py:157 forms.py:248 models.py:68
-msgid "Numeric reference"
-msgstr "Référence numérique"
-
-#: forms.py:71 forms.py:123 forms.py:155 forms.py:249 models.py:66
-#: templates/ishtar/sheet_file.html:78 templates/ishtar/sheet_file.html:102
-#: templates/ishtar/sheet_file.html:130
-msgid "Year"
-msgstr "Année"
-
-#: forms.py:73 forms.py:129 forms.py:251
-msgid "Other reference"
-msgstr "Autre référence"
-
-#: forms.py:75 forms.py:253 templates/ishtar/sheet_file.html:106
+#: forms.py:75 forms.py:311 templates/ishtar/sheet_file.html:121
 msgid "In charge"
 msgstr "Responsable"
 
-#: forms.py:82 forms.py:196 forms.py:260 models.py:84
+#: forms.py:82 forms.py:190 forms.py:318 models.py:84
 msgid "Permit reference"
 msgstr "Référence du permis"
 
@@ -96,76 +96,101 @@ msgstr "Date de création"
 msgid "Related file"
 msgstr "Dossier en relation avec"
 
-#: forms.py:139 models.py:109
+#: forms.py:139 forms.py:237 models.py:109 templates/ishtar/sheet_file.html:85
 msgid "Comment"
 msgstr "Commentaire"
 
-#: forms.py:150
-#, python-format
-msgid "<br/>(last recorded: %s)"
-msgstr "<br/>(dernier enregistrement : %s)"
-
-#: forms.py:161
-msgid "Address"
-msgstr "Adresse"
-
-#: forms.py:165 models.py:100
+#: forms.py:143 models.py:100
 msgid "Total surface (m²)"
 msgstr "Surface totale des terrains (m²)"
 
-#: forms.py:168 models.py:104
+#: forms.py:146 models.py:104
 msgid "Main address"
 msgstr "Adresse des terrains"
 
-#: forms.py:169 models.py:105
+#: forms.py:147 models.py:105
 msgid "Main address - complement"
 msgstr "Adresse des terrains - complément"
 
-#: forms.py:171 models.py:107
-msgid "Main address - postal code"
-msgstr "Adresse des terrains - code postal"
+#: forms.py:158
+#, python-format
+msgid "<br/>(last recorded: %s)"
+msgstr "<br/>(dernier enregistrement : %s)"
 
-#: forms.py:175
+#: forms.py:169
 msgid "Preventive informations"
 msgstr "Information archéologie préventive"
 
-#: forms.py:187 models.py:81
+#: forms.py:181 models.py:81
 msgid "Responsible for town planning service"
 msgstr "Responsable au service instructeur"
 
-#: forms.py:194 models.py:51 models.py:82
+#: forms.py:188 models.py:51 models.py:82
 msgid "Permit type"
 msgstr "Type de permis"
 
-#: forms.py:199 models.py:103
+#: forms.py:193 models.py:103
 msgid "Total developed surface (m²)"
 msgstr "Surface totale aménagée (m²)"
 
-#: forms.py:205 models.py:91
+#: forms.py:199 models.py:91
 msgid "Reception date"
 msgstr "Date de réception"
 
-#: forms.py:217
+#: forms.py:210 templates/ishtar/sheet_file.html:75
+#: templates/ishtar/dashboards/dashboard_file.html:42
+msgid "Research archaeology"
+msgstr "Archéologie programmée"
+
+#: forms.py:218 models.py:112 templates/ishtar/sheet_file.html:76
+msgid "Departments"
+msgstr "Départements"
+
+#: forms.py:225 models.py:122
+msgid "Scientist in charge"
+msgstr "Responsable scientifique"
+
+#: forms.py:227 models.py:117 templates/ishtar/sheet_file.html:78
+msgid "Requested operation type"
+msgstr "Type d'opération demandée"
+
+#: forms.py:229
+msgid "Lead organization"
+msgstr "Organisation porteuse du projet"
+
+#: forms.py:246 models.py:126 templates/ishtar/sheet_file.html:83
+msgid "Classified area"
+msgstr "Au sein d'un site classé"
+
+#: forms.py:248 models.py:128 templates/ishtar/sheet_file.html:84
+msgid "Protected area"
+msgstr "Au sein d'un secteur sauvegardé"
+
+#: forms.py:259
 msgid "Would you like to close this archaeological file?"
 msgstr "Voulez vous clore ce dossier archéologique ?"
 
-#: forms.py:221
+#: forms.py:263
 msgid "Would you like to delete this archaelogical file ?"
 msgstr "Voulez vous supprimer ce dossier archéologique ?"
 
-#: forms.py:225 forms.py:277
+#: forms.py:267
+msgid "Index"
+msgstr "Index"
+
+#: forms.py:271 forms.py:283 forms.py:342
 msgid "Act type"
 msgstr "Type d'acte"
 
-#: forms.py:226
+#: forms.py:284
 msgid "Signature date after"
 msgstr "Date de signature après"
 
-#: forms.py:228
+#: forms.py:286
 msgid "Signature date before"
 msgstr "Date de signature avant"
 
-#: ishtar_menu.py:30 models.py:115 templates/ishtar/sheet_file.html:6
+#: ishtar_menu.py:30 models.py:142 templates/ishtar/sheet_file.html:6
 msgid "Archaeological file"
 msgstr "Dossier archéologique"
 
@@ -177,7 +202,7 @@ msgstr "Recherche"
 msgid "Creation"
 msgstr "Ajout"
 
-#: ishtar_menu.py:38 ishtar_menu.py:56
+#: ishtar_menu.py:38 ishtar_menu.py:54
 msgid "Modification"
 msgstr "Modification"
 
@@ -185,31 +210,31 @@ msgstr "Modification"
 msgid "Closing"
 msgstr "Clotûre"
 
-#: ishtar_menu.py:46 ishtar_menu.py:60
+#: ishtar_menu.py:44 ishtar_menu.py:58
 msgid "Deletion"
 msgstr "Suppression"
 
-#: ishtar_menu.py:49
+#: ishtar_menu.py:47
 msgid "Administrative act"
 msgstr "Acte administratif"
 
-#: ishtar_menu.py:52
+#: ishtar_menu.py:50
 msgid "Add"
 msgstr "Ajout"
 
-#: ishtar_menu.py:64
+#: ishtar_menu.py:62
 msgid "Documents"
 msgstr "Documents"
 
-#: ishtar_menu.py:70
+#: ishtar_menu.py:68
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: ishtar_menu.py:72
+#: ishtar_menu.py:70
 msgid "General informations"
 msgstr "Informations générales"
 
-#: ishtar_menu.py:75 models.py:116
+#: ishtar_menu.py:73 models.py:143
 #: templates/ishtar/dashboards/dashboard_file.html:8
 msgid "Archaeological files"
 msgstr "Dossiers archéologiques"
@@ -246,43 +271,59 @@ msgstr "Communes"
 msgid "Ref. number"
 msgstr "Réf. numérique"
 
-#: models.py:110
+#: models.py:107
+msgid "Main address - postal code"
+msgstr "Adresse des terrains - code postal"
+
+#: models.py:119 templates/ishtar/sheet_file.html:79
+msgid "Organization"
+msgstr "Organisation"
+
+#: models.py:123
+msgid "Research archaeology comment"
+msgstr "Commentaire archéologie programmée"
+
+#: models.py:137
 msgid "Cached name"
 msgstr "Nom en cache"
 
-#: models.py:118
+#: models.py:145
 msgid "Can view all Archaelogical file"
 msgstr "Peut voir tous les dossier archéologique"
 
-#: models.py:119
+#: models.py:146
 msgid "Can view own Archaelogical file"
 msgstr "Peut voir son propre Dossier archéologique"
 
-#: models.py:120
+#: models.py:147
 msgid "Can add own Archaelogical file"
 msgstr "Peut ajouter son propre Dossier archéologique"
 
-#: models.py:121
+#: models.py:148
 msgid "Can change own Archaelogical file"
 msgstr "Peut changer son propre Dossier archéologique"
 
-#: models.py:122
+#: models.py:149
 msgid "Can delete own Archaelogical file"
 msgstr "Peut supprimer son propre Dossier archéologique"
 
-#: models.py:128
+#: models.py:150
+msgid "Can close File"
+msgstr "Peut fermer un dossier"
+
+#: models.py:156
 msgid "FILE"
 msgstr "DOSSIER"
 
-#: models.py:177
+#: models.py:211
 msgid "Intercommunal"
 msgstr "Intercommunal"
 
-#: models.py:234
+#: models.py:268
 msgid "File"
 msgstr "Dossier"
 
-#: models.py:235
+#: models.py:269
 msgid "Department"
 msgstr "Département"
 
@@ -294,31 +335,31 @@ msgstr "Recherche de dossier archéologique"
 msgid "New file"
 msgstr "Nouveau dossier archéologique"
 
-#: views.py:134
+#: views.py:138
 msgid "File modification"
 msgstr "Modification de dossier archéologique"
 
-#: views.py:152
+#: views.py:160
 msgid "File closing"
 msgstr "Clotûre de dossier"
 
-#: views.py:159
+#: views.py:167
 msgid "File deletion"
 msgstr "Suppression de dossier archéologique"
 
-#: views.py:167
+#: views.py:175
 msgid "File: new administrative act"
 msgstr "Dossier archéologique : nouvel acte administratif"
 
-#: views.py:177
+#: views.py:185
 msgid "File: administrative act modification"
 msgstr "Dossier archéologique : modification d'acte administratif"
 
-#: views.py:186
+#: views.py:194
 msgid "File: administrative act deletion"
 msgstr "Dossier archéologique : suppression acte administratif"
 
-#: wizards.py:139 templates/ishtar/sheet_file.html:100
+#: wizards.py:139 templates/ishtar/sheet_file.html:115
 msgid "Associated operations"
 msgstr "Opérations associées"
 
@@ -486,63 +527,74 @@ msgstr "Aménageur (organiation) :"
 msgid "General contractor:"
 msgstr "Aménageur :"
 
-#: templates/ishtar/sheet_file.html:75
+#: templates/ishtar/sheet_file.html:76 templates/ishtar/sheet_file.html:77
+#: templates/ishtar/sheet_file.html:78 templates/ishtar/sheet_file.html:79
+#: templates/ishtar/sheet_file.html:85
+#: templates/ishtar/dashboards/dashboard_file.html:14
+msgid ":"
+msgstr " :"
+
+#: templates/ishtar/sheet_file.html:77
+msgid "Head scientist"
+msgstr "Responsable scientifique"
+
+#: templates/ishtar/sheet_file.html:90
 msgid "Associated parcels"
 msgstr "Opérations associées"
 
-#: templates/ishtar/sheet_file.html:77
+#: templates/ishtar/sheet_file.html:92
 msgid "Town"
 msgstr "Commune"
 
-#: templates/ishtar/sheet_file.html:79
+#: templates/ishtar/sheet_file.html:94
 msgid "Section"
 msgstr "Section"
 
-#: templates/ishtar/sheet_file.html:80
+#: templates/ishtar/sheet_file.html:95
 msgid "Parcels"
 msgstr "Parcelles"
 
-#: templates/ishtar/sheet_file.html:92
+#: templates/ishtar/sheet_file.html:107
 msgid "No parcel associated to this operation"
 msgstr "Pas de parcelle associée à cette opération"
 
-#: templates/ishtar/sheet_file.html:96
+#: templates/ishtar/sheet_file.html:111
 msgid "Administrativ acts"
 msgstr "Actes administratif"
 
-#: templates/ishtar/sheet_file.html:103 templates/ishtar/sheet_file.html:131
+#: templates/ishtar/sheet_file.html:118 templates/ishtar/sheet_file.html:146
 msgid "Ref."
 msgstr "Ref."
 
-#: templates/ishtar/sheet_file.html:105 templates/ishtar/sheet_file.html:132
+#: templates/ishtar/sheet_file.html:120 templates/ishtar/sheet_file.html:147
 msgid "Type"
 msgstr "Type"
 
-#: templates/ishtar/sheet_file.html:107
+#: templates/ishtar/sheet_file.html:122
 msgid "Start date"
 msgstr "Date de début"
 
-#: templates/ishtar/sheet_file.html:108
+#: templates/ishtar/sheet_file.html:123
 msgid "Excavation end date"
 msgstr "Date de fin de chantier"
 
-#: templates/ishtar/sheet_file.html:120
+#: templates/ishtar/sheet_file.html:135
 msgid "Details"
 msgstr "Détails"
 
-#: templates/ishtar/sheet_file.html:123
+#: templates/ishtar/sheet_file.html:138
 msgid "No operation associated to this archaelogical file"
 msgstr "Pas d'opération associée à ce dossier archéologique"
 
-#: templates/ishtar/sheet_file.html:128
+#: templates/ishtar/sheet_file.html:143
 msgid "Admninistrative acts linked to associated operations"
 msgstr "Actes administratifs associé à ces opérations"
 
-#: templates/ishtar/sheet_file.html:133
+#: templates/ishtar/sheet_file.html:148
 msgid "Date"
 msgstr "Date"
 
-#: templates/ishtar/sheet_file.html:143
+#: templates/ishtar/sheet_file.html:158
 msgid "No administrative act linked to operations"
 msgstr "Pas d'acte administratif associé à ces opérations"
 
@@ -556,10 +608,6 @@ msgstr "Informations générales"
 msgid "Total:"
 msgstr "Total :"
 
-#: templates/ishtar/dashboards/dashboard_file.html:14
-msgid ":"
-msgstr " :"
-
 #: templates/ishtar/dashboards/dashboard_file.html:18
 #: templates/ishtar/dashboards/dashboard_file.html:47
 #: templates/ishtar/dashboards/dashboard_file.html:125
@@ -572,10 +620,6 @@ msgstr "Par année"
 msgid "By month"
 msgstr "Par mois"
 
-#: templates/ishtar/dashboards/dashboard_file.html:42
-msgid "Research archaeology"
-msgstr "Archéologie programmée"
-
 #: templates/ishtar/dashboards/dashboard_file.html:71
 #: templates/ishtar/dashboards/dashboard_file.html:164
 msgid "By department"
@@ -623,14 +667,3 @@ msgstr "Principales communes en nombre"
 msgid "Main towns by surface (ha)"
 msgstr "Principales communes en surface (ha)"
 
-#~ msgid "File's name:"
-#~ msgstr "Nom du dossier :"
-
-#~ msgid "No administrative act associated to this archaelogical file"
-#~ msgstr "Pas d'acte administratif associé à ce dossier archéologique"
-
-#~ msgid "Template"
-#~ msgstr "Patron"
-
-#~ msgid "Reference"
-#~ msgstr "Référence"
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index b9bf51490..dddae309b 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -72,7 +72,7 @@
 
 {%else%}
 
-<h3>{% trans "Research archaelogy"%}</h3>
+<h3>{% trans "Research archaeology"%}</h3>
 {% if item.departments.count %}<p><label>{%trans "Departments"%}{%trans ":"%}</label> <span class='value'>{% for department in item.departments.all %}{% if forloop.counter0 %}, {% endif %}{{ department }}{% endfor %}</span></p>{% endif %}
 {% if item.scientist %}<p><label>{%trans "Head scientist"%}{%trans ":"%}</label> <span class='value'>{{ item.scientist }}</span></p>{% endif %}
 {% if item.requested_operation_type %}<p><label>{%trans "Requested operation type"%}{%trans ":"%}</label> <span class='value'>{{ item.requested_operation_type }}</span></p>{% endif %}