summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archaeological_finds/locale/django.pot44
-rw-r--r--archaeological_operations/locale/django.pot226
-rw-r--r--translations/fr/archaeological_finds.po51
-rw-r--r--translations/fr/archaeological_operations.po232
-rw-r--r--translations/fr/ishtar_common.po10
5 files changed, 290 insertions, 273 deletions
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 6ff8bc10a..64cfa69b5 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -212,39 +212,43 @@ msgstr ""
msgid "Resulting finds"
msgstr ""
-#: forms.py:318
+#: forms.py:319
+msgid "Would you like to delete this find?"
+msgstr ""
+
+#: forms.py:323
msgid "Upstream find"
msgstr ""
-#: forms.py:325
+#: forms.py:330
msgid "Archaeological find search"
msgstr ""
-#: forms.py:327
+#: forms.py:332
msgid "You should select an archaeological find."
msgstr ""
-#: forms.py:332
+#: forms.py:337
msgid "Year of the operation"
msgstr ""
-#: forms.py:334
+#: forms.py:339
msgid "Period of the archaelogical find"
msgstr ""
-#: forms.py:336
+#: forms.py:341
msgid "Material type of the archaelogical find"
msgstr ""
-#: forms.py:338
+#: forms.py:343
msgid "Description of the archaelogical find"
msgstr ""
-#: forms.py:350
+#: forms.py:355
msgid "Documentation search"
msgstr ""
-#: forms.py:352
+#: forms.py:357
msgid "You should select a document."
msgstr ""
@@ -252,20 +256,20 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ishtar_menu.py:40 ishtar_menu.py:57
+#: ishtar_menu.py:40 ishtar_menu.py:62
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:45 ishtar_menu.py:62
+#: ishtar_menu.py:45 ishtar_menu.py:67
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:54
-msgid "Documentation"
+#: ishtar_menu.py:54 ishtar_menu.py:72
+msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:67
-msgid "Deletion"
+#: ishtar_menu.py:59
+msgid "Documentation"
msgstr ""
#: models.py:39
@@ -544,15 +548,19 @@ msgstr ""
msgid "Find modification"
msgstr ""
-#: views.py:129
+#: views.py:126
+msgid "Find deletion"
+msgstr ""
+
+#: views.py:135
msgid "Find: new source"
msgstr ""
-#: views.py:137
+#: views.py:143
msgid "Find: source modification"
msgstr ""
-#: views.py:143
+#: views.py:149
msgid "Find: source deletion"
msgstr ""
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index b78e36c6c..4e15894e7 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -7,12 +7,12 @@
msgid ""
msgstr ""
-#: forms.py:66 forms.py:333 forms.py:892 forms.py:914 forms.py:918
+#: forms.py:66 forms.py:333 forms.py:903 forms.py:925 forms.py:929
#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr ""
-#: forms.py:69 forms.py:185 forms.py:868 models.py:770
+#: forms.py:69 forms.py:185 forms.py:879 models.py:770
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -21,7 +21,7 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:71 forms.py:411 forms.py:682 forms.py:1099 models.py:158
+#: forms.py:71 forms.py:422 forms.py:693 forms.py:1111 models.py:158
#: models.py:587 models.py:768
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
@@ -74,27 +74,35 @@ msgstr ""
msgid ":"
msgstr ""
-#: forms.py:395
+#: forms.py:372 forms.py:548 forms.py:1083
+msgid "You should select an operation."
+msgstr ""
+
+#: forms.py:376
+msgid "You should select a relation type."
+msgstr ""
+
+#: forms.py:406
msgid "Current relations"
msgstr ""
-#: forms.py:397
+#: forms.py:408
msgid "Deleted relations"
msgstr ""
-#: forms.py:401 templates/ishtar/sheet_operation.html:115
+#: forms.py:412 templates/ishtar/sheet_operation.html:115
msgid "Relations"
msgstr ""
-#: forms.py:412
+#: forms.py:423
msgid "Numeric reference"
msgstr ""
-#: forms.py:417 forms.py:1109
+#: forms.py:428 forms.py:1121
msgid "Parcel (section/number)"
msgstr ""
-#: forms.py:420 forms.py:1112 models.py:489
+#: forms.py:431 forms.py:1124 models.py:489
#: templates/ishtar/dashboards/dashboard_operation.html:273
#: templates/ishtar/dashboards/dashboard_operation.html:286
#: templates/ishtar/dashboards/dashboard_operation.html:453
@@ -102,397 +110,389 @@ msgstr ""
msgid "Department"
msgstr ""
-#: forms.py:421 forms.py:953 models.py:77
+#: forms.py:432 forms.py:964 models.py:77
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Name"
msgstr ""
-#: forms.py:423 forms.py:604 forms.py:680 forms.py:1076 models.py:166
+#: forms.py:434 forms.py:615 forms.py:691 forms.py:1088 models.py:166
msgid "Operation type"
msgstr ""
-#: forms.py:425
+#: forms.py:436
msgid "Is open?"
msgstr ""
-#: forms.py:434 forms.py:710 models.py:155
+#: forms.py:445 forms.py:721 models.py:155
msgid "In charge"
msgstr ""
-#: forms.py:441 models.py:573
+#: forms.py:452 models.py:573
msgid "Scientist in charge"
msgstr ""
-#: forms.py:443 forms.py:606 forms.py:701 models.py:153
+#: forms.py:454 forms.py:617 forms.py:712 models.py:153
msgid "Operator"
msgstr ""
-#: forms.py:450 forms.py:958 models.py:81 models.py:168
+#: forms.py:461 forms.py:969 models.py:81 models.py:168
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Remains"
msgstr ""
-#: forms.py:451 forms.py:937 forms.py:955 models.py:79 models.py:173
+#: forms.py:462 forms.py:948 forms.py:966 models.py:79 models.py:173
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Periods"
msgstr ""
-#: forms.py:452
+#: forms.py:463
msgid "Started before"
msgstr ""
-#: forms.py:454
+#: forms.py:465
msgid "Started after"
msgstr ""
-#: forms.py:456
+#: forms.py:467
msgid "Ended before"
msgstr ""
-#: forms.py:458
+#: forms.py:469
msgid "Ended after"
msgstr ""
-#: forms.py:461
+#: forms.py:472
msgid "Search within relations"
msgstr ""
-#: forms.py:463 forms.py:752 models.py:219
+#: forms.py:474 forms.py:763 models.py:219
msgid "Comment"
msgstr ""
-#: forms.py:464
+#: forms.py:475
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:465 forms.py:754 models.py:231
+#: forms.py:476 forms.py:765 models.py:231
msgid "Record quality"
msgstr ""
-#: forms.py:466 forms.py:733 models.py:185
+#: forms.py:477 forms.py:744 models.py:185
msgid "Report processing"
msgstr ""
-#: forms.py:468 forms.py:757 models.py:226
+#: forms.py:479 forms.py:768 models.py:226
msgid "Virtual operation"
msgstr ""
-#: forms.py:476 forms.py:1116
+#: forms.py:481 forms.py:1009
+msgid "Archaelogical site"
+msgstr ""
+
+#: forms.py:487 forms.py:1128
msgid "Created by"
msgstr ""
-#: forms.py:482 forms.py:1122
+#: forms.py:493 forms.py:1134
msgid "Modified by"
msgstr ""
-#: forms.py:524 forms.py:1069 views.py:231
+#: forms.py:535 forms.py:1081 views.py:231
msgid "Operation search"
msgstr ""
-#: forms.py:537 forms.py:1071
-msgid "You should select an operation."
-msgstr ""
-
-#: forms.py:568
+#: forms.py:579
msgid "Associated file"
msgstr ""
-#: forms.py:572 forms.py:816 models.py:584 wizards.py:76
+#: forms.py:583 forms.py:827 models.py:584 wizards.py:76
msgid "Archaelogical file"
msgstr ""
-#: forms.py:579 forms.py:581 models.py:233
+#: forms.py:590 forms.py:592 models.py:233
msgid "Abstract"
msgstr ""
-#: forms.py:584
+#: forms.py:595
msgid "months"
msgstr ""
-#: forms.py:584
+#: forms.py:595
msgid "years"
msgstr ""
-#: forms.py:586 models.py:139
+#: forms.py:597 models.py:139
msgid "Creation date"
msgstr ""
-#: forms.py:587
+#: forms.py:598
msgid "Start of field work"
msgstr ""
-#: forms.py:589
+#: forms.py:600
msgid "All"
msgstr ""
-#: forms.py:590
+#: forms.py:601
msgid "Preventive"
msgstr ""
-#: forms.py:591
+#: forms.py:602
msgid "Research"
msgstr ""
-#: forms.py:595
+#: forms.py:606
msgid "Slicing"
msgstr ""
-#: forms.py:598
+#: forms.py:609
msgid "Department detail"
msgstr ""
-#: forms.py:600
+#: forms.py:611
msgid "Date get from"
msgstr ""
-#: forms.py:602
+#: forms.py:613
msgid "Preventive/Research"
msgstr ""
-#: forms.py:608
+#: forms.py:619
msgid "Date after"
msgstr ""
-#: forms.py:610
+#: forms.py:621
msgid "Date before"
msgstr ""
-#: forms.py:612
+#: forms.py:623
msgid "With reports"
msgstr ""
-#: forms.py:613
+#: forms.py:624
msgid "With finds"
msgstr ""
-#: forms.py:665 forms.py:1169 templates/ishtar/sheet_administrativeact.html:11
+#: forms.py:676 forms.py:1181 templates/ishtar/sheet_administrativeact.html:11
#: templates/ishtar/sheet_operation.html:32
msgid "General"
msgstr ""
-#: forms.py:678 models.py:218
+#: forms.py:689 models.py:218
msgid "Generic name"
msgstr ""
-#: forms.py:687 forms.py:812 models.py:159 models.py:368
+#: forms.py:698 forms.py:823 models.py:159 models.py:368
msgid "Operation code"
msgstr ""
-#: forms.py:691
+#: forms.py:702
msgid "Head scientist"
msgstr ""
-#: forms.py:707 models.py:217
+#: forms.py:718 models.py:217
msgid "Operator reference"
msgstr ""
-#: forms.py:719
+#: forms.py:730
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:724
-msgid "Associated archaeological sites"
-msgstr ""
-
-#: forms.py:726 models.py:49 models.py:142 models.py:938
+#: forms.py:737 models.py:49 models.py:142 models.py:938
msgid "Start date"
msgstr ""
-#: forms.py:728 models.py:144
+#: forms.py:739 models.py:144
msgid "Excavation end date"
msgstr ""
-#: forms.py:731 models.py:145
+#: forms.py:742 models.py:145
msgid "Report delivery date"
msgstr ""
-#: forms.py:782
+#: forms.py:793
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
-#: forms.py:787
+#: forms.py:798
msgid "The excavation end date cannot be before the start date."
msgstr ""
-#: forms.py:802
+#: forms.py:813
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:806
+#: forms.py:817
msgid "Bad operation code"
msgstr ""
-#: forms.py:838
+#: forms.py:849
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:839 models.py:171
+#: forms.py:850 models.py:171
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (euros)"
msgstr ""
-#: forms.py:840 models.py:176
+#: forms.py:851 models.py:176
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:842 models.py:179
+#: forms.py:853 models.py:179
msgid "Optional man-days"
msgstr ""
-#: forms.py:844 models.py:182
+#: forms.py:855 models.py:182
msgid "Effective man-days"
msgstr ""
-#: forms.py:854
+#: forms.py:865
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:857 models.py:201
+#: forms.py:868 models.py:201
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:859 models.py:204
+#: forms.py:870 models.py:204
msgid "Prescription on large area"
msgstr ""
-#: forms.py:862 models.py:206
+#: forms.py:873 models.py:206
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:866 forms.py:888 models.py:170 models.py:597
+#: forms.py:877 forms.py:899 models.py:170 models.py:597
msgid "Towns"
msgstr ""
-#: forms.py:895 models.py:779 models.py:936
+#: forms.py:906 models.py:779 models.py:936
msgid "Parcel"
msgstr ""
-#: forms.py:922 models.py:43
+#: forms.py:933 models.py:43
msgid "Remain types"
msgstr ""
-#: forms.py:926 models.py:42
+#: forms.py:937 models.py:42
msgid "Remain type"
msgstr ""
-#: forms.py:941
+#: forms.py:952
msgid "Period"
msgstr ""
-#: forms.py:952 models.py:76
+#: forms.py:963 models.py:76
msgid "Reference"
msgstr ""
-#: forms.py:977
+#: forms.py:988
msgid "This reference already exists."
msgstr ""
-#: forms.py:994 models.py:85
+#: forms.py:1005 models.py:85
msgid "Archaeological site"
msgstr ""
-#: forms.py:998
-msgid "Archaelogical site"
-msgstr ""
-
-#: forms.py:1008 models.py:86 models.py:223
+#: forms.py:1020 models.py:86 models.py:223
#: templates/ishtar/sheet_operation.html:126
msgid "Archaeological sites"
msgstr ""
-#: forms.py:1012
+#: forms.py:1024
msgid "Associated archaelogical sites"
msgstr ""
-#: forms.py:1018 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1030 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr ""
-#: forms.py:1023
+#: forms.py:1035
msgid "Would you like to close this operation?"
msgstr ""
-#: forms.py:1028
+#: forms.py:1040
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1037 forms.py:1100 models.py:515 models.py:564
+#: forms.py:1049 forms.py:1112 models.py:515 models.py:564
msgid "Index"
msgstr ""
-#: forms.py:1063
+#: forms.py:1075
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1075
+#: forms.py:1087
msgid "Operation's town"
msgstr ""
-#: forms.py:1078
+#: forms.py:1090
msgid "Operation's year"
msgstr ""
-#: forms.py:1089
+#: forms.py:1101
msgid "Documentation search"
msgstr ""
-#: forms.py:1091
+#: forms.py:1103
msgid "You should select a document."
msgstr ""
-#: forms.py:1106 forms.py:1172 models.py:539 models.py:558
+#: forms.py:1118 forms.py:1184 models.py:539 models.py:558
msgid "Act type"
msgstr ""
-#: forms.py:1107 forms.py:1260
+#: forms.py:1119 forms.py:1272
msgid "Indexed?"
msgstr ""
-#: forms.py:1113 forms.py:1177 models.py:588
+#: forms.py:1125 forms.py:1189 models.py:588
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Object"
msgstr ""
-#: forms.py:1149 views.py:373
+#: forms.py:1161 views.py:373
msgid "Administrative act search"
msgstr ""
-#: forms.py:1164 forms.py:1218 forms.py:1285
+#: forms.py:1176 forms.py:1230 forms.py:1297
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1180 models.py:585
+#: forms.py:1192 models.py:585
msgid "Signature date"
msgstr ""
-#: forms.py:1195
+#: forms.py:1207
msgid "Would you like to delete this administrative act?"
msgstr ""
-#: forms.py:1200
+#: forms.py:1212
msgid "Template"
msgstr ""
-#: forms.py:1224 forms.py:1228
+#: forms.py:1236 forms.py:1240
msgid "This document is not intended for this type of act."
msgstr ""
-#: forms.py:1246
+#: forms.py:1258
msgid "Doc generation"
msgstr ""
-#: forms.py:1248
+#: forms.py:1260
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1269 ishtar_menu.py:121 views.py:407
+#: forms.py:1281 ishtar_menu.py:121 views.py:407
msgctxt "admin act register"
msgid "Register"
msgstr ""
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 6de4b7686..6a9ed4c3c 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -4,13 +4,14 @@
# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
+# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-02-24 10:49-0500\n"
-"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
+"PO-Revision-Date: 2016-03-07 12:02-0500\n"
+"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -223,39 +224,43 @@ msgstr "Description précise"
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:318
+#: forms.py:319
+msgid "Would you like to delete this find?"
+msgstr "Souhaitez vous supprimer ce mobilier ?"
+
+#: forms.py:323
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:325
+#: forms.py:330
msgid "Archaeological find search"
msgstr "Recherche de mobilier"
-#: forms.py:327
+#: forms.py:332
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:332
+#: forms.py:337
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:334
+#: forms.py:339
msgid "Period of the archaelogical find"
msgstr "Période du mobilier"
-#: forms.py:336
+#: forms.py:341
msgid "Material type of the archaelogical find"
msgstr "Type de matériau du mobilier"
-#: forms.py:338
+#: forms.py:343
msgid "Description of the archaelogical find"
msgstr "Description du mobilier"
-#: forms.py:350
+#: forms.py:355
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:352
+#: forms.py:357
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
@@ -263,22 +268,22 @@ msgstr "Vous devez sélectionner un document."
msgid "Search"
msgstr "Recherche"
-#: ishtar_menu.py:40 ishtar_menu.py:57
+#: ishtar_menu.py:40 ishtar_menu.py:62
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:45 ishtar_menu.py:62
+#: ishtar_menu.py:45 ishtar_menu.py:67
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:54
-msgid "Documentation"
-msgstr "Documentation"
-
-#: ishtar_menu.py:67
+#: ishtar_menu.py:54 ishtar_menu.py:72
msgid "Deletion"
msgstr "Suppression"
+#: ishtar_menu.py:59
+msgid "Documentation"
+msgstr "Documentation"
+
#: models.py:39
msgid "Code"
msgstr "Code"
@@ -555,15 +560,19 @@ msgstr "Nouveau mobilier"
msgid "Find modification"
msgstr "Modification de mobilier"
-#: views.py:129
+#: views.py:126
+msgid "Find deletion"
+msgstr "Suppression de mobilier"
+
+#: views.py:135
msgid "Find: new source"
msgstr "Mobilier : nouvelle documentation associée"
-#: views.py:137
+#: views.py:143
msgid "Find: source modification"
msgstr "Mobilier : modification de documentation associée"
-#: views.py:143
+#: views.py:149
msgid "Find: source deletion"
msgstr "Mobilier : suppression de mobilier associé"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 96e211cb1..affedb29b 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -10,19 +10,19 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-02-25 07:05-0500\n"
+"PO-Revision-Date: 2016-03-07 12:01-0500\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.8.2\n"
-#: forms.py:66 forms.py:333 forms.py:892 forms.py:914 forms.py:918
+#: forms.py:66 forms.py:333 forms.py:903 forms.py:925 forms.py:929
#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:69 forms.py:185 forms.py:868 models.py:770
+#: forms.py:69 forms.py:185 forms.py:879 models.py:770
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -31,7 +31,7 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:71 forms.py:411 forms.py:682 forms.py:1099 models.py:158
+#: forms.py:71 forms.py:422 forms.py:693 forms.py:1111 models.py:158
#: models.py:587 models.py:768
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
@@ -84,27 +84,35 @@ msgstr "Opération"
msgid ":"
msgstr ": "
-#: forms.py:395
+#: forms.py:372 forms.py:548 forms.py:1083
+msgid "You should select an operation."
+msgstr "Vous devez sélectionner une opération."
+
+#: forms.py:376
+msgid "You should select a relation type."
+msgstr "Vous devez sélectionner un type de relation."
+
+#: forms.py:406
msgid "Current relations"
msgstr "Relations actuelles"
-#: forms.py:397
+#: forms.py:408
msgid "Deleted relations"
msgstr "Relations supprimées"
-#: forms.py:401 templates/ishtar/sheet_operation.html:115
+#: forms.py:412 templates/ishtar/sheet_operation.html:115
msgid "Relations"
msgstr "Relations"
-#: forms.py:412
+#: forms.py:423
msgid "Numeric reference"
msgstr "Identifiant numérique"
-#: forms.py:417 forms.py:1109
+#: forms.py:428 forms.py:1121
msgid "Parcel (section/number)"
msgstr "Parcelle (section/numéro)"
-#: forms.py:420 forms.py:1112 models.py:489
+#: forms.py:431 forms.py:1124 models.py:489
#: templates/ishtar/dashboards/dashboard_operation.html:273
#: templates/ishtar/dashboards/dashboard_operation.html:286
#: templates/ishtar/dashboards/dashboard_operation.html:453
@@ -112,223 +120,219 @@ msgstr "Parcelle (section/numéro)"
msgid "Department"
msgstr "Département"
-#: forms.py:421 forms.py:953 models.py:77
+#: forms.py:432 forms.py:964 models.py:77
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Name"
msgstr "Nom"
-#: forms.py:423 forms.py:604 forms.py:680 forms.py:1076 models.py:166
+#: forms.py:434 forms.py:615 forms.py:691 forms.py:1088 models.py:166
msgid "Operation type"
msgstr "Type d'opération"
-#: forms.py:425
+#: forms.py:436
msgid "Is open?"
msgstr "Est ouvert ?"
-#: forms.py:434 forms.py:710 models.py:155
+#: forms.py:445 forms.py:721 models.py:155
msgid "In charge"
msgstr "Responsable"
-#: forms.py:441 models.py:573
+#: forms.py:452 models.py:573
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:443 forms.py:606 forms.py:701 models.py:153
+#: forms.py:454 forms.py:617 forms.py:712 models.py:153
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:450 forms.py:958 models.py:81 models.py:168
+#: forms.py:461 forms.py:969 models.py:81 models.py:168
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:451 forms.py:937 forms.py:955 models.py:79 models.py:173
+#: forms.py:462 forms.py:948 forms.py:966 models.py:79 models.py:173
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Periods"
msgstr "Périodes"
-#: forms.py:452
+#: forms.py:463
msgid "Started before"
msgstr "Commencé avant"
-#: forms.py:454
+#: forms.py:465
msgid "Started after"
msgstr "Commencé après"
-#: forms.py:456
+#: forms.py:467
msgid "Ended before"
msgstr "Terminé avant"
-#: forms.py:458
+#: forms.py:469
msgid "Ended after"
msgstr "Terminé après"
-#: forms.py:461
+#: forms.py:472
msgid "Search within relations"
msgstr "Recherche parmi les relations"
-#: forms.py:463 forms.py:752 models.py:219
+#: forms.py:474 forms.py:763 models.py:219
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:464
+#: forms.py:475
msgid "Abstract (full text search)"
msgstr "Résumé (recherche texte intégral)"
-#: forms.py:465 forms.py:754 models.py:231
+#: forms.py:476 forms.py:765 models.py:231
msgid "Record quality"
msgstr "Qualité d'enregistrement"
-#: forms.py:466 forms.py:733 models.py:185
+#: forms.py:477 forms.py:744 models.py:185
msgid "Report processing"
msgstr "Traitement du rapport"
-#: forms.py:468 forms.py:757 models.py:226
+#: forms.py:479 forms.py:768 models.py:226
msgid "Virtual operation"
msgstr "Opération virtuelle"
-#: forms.py:476 forms.py:1116
+#: forms.py:481 forms.py:1009
+msgid "Archaelogical site"
+msgstr "Entité Archéologique"
+
+#: forms.py:487 forms.py:1128
msgid "Created by"
msgstr "Créé par"
-#: forms.py:482 forms.py:1122
+#: forms.py:493 forms.py:1134
msgid "Modified by"
msgstr "Modifié par"
-#: forms.py:524 forms.py:1069 views.py:231
+#: forms.py:535 forms.py:1081 views.py:231
msgid "Operation search"
msgstr "Recherche d'opérations"
-#: forms.py:537 forms.py:1071
-msgid "You should select an operation."
-msgstr "Vous devez sélectionner une opération."
-
-#: forms.py:568
+#: forms.py:579
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:572 forms.py:816 models.py:584 wizards.py:76
+#: forms.py:583 forms.py:827 models.py:584 wizards.py:76
msgid "Archaelogical file"
msgstr "Dossier"
-#: forms.py:579 forms.py:581 models.py:233
+#: forms.py:590 forms.py:592 models.py:233
msgid "Abstract"
msgstr "Résumé"
-#: forms.py:584
+#: forms.py:595
msgid "months"
msgstr "mois"
-#: forms.py:584
+#: forms.py:595
msgid "years"
msgstr "années"
-#: forms.py:586 models.py:139
+#: forms.py:597 models.py:139
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:587
+#: forms.py:598
msgid "Start of field work"
msgstr "Début du travail de terrain"
-#: forms.py:589
+#: forms.py:600
msgid "All"
-msgstr "Tous"
+msgstr "Tout"
-#: forms.py:590
+#: forms.py:601
msgid "Preventive"
msgstr "Préventif"
-#: forms.py:591
+#: forms.py:602
msgid "Research"
-msgstr "Programmée"
+msgstr "Programmé"
-#: forms.py:595
+#: forms.py:606
msgid "Slicing"
msgstr "Découpage"
-#: forms.py:598
+#: forms.py:609
msgid "Department detail"
msgstr "Détail par département"
-#: forms.py:600
+#: forms.py:611
msgid "Date get from"
msgstr "Date obtenue depuis"
-#: forms.py:602
+#: forms.py:613
msgid "Preventive/Research"
msgstr "Préventif/Programmé"
-#: forms.py:608
+#: forms.py:619
msgid "Date after"
msgstr "Date après"
-#: forms.py:610
+#: forms.py:621
msgid "Date before"
msgstr "Date avant"
-#: forms.py:612
+#: forms.py:623
msgid "With reports"
msgstr "Avec un rapport"
-#: forms.py:613
+#: forms.py:624
msgid "With finds"
msgstr "Avec du mobilier"
-#: forms.py:665 forms.py:1169 templates/ishtar/sheet_administrativeact.html:11
+#: forms.py:676 forms.py:1181 templates/ishtar/sheet_administrativeact.html:11
#: templates/ishtar/sheet_operation.html:32
msgid "General"
msgstr "Général"
-#: forms.py:678 models.py:218
+#: forms.py:689 models.py:218
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:687 forms.py:812 models.py:159 models.py:368
+#: forms.py:698 forms.py:823 models.py:159 models.py:368
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:691
+#: forms.py:702
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:707 models.py:217
+#: forms.py:718 models.py:217
msgid "Operator reference"
msgstr "Référence de l'opérateur"
-#: forms.py:719
+#: forms.py:730
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:724
-msgid "Associated archaeological sites"
-msgstr "Entités archéologiques associées"
-
-#: forms.py:726 models.py:49 models.py:142 models.py:938
+#: forms.py:737 models.py:49 models.py:142 models.py:938
msgid "Start date"
msgstr "Date de début"
-#: forms.py:728 models.py:144
+#: forms.py:739 models.py:144
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:731 models.py:145
+#: forms.py:742 models.py:145
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
-#: forms.py:782
+#: forms.py:793
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
"Avant de renseigner la date de fin de chantier, il est nécessaire de "
"renseigner une date de début."
-#: forms.py:787
+#: forms.py:798
msgid "The excavation end date cannot be before the start date."
msgstr ""
"La date de fin de chantier ne peut être antérieure à la date de début."
-#: forms.py:802
+#: forms.py:813
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
@@ -337,109 +341,105 @@ msgstr ""
"Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:806
+#: forms.py:817
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:838
+#: forms.py:849
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:839 models.py:171
+#: forms.py:850 models.py:171
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (euros)"
msgstr "Coût (euros)"
-#: forms.py:840 models.py:176
+#: forms.py:851 models.py:176
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:842 models.py:179
+#: forms.py:853 models.py:179
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:844 models.py:182
+#: forms.py:855 models.py:182
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
-#: forms.py:854
+#: forms.py:865
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:857 models.py:201
+#: forms.py:868 models.py:201
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:859 models.py:204
+#: forms.py:870 models.py:204
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:862 models.py:206
+#: forms.py:873 models.py:206
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:866 forms.py:888 models.py:170 models.py:597
+#: forms.py:877 forms.py:899 models.py:170 models.py:597
msgid "Towns"
msgstr "Communes"
-#: forms.py:895 models.py:779 models.py:936
+#: forms.py:906 models.py:779 models.py:936
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:922 models.py:43
+#: forms.py:933 models.py:43
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:926 models.py:42
+#: forms.py:937 models.py:42
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:941
+#: forms.py:952
msgid "Period"
msgstr "Période"
-#: forms.py:952 models.py:76
+#: forms.py:963 models.py:76
msgid "Reference"
msgstr "Référence"
-#: forms.py:977
+#: forms.py:988
msgid "This reference already exists."
msgstr "Cette référence existe déjà."
-#: forms.py:994 models.py:85
+#: forms.py:1005 models.py:85
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:998
-msgid "Archaelogical site"
-msgstr "Entité Archéologique"
-
-#: forms.py:1008 models.py:86 models.py:223
+#: forms.py:1020 models.py:86 models.py:223
#: templates/ishtar/sheet_operation.html:126
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: forms.py:1012
+#: forms.py:1024
msgid "Associated archaelogical sites"
msgstr "Entités archéologiques associées"
-#: forms.py:1018 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1030 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr "Recherche"
-#: forms.py:1023
+#: forms.py:1035
msgid "Would you like to close this operation?"
msgstr "Voulez-vous clore cette opération ?"
-#: forms.py:1028
+#: forms.py:1040
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1037 forms.py:1100 models.py:515 models.py:564
+#: forms.py:1049 forms.py:1112 models.py:515 models.py:564
msgid "Index"
msgstr "Index"
-#: forms.py:1063
+#: forms.py:1075
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
@@ -448,68 +448,68 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:1075
+#: forms.py:1087
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: forms.py:1078
+#: forms.py:1090
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:1089
+#: forms.py:1101
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:1091
+#: forms.py:1103
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1106 forms.py:1172 models.py:539 models.py:558
+#: forms.py:1118 forms.py:1184 models.py:539 models.py:558
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:1107 forms.py:1260
+#: forms.py:1119 forms.py:1272
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1113 forms.py:1177 models.py:588
+#: forms.py:1125 forms.py:1189 models.py:588
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Object"
msgstr "Objet"
-#: forms.py:1149 views.py:373
+#: forms.py:1161 views.py:373
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: forms.py:1164 forms.py:1218 forms.py:1285
+#: forms.py:1176 forms.py:1230 forms.py:1297
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1180 models.py:585
+#: forms.py:1192 models.py:585
msgid "Signature date"
msgstr "Date de signature"
-#: forms.py:1195
+#: forms.py:1207
msgid "Would you like to delete this administrative act?"
msgstr "Voulez-vous supprimer cet acte administratif ?"
-#: forms.py:1200
+#: forms.py:1212
msgid "Template"
msgstr "Patron"
-#: forms.py:1224 forms.py:1228
+#: forms.py:1236 forms.py:1240
msgid "This document is not intended for this type of act."
msgstr "Ce document n'est pas destiné à ce type d'acte."
-#: forms.py:1246
+#: forms.py:1258
msgid "Doc generation"
msgstr "Génération de document"
-#: forms.py:1248
+#: forms.py:1260
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:1269 ishtar_menu.py:121 views.py:407
+#: forms.py:1281 ishtar_menu.py:121 views.py:407
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index c7387396f..34aa3ca58 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -10,8 +10,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-02-25 07:04-0500\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
+"PO-Revision-Date: 2016-02-26 10:49-0500\n"
+"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -217,7 +217,7 @@ msgstr ""
#: forms_common.py:66 forms_common.py:648 ishtar_menu.py:42 models.py:2039
#: models.py:2168 models.py:2222 templates/ishtar/sheet_person.html:6
msgid "Person"
-msgstr "Individu"
+msgstr "Personne"
#: forms_common.py:157 forms_common.py:231 ishtar_menu.py:66 models.py:1961
#: templates/ishtar/sheet_organization.html:6
@@ -290,7 +290,7 @@ msgstr "Prénom"
#: forms_common.py:243 views.py:88
msgid "Person search"
-msgstr "Recherche d'individus"
+msgstr "Recherche de personnes"
#: forms_common.py:254
msgid "Identity"
@@ -313,7 +313,7 @@ msgstr "Organisation actuelle"
#: forms_common.py:325 forms_common.py:355 forms_common.py:359 models.py:2009
msgid "Person type"
-msgstr "Type d'individu"
+msgstr "Type de personne"
#: forms_common.py:370 forms_common.py:375
msgid "Account"