summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-11 15:58:48 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-11 15:58:48 +0200
commit7225e1fa34d36c687e66ac892bd41138ff91349d (patch)
tree486995a4cac848769743a86c6164eafbba306ec4
parent929a7a1512d93c4548fbe6d5aa029ab366c171be (diff)
downloadIshtar-7225e1fa34d36c687e66ac892bd41138ff91349d.tar.bz2
Ishtar-7225e1fa34d36c687e66ac892bd41138ff91349d.zip
Update translations
-rw-r--r--archaeological_context_records/locale/django.pot3
-rw-r--r--archaeological_files/locale/django.pot1
-rw-r--r--archaeological_finds/locale/django.pot587
-rw-r--r--archaeological_warehouse/locale/django.pot36
-rw-r--r--ishtar_common/locale/django.pot16
-rw-r--r--translations/de/ishtar_common.po2
-rw-r--r--translations/fr/archaeological_finds.po592
-rw-r--r--translations/fr/archaeological_warehouse.po36
-rw-r--r--translations/fr/ishtar_common.po6
9 files changed, 622 insertions, 657 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index 02f5c8110..1194108ae 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -290,7 +290,6 @@ msgid "Datings"
msgstr ""
#: models.py:91
-#| msgid "Finds"
msgid "Find"
msgstr ""
@@ -403,12 +402,10 @@ msgid "Estimation of a \"Terminus Post Quem\""
msgstr ""
#: models.py:302
-#| msgid "Point"
msgid "Point (2D)"
msgstr ""
#: models.py:303
-#| msgid "Point"
msgid "Point (3D)"
msgstr ""
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index 7e99de15a..9397d9b1c 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -346,7 +346,6 @@ msgid "Closing date"
msgstr ""
#: models.py:154
-#| msgid "main towns"
msgid "Main town"
msgstr ""
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 84f207d0f..cfbd686cf 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -9,166 +9,166 @@
msgid ""
msgstr ""
-#: admin.py:39 models_finds.py:216
+#: admin.py:39 models_finds.py:229
msgid "Point (2D)"
msgstr ""
-#: admin.py:41 models_finds.py:218
+#: admin.py:41 models_finds.py:231
msgid "Line"
msgstr ""
-#: admin.py:43 models_finds.py:219
+#: admin.py:43 models_finds.py:232
msgid "Polygon"
msgstr ""
-#: forms.py:96 forms.py:100 forms.py:386 models_finds.py:551
-#: models_finds.py:831 wizards.py:64
+#: forms.py:96 forms.py:100 forms.py:389 models_finds.py:565
+#: models_finds.py:846 wizards.py:64
msgid "Context record"
msgstr ""
-#: forms.py:129 ishtar_menu.py:32 models_finds.py:741 models_finds.py:1328
-#: models_finds.py:1349 models_treatments.py:320
+#: forms.py:129 ishtar_menu.py:32 models_finds.py:756 models_finds.py:1343
+#: models_finds.py:1364 models_treatments.py:296
#: templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr ""
-#: forms.py:140 forms.py:368 forms.py:650 models_finds.py:184
-#: models_finds.py:649 templates/ishtar/sheet_find.html:16
+#: forms.py:140 forms.py:371 forms.py:653 models_finds.py:197
+#: models_finds.py:663 templates/ishtar/sheet_find.html:16
msgid "Free ID"
msgstr ""
-#: forms.py:142 models_finds.py:698
+#: forms.py:142 models_finds.py:712
msgid "Previous ID"
msgstr ""
-#: forms.py:143 forms.py:408 forms_treatments.py:133 models_finds.py:188
-#: models_finds.py:650 models_treatments.py:126
+#: forms.py:143 forms.py:411 forms_treatments.py:133 models_finds.py:201
+#: models_finds.py:664 models_treatments.py:102
msgid "Description"
msgstr ""
-#: forms.py:146 models_finds.py:195
+#: forms.py:146 models_finds.py:208
msgid "Discovery date"
msgstr ""
-#: forms.py:148 forms.py:410 models_finds.py:197
+#: forms.py:148 forms.py:413 models_finds.py:210
msgid "Batch/object"
msgstr ""
-#: forms.py:150 models_finds.py:673
+#: forms.py:150 models_finds.py:687
msgid "Is complete?"
msgstr ""
-#: forms.py:153 forms.py:398 forms.py:654 models_finds.py:52
+#: forms.py:153 forms.py:401 forms.py:657 models_finds.py:52
msgid "Material type"
msgstr ""
-#: forms.py:156 models_finds.py:120 models_finds.py:572 models_finds.py:676
+#: forms.py:156 models_finds.py:133 models_finds.py:586 models_finds.py:690
msgid "Object types"
msgstr ""
-#: forms.py:159 forms.py:404 models_finds.py:680
+#: forms.py:159 forms.py:407 models_finds.py:694
msgid "Integrity / interest"
msgstr ""
-#: forms.py:162 forms.py:406 models_finds.py:683
+#: forms.py:162 forms.py:409 models_finds.py:697
msgid "Remarkability"
msgstr ""
-#: forms.py:165 models_finds.py:202
+#: forms.py:165 models_finds.py:215
msgid "Point of topographic reference"
msgstr ""
-#: forms.py:168 models_finds.py:204 templates/ishtar/sheet_find.html:216
+#: forms.py:168 models_finds.py:217 templates/ishtar/sheet_find.html:215
msgid "X"
msgstr ""
-#: forms.py:169 models_finds.py:205 templates/ishtar/sheet_find.html:217
+#: forms.py:169 models_finds.py:218 templates/ishtar/sheet_find.html:216
msgid "Y"
msgstr ""
-#: forms.py:170 models_finds.py:206 templates/ishtar/sheet_find.html:218
+#: forms.py:170 models_finds.py:219 templates/ishtar/sheet_find.html:217
msgid "Z"
msgstr ""
-#: forms.py:172 models_finds.py:214
+#: forms.py:172 models_finds.py:227
msgid "Spatial Reference System"
msgstr ""
-#: forms.py:175 models_finds.py:207
+#: forms.py:175 models_finds.py:220
msgid "Estimated error for X"
msgstr ""
-#: forms.py:177 models_finds.py:209
+#: forms.py:177 models_finds.py:222
msgid "Estimated error for Y"
msgstr ""
-#: forms.py:179 models_finds.py:211
+#: forms.py:179 models_finds.py:224
msgid "Estimated error for Z"
msgstr ""
-#: forms.py:180 models_finds.py:687
+#: forms.py:180 models_finds.py:701
msgid "Length (cm)"
msgstr ""
-#: forms.py:181 models_finds.py:688
+#: forms.py:181 models_finds.py:702
msgid "Width (cm)"
msgstr ""
-#: forms.py:182 models_finds.py:689
+#: forms.py:182 models_finds.py:703
msgid "Height (cm)"
msgstr ""
-#: forms.py:183 models_finds.py:690
+#: forms.py:183 models_finds.py:704
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:184 models_finds.py:691
+#: forms.py:184 models_finds.py:705
msgid "Thickness (cm)"
msgstr ""
-#: forms.py:185 forms.py:655 models_finds.py:655
+#: forms.py:185 forms.py:658 models_finds.py:669
msgid "Volume (l)"
msgstr ""
-#: forms.py:186 forms.py:656 models_finds.py:656
+#: forms.py:186 forms.py:659 models_finds.py:670
msgid "Weight (g)"
msgstr ""
-#: forms.py:188 models_finds.py:692
+#: forms.py:188 models_finds.py:706
msgid "Dimensions comment"
msgstr ""
-#: forms.py:189 forms.py:657 models_finds.py:659
+#: forms.py:189 forms.py:660 models_finds.py:673
msgid "Find number"
msgstr ""
-#: forms.py:191 models_finds.py:686
+#: forms.py:191 models_finds.py:700
msgid "Minimum number of individuals (MNI)"
msgstr ""
-#: forms.py:192 models_finds.py:694
+#: forms.py:192 models_finds.py:708
msgid "Mark"
msgstr ""
-#: forms.py:193 forms.py:411 models_finds.py:700
+#: forms.py:193 forms.py:414 models_finds.py:714
msgid "Check"
msgstr ""
-#: forms.py:195 models_finds.py:702
+#: forms.py:195 models_finds.py:716
msgid "Check date"
msgstr ""
#: forms.py:196 forms_treatments.py:135 forms_treatments.py:486
-#: models_finds.py:189 models_finds.py:695 models_treatments.py:125
-#: models_treatments.py:532
+#: models_finds.py:202 models_finds.py:709 models_treatments.py:101
+#: models_treatments.py:508
msgid "Comment"
msgstr ""
-#: forms.py:199 models_finds.py:696
+#: forms.py:199 models_finds.py:710
msgid "Comment on dating"
msgstr ""
-#: forms.py:200 models_finds.py:704
+#: forms.py:200 models_finds.py:718
msgid "Estimated value"
msgstr ""
@@ -192,235 +192,240 @@ msgid "Coordinates are not relevant for the spatial reference system used: {}."
msgstr ""
#: forms.py:289 templates/ishtar/sheet_find.html:62
-#| msgid "Preservation type"
msgid "Preservation"
msgstr ""
-#: forms.py:298 forms.py:402 models_finds.py:63 models_finds.py:712
+#: forms.py:298 forms.py:405 models_finds.py:63 models_finds.py:726
msgid "Conservatory state"
msgstr ""
-#: forms.py:301 models_finds.py:720
-#| msgid "Operation"
+#: forms.py:301 models_finds.py:735
msgid "Alteration"
msgstr ""
-#: forms.py:304 models_finds.py:724
-#| msgid "Operation (code)"
+#: forms.py:304 models_finds.py:739
msgid "Alteration cause"
msgstr ""
-#: forms.py:307 forms.py:401 models_finds.py:74
-msgid "Preservation type"
+#: forms.py:307 models_finds.py:732
+#| msgid "Related treatment"
+msgid "Recommended treatments"
+msgstr ""
+
+#: forms.py:309 models_finds.py:743
+msgid "Treatment emergency"
msgstr ""
-#: forms.py:309 models_finds.py:731
-#| msgid "Insurance cost"
+#: forms.py:311 models_finds.py:746
msgid "Insurance value"
msgstr ""
-#: forms.py:311 models_finds.py:733
+#: forms.py:313 models_finds.py:748
msgid "Appraisal date"
msgstr ""
-#: forms.py:313 models_finds.py:714
+#: forms.py:315 models_finds.py:728
msgid "Conservatory comment"
msgstr ""
-#: forms.py:331 forms.py:362 models_finds.py:667
+#: forms.py:334 forms.py:365 models_finds.py:681
msgid "Dating"
msgstr ""
-#: forms.py:336 forms.py:397
+#: forms.py:339 forms.py:400
msgid "Period"
msgstr ""
-#: forms.py:337 forms_treatments.py:137 forms_treatments.py:290
-#: forms_treatments.py:488 models_finds.py:1354 models_treatments.py:128
-#: models_treatments.py:331 templates/ishtar/sheet_find.html:102
-#: templates/ishtar/sheet_find.html:144
+#: forms.py:340 forms_treatments.py:137 forms_treatments.py:290
+#: forms_treatments.py:488 models_finds.py:1369 models_treatments.py:104
+#: models_treatments.py:307 templates/ishtar/sheet_find.html:101
+#: templates/ishtar/sheet_find.html:143
msgid "Start date"
msgstr ""
-#: forms.py:339 models_finds.py:1355 models_treatments.py:332
-#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
+#: forms.py:342 models_finds.py:1370 models_treatments.py:308
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:144
msgid "End date"
msgstr ""
-#: forms.py:340
+#: forms.py:343
msgid "Quality"
msgstr ""
-#: forms.py:342
+#: forms.py:345
msgid "Dating type"
msgstr ""
-#: forms.py:344
+#: forms.py:347
msgid "Precise dating"
msgstr ""
-#: forms.py:366 models_finds.py:221
+#: forms.py:369 models_finds.py:234
msgid "Short ID"
msgstr ""
-#: forms.py:367 models_finds.py:224
+#: forms.py:370 models_finds.py:237
msgid "Complete ID"
msgstr ""
-#: forms.py:371 forms_treatments.py:53 forms_treatments.py:95
+#: forms.py:374 forms_treatments.py:53 forms_treatments.py:95
#: forms_treatments.py:336 forms_treatments.py:408 forms_treatments.py:458
-#: forms_treatments.py:590 models_treatments.py:102 models_treatments.py:505
+#: forms_treatments.py:590 models_treatments.py:78 models_treatments.py:481
msgid "Year"
msgstr ""
-#: forms.py:373
+#: forms.py:376
msgid "Operation's number (index by year)"
msgstr ""
-#: forms.py:376
+#: forms.py:379
msgid "Code PATRIARCHE"
msgstr ""
-#: forms.py:380
+#: forms.py:383
msgid "Archaeological site"
msgstr ""
-#: forms.py:392
+#: forms.py:395
msgid "Search within related operations"
msgstr ""
-#: forms.py:395
+#: forms.py:398
msgid "Search within related context records"
msgstr ""
-#: forms.py:399 models_finds.py:119
+#: forms.py:402 models_finds.py:132
msgid "Object type"
msgstr ""
-#: forms.py:412 forms_treatments.py:56
+#: forms.py:404
+msgid "Preservation type"
+msgstr ""
+
+#: forms.py:415 forms_treatments.py:56
msgid "Has an image?"
msgstr ""
-#: forms.py:466
+#: forms.py:469
msgid "Warehouse (location)"
msgstr ""
-#: forms.py:472
+#: forms.py:475
msgid "Warehouse (responsible)"
msgstr ""
-#: forms.py:477
+#: forms.py:480
msgid "Container ID"
msgstr ""
-#: forms.py:478
+#: forms.py:481
msgid "Container ref."
msgstr ""
-#: forms.py:482 forms.py:505 views.py:159
+#: forms.py:485 forms.py:508 views.py:159
msgid "Find search"
msgstr ""
-#: forms.py:530 models_treatments.py:232
+#: forms.py:533 models_treatments.py:208
#: templates/ishtar/sheet_treatment.html:45
msgid "Upstream finds"
msgstr ""
-#: forms.py:532 models_finds.py:742
+#: forms.py:535 models_finds.py:757
msgid "Finds"
msgstr ""
-#: forms.py:544
+#: forms.py:547
msgid "You should at least select one archaeological find."
msgstr ""
-#: forms.py:647
+#: forms.py:650
msgid "Resulting find"
msgstr ""
-#: forms.py:652
+#: forms.py:655
msgid "Precise description"
msgstr ""
-#: forms.py:667
+#: forms.py:670
msgid "Resulting finds"
msgstr ""
-#: forms.py:672
+#: forms.py:675
msgid "Would you like to delete this find?"
msgstr ""
-#: forms.py:676 models_treatments.py:91
+#: forms.py:679 models_treatments.py:67
msgid "Upstream find"
msgstr ""
-#: forms.py:689
+#: forms.py:692
msgid "Archaeological find search"
msgstr ""
-#: forms.py:691
+#: forms.py:694
msgid "You should select an archaeological find."
msgstr ""
-#: forms.py:696
+#: forms.py:699
msgid "Year of the operation"
msgstr ""
-#: forms.py:698
+#: forms.py:701
msgid "Numeric reference"
msgstr ""
-#: forms.py:705
+#: forms.py:708
msgid "Period of the archaeological find"
msgstr ""
-#: forms.py:707
+#: forms.py:710
msgid "Material type of the archaeological find"
msgstr ""
-#: forms.py:709
+#: forms.py:712
msgid "Description of the archaeological find"
msgstr ""
-#: forms.py:721 forms_treatments.py:691 forms_treatments.py:717
+#: forms.py:724 forms_treatments.py:691 forms_treatments.py:717
msgid "Documentation search"
msgstr ""
-#: forms.py:723 forms_treatments.py:693 forms_treatments.py:719
+#: forms.py:726 forms_treatments.py:693 forms_treatments.py:719
msgid "You should select a document."
msgstr ""
-#: forms.py:740
+#: forms.py:743
msgid "Another basket already exists with this name."
msgstr ""
-#: forms.py:750 forms.py:754 forms_treatments.py:174 ishtar_menu.py:57
+#: forms.py:753 forms.py:757 forms_treatments.py:174 ishtar_menu.py:57
msgid "Basket"
msgstr ""
-#: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:98
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:74
+#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
msgid "Label"
msgstr ""
-#: forms_treatments.py:52 forms_treatments.py:94 models_treatments.py:100
+#: forms_treatments.py:52 forms_treatments.py:94 models_treatments.py:76
msgid "Other ref."
msgstr ""
#: forms_treatments.py:54 forms_treatments.py:240 forms_treatments.py:337
#: forms_treatments.py:400 forms_treatments.py:409 forms_treatments.py:511
-#: forms_treatments.py:591 forms_treatments.py:658 models_treatments.py:103
-#: models_treatments.py:506
+#: forms_treatments.py:591 forms_treatments.py:658 models_treatments.py:79
+#: models_treatments.py:482
msgid "Index"
msgstr ""
#: forms_treatments.py:55 forms_treatments.py:100 forms_treatments.py:298
-#: forms_treatments.py:353 forms_treatments.py:679 models_treatments.py:56
-#: models_treatments.py:108 models_treatments.py:330
+#: forms_treatments.py:353 forms_treatments.py:679 models_finds.py:89
+#: models_treatments.py:84 models_treatments.py:306
msgid "Treatment type"
msgstr ""
-#: forms_treatments.py:67 forms_treatments.py:661 views.py:416
+#: forms_treatments.py:67 forms_treatments.py:661 views.py:415
msgid "Treatment search"
msgstr ""
@@ -428,8 +433,8 @@ msgstr ""
msgid "Base treatment"
msgstr ""
-#: forms_treatments.py:102 models_treatments.py:93 models_treatments.py:110
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
+#: forms_treatments.py:102 models_treatments.py:69 models_treatments.py:86
+#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
msgid "State"
msgstr ""
@@ -437,15 +442,15 @@ msgstr ""
msgid "Target"
msgstr ""
-#: forms_treatments.py:106 forms_treatments.py:469 models_treatments.py:118
+#: forms_treatments.py:106 forms_treatments.py:469 models_treatments.py:94
msgid "Responsible"
msgstr ""
-#: forms_treatments.py:112 models_treatments.py:121
+#: forms_treatments.py:112 models_treatments.py:97
msgid "Organization"
msgstr ""
-#: forms_treatments.py:118 models_treatments.py:113 models_treatments.py:333
+#: forms_treatments.py:118 models_treatments.py:89 models_treatments.py:309
msgid "Location"
msgstr ""
@@ -457,12 +462,12 @@ msgstr ""
msgid "External ref."
msgstr ""
-#: forms_treatments.py:131 models_treatments.py:127
+#: forms_treatments.py:131 models_treatments.py:103
msgid "Goal"
msgstr ""
#: forms_treatments.py:139 forms_treatments.py:290 forms_treatments.py:494
-#: forms_treatments.py:546 models_treatments.py:129 models_treatments.py:526
+#: forms_treatments.py:546 models_treatments.py:105 models_treatments.py:502
msgid "Closing date"
msgstr ""
@@ -508,12 +513,12 @@ msgstr ""
msgid "Another treatment with this index exists for {}."
msgstr ""
-#: forms_treatments.py:270 models_treatments.py:106
+#: forms_treatments.py:270 models_treatments.py:82
msgid "Associated request"
msgstr ""
#: forms_treatments.py:274 forms_treatments.py:449 ishtar_menu.py:108
-#: models_treatments.py:537 models_treatments.py:565 models_treatments.py:644
+#: models_treatments.py:513 models_treatments.py:541 models_treatments.py:620
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:188
msgid "Treatment request"
msgstr ""
@@ -593,7 +598,7 @@ msgstr ""
msgid "Modified by"
msgstr ""
-#: forms_treatments.py:406 forms_treatments.py:456 models_treatments.py:511
+#: forms_treatments.py:406 forms_treatments.py:456 models_treatments.py:487
msgid "Name"
msgstr ""
@@ -601,9 +606,9 @@ msgstr ""
msgid "Internal ref."
msgstr ""
-#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:92
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
-#: templates/ishtar/sheet_find.html:239
+#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:68
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:238
msgid "Type"
msgstr ""
@@ -611,21 +616,21 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms_treatments.py:418 forms_treatments.py:475 models_treatments.py:520
+#: forms_treatments.py:418 forms_treatments.py:475 models_treatments.py:496
#: templates/ishtar/sheet_treatmentfile.html:30
msgid "Applicant"
msgstr ""
-#: forms_treatments.py:424 forms_treatments.py:481 models_treatments.py:524
+#: forms_treatments.py:424 forms_treatments.py:481 models_treatments.py:500
#: templates/ishtar/sheet_treatmentfile.html:37
msgid "Applicant organisation"
msgstr ""
-#: forms_treatments.py:437 forms_treatments.py:666 views.py:520
+#: forms_treatments.py:437 forms_treatments.py:666 views.py:519
msgid "Treatment request search"
msgstr ""
-#: forms_treatments.py:492 forms_treatments.py:545 models_treatments.py:530
+#: forms_treatments.py:492 forms_treatments.py:545 models_treatments.py:506
msgid "Reception date"
msgstr ""
@@ -641,12 +646,12 @@ msgstr ""
msgid "Would you like to delete this treatment request?"
msgstr ""
-#: forms_treatments.py:544 models_treatments.py:528
+#: forms_treatments.py:544 models_treatments.py:504
msgid "Creation date"
msgstr ""
#: forms_treatments.py:554 forms_treatments.py:610 forms_treatments.py:706
-#: models_treatments.py:490 models_treatments.py:513
+#: models_treatments.py:466 models_treatments.py:489
msgid "Treatment request type"
msgstr ""
@@ -704,12 +709,12 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1351
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1366
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:233
-#: templates/ishtar/sheet_find.html:235
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:232
+#: templates/ishtar/sheet_find.html:234
msgid "Documents"
msgstr ""
@@ -717,8 +722,8 @@ msgstr ""
msgid "Source"
msgstr ""
-#: ishtar_menu.py:185 models_treatments.py:146 models_treatments.py:322
-#: models_treatments.py:611 models_treatments.py:614
+#: ishtar_menu.py:185 models_treatments.py:122 models_treatments.py:298
+#: models_treatments.py:587 models_treatments.py:590
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr ""
@@ -735,7 +740,7 @@ msgstr ""
msgid "Recommendation"
msgstr ""
-#: models_finds.py:53 models_finds.py:571 models_finds.py:652
+#: models_finds.py:53 models_finds.py:585 models_finds.py:666
msgid "Material types"
msgstr ""
@@ -743,373 +748,353 @@ msgstr ""
msgid "Conservatory states"
msgstr ""
-#: models_finds.py:75
-msgid "Preservation types"
+#: models_finds.py:73 models_finds.py:119 models_finds.py:662
+#: models_treatments.py:302
+msgid "Order"
+msgstr ""
+
+#: models_finds.py:74
+msgid "Parent type"
+msgstr ""
+
+#: models_finds.py:76
+msgid "Virtual"
+msgstr ""
+
+#: models_finds.py:78
+msgid "Upstream is many"
+msgstr ""
+
+#: models_finds.py:80
+msgid "Check this if for this treatment from many finds you'll get one."
+msgstr ""
+
+#: models_finds.py:83
+msgid "Downstream is many"
msgstr ""
#: models_finds.py:85
+msgid "Check this if for this treatment from one find you'll get many."
+msgstr ""
+
+#: models_finds.py:90 models_treatments.py:190
+msgid "Treatment types"
+msgstr ""
+
+#: models_finds.py:98
msgid "Integrity / interest type"
msgstr ""
-#: models_finds.py:86
+#: models_finds.py:99
msgid "Integrity / interest types"
msgstr ""
-#: models_finds.py:96
+#: models_finds.py:109
msgid "Remarkability type"
msgstr ""
-#: models_finds.py:97
+#: models_finds.py:110
msgid "Remarkability types"
msgstr ""
-#: models_finds.py:106 models_finds.py:648 models_treatments.py:40
-#: models_treatments.py:326
-msgid "Order"
-msgstr ""
-
-#: models_finds.py:108
+#: models_finds.py:121
msgid "Batch type"
msgstr ""
-#: models_finds.py:109
+#: models_finds.py:122
msgid "Batch types"
msgstr ""
-#: models_finds.py:130
-#| msgid "Preservation type"
+#: models_finds.py:143
msgid "Alteration type"
msgstr ""
-#: models_finds.py:131
-#| msgid "Preservation types"
+#: models_finds.py:144
msgid "Alteration types"
msgstr ""
-#: models_finds.py:141
-#| msgid "Preservation type"
+#: models_finds.py:154
msgid "Alteration cause type"
msgstr ""
-#: models_finds.py:142
-#| msgid "Preservation types"
+#: models_finds.py:155
msgid "Alteration cause types"
msgstr ""
-#: models_finds.py:152
-#| msgid "Treatment request type"
+#: models_finds.py:165
msgid "Treatment emergency type"
msgstr ""
-#: models_finds.py:153
-#| msgid "Treatment types"
+#: models_finds.py:166
msgid "Treatment emergency types"
msgstr ""
-#: models_finds.py:185 models_finds.py:645 models_treatments.py:123
-#: models_treatments.py:509
+#: models_finds.py:198 models_finds.py:659 models_treatments.py:99
+#: models_treatments.py:485
msgid "External ID"
msgstr ""
-#: models_finds.py:187 models_finds.py:647
+#: models_finds.py:200 models_finds.py:661
msgid "External ID is set automatically"
msgstr ""
-#: models_finds.py:190
+#: models_finds.py:203
msgid "Special interest"
msgstr ""
-#: models_finds.py:194
+#: models_finds.py:207
msgid "Context Record"
msgstr ""
-#: models_finds.py:200
+#: models_finds.py:213
msgid "Material index"
msgstr ""
-#: models_finds.py:217
-#| msgid "Point (2D)"
+#: models_finds.py:230
msgid "Point (3D)"
msgstr ""
-#: models_finds.py:222 models_finds.py:225
+#: models_finds.py:235 models_finds.py:238
msgid "Cached value - do not edit"
msgstr ""
-#: models_finds.py:231 models_finds.py:643
+#: models_finds.py:244 models_finds.py:657
msgid "Base find"
msgstr ""
-#: models_finds.py:232
+#: models_finds.py:245
msgid "Base finds"
msgstr ""
-#: models_finds.py:475
+#: models_finds.py:488
msgid "g"
msgstr ""
-#: models_finds.py:476
+#: models_finds.py:489
msgid "kg"
msgstr ""
-#: models_finds.py:478
+#: models_finds.py:491
msgid "Not checked"
msgstr ""
-#: models_finds.py:479
+#: models_finds.py:492
msgid "Checked but incorrect"
msgstr ""
-#: models_finds.py:480
+#: models_finds.py:493
msgid "Checked and correct"
msgstr ""
-#: models_finds.py:552 templates/ishtar/sheet_find.html:18
+#: models_finds.py:566 templates/ishtar/sheet_find.html:18
msgid "Base find - Short ID"
msgstr ""
-#: models_finds.py:553 templates/ishtar/sheet_find.html:17
+#: models_finds.py:567 templates/ishtar/sheet_find.html:17
msgid "Base find - Complete ID"
msgstr ""
-#: models_finds.py:555
+#: models_finds.py:569
msgid "Operation (code)"
msgstr ""
-#: models_finds.py:557
+#: models_finds.py:571
msgid "Town"
msgstr ""
-#: models_finds.py:559
+#: models_finds.py:573
msgid "Operation (name)"
msgstr ""
-#: models_finds.py:561
+#: models_finds.py:575
msgid "Parcel"
msgstr ""
-#: models_finds.py:562
+#: models_finds.py:576
msgid "Batch"
msgstr ""
-#: models_finds.py:563
+#: models_finds.py:577
msgid "Base find - Comment"
msgstr ""
-#: models_finds.py:564
+#: models_finds.py:578
msgid "Base find - Description"
msgstr ""
-#: models_finds.py:565
+#: models_finds.py:579
msgid "Base find - Topographic localisation"
msgstr ""
-#: models_finds.py:567
+#: models_finds.py:581
msgid "Base find - Special interest"
msgstr ""
-#: models_finds.py:568
+#: models_finds.py:582
msgid "Base find - Discovery date"
msgstr ""
-#: models_finds.py:569 models_finds.py:670 models_treatments.py:130
-#: models_treatments.py:334 templates/ishtar/sheet_find.html:101
-#: templates/ishtar/sheet_find.html:143
+#: models_finds.py:583 models_finds.py:684 models_treatments.py:106
+#: models_treatments.py:310 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:142
msgid "Container"
msgstr ""
-#: models_finds.py:570
+#: models_finds.py:584
msgid "Periods"
msgstr ""
-#: models_finds.py:657
+#: models_finds.py:671
msgid "Weight unit"
msgstr ""
-#: models_finds.py:663 templates/ishtar/sheet_find.html:89
+#: models_finds.py:677 templates/ishtar/sheet_find.html:88
msgid "Upstream treatment"
msgstr ""
-#: models_finds.py:666 templates/ishtar/sheet_find.html:131
+#: models_finds.py:680 templates/ishtar/sheet_find.html:130
msgid "Downstream treatment"
msgstr ""
-#: models_finds.py:707
+#: models_finds.py:721
msgid "Collection"
msgstr ""
-#: models_finds.py:717
-msgid "Type of preservation to consider"
-msgstr ""
-
-#: models_finds.py:728
-#| msgid "Treatment search"
-msgid "Treatment emergency"
-msgstr ""
-
-#: models_finds.py:736 models_treatments.py:142 models_treatments.py:533
+#: models_finds.py:751 models_treatments.py:118 models_treatments.py:509
msgid "Cached name"
msgstr ""
-#: models_finds.py:754
+#: models_finds.py:769
msgid "FIND"
msgstr ""
-#: models_finds.py:840 wizards.py:63 wizards.py:200
+#: models_finds.py:855 wizards.py:63 wizards.py:200
msgid "Operation"
msgstr ""
-#: models_finds.py:1127
+#: models_finds.py:1142
msgid "No container have been set - the localisation cannot be set."
msgstr ""
-#: models_finds.py:1133
+#: models_finds.py:1148
msgid "The division number {} have not been set for the warehouse {}."
msgstr ""
-#: models_finds.py:1314
+#: models_finds.py:1329
msgid "Find documentation"
msgstr ""
-#: models_finds.py:1315
+#: models_finds.py:1330
msgid "Find documentations"
msgstr ""
-#: models_finds.py:1352
+#: models_finds.py:1367
msgid "Person"
msgstr ""
-#: models_finds.py:1358
+#: models_finds.py:1373
msgid "Property"
msgstr ""
-#: models_finds.py:1359
+#: models_finds.py:1374
msgid "Properties"
msgstr ""
#: models_treatments.py:41
-msgid "Parent type"
-msgstr ""
-
-#: models_treatments.py:43
-msgid "Virtual"
-msgstr ""
-
-#: models_treatments.py:45
-msgid "Upstream is many"
-msgstr ""
-
-#: models_treatments.py:47
-msgid "Check this if for this treatment from many finds you'll get one."
-msgstr ""
-
-#: models_treatments.py:50
-msgid "Downstream is many"
-msgstr ""
-
-#: models_treatments.py:52
-msgid "Check this if for this treatment from one find you'll get many."
-msgstr ""
-
-#: models_treatments.py:57 models_treatments.py:214
-msgid "Treatment types"
-msgstr ""
-
-#: models_treatments.py:65
msgid "Treatment state type"
msgstr ""
-#: models_treatments.py:66
+#: models_treatments.py:42
msgid "Treatment state types"
msgstr ""
-#: models_treatments.py:90
+#: models_treatments.py:66
msgid "Downstream find"
msgstr ""
-#: models_treatments.py:115
+#: models_treatments.py:91
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-#: models_treatments.py:132
+#: models_treatments.py:108
msgid "Estimated cost"
msgstr ""
-#: models_treatments.py:134
+#: models_treatments.py:110
msgid "Quoted cost"
msgstr ""
-#: models_treatments.py:136
+#: models_treatments.py:112
msgid "Realized cost"
msgstr ""
-#: models_treatments.py:138
+#: models_treatments.py:114
msgid "Insurance cost"
msgstr ""
-#: models_treatments.py:140
+#: models_treatments.py:116
msgid "Target a basket"
msgstr ""
-#: models_treatments.py:147 templates/ishtar/sheet_find.html:86
+#: models_treatments.py:123 templates/ishtar/sheet_find.html:85
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Treatments"
msgstr ""
-#: models_treatments.py:166
+#: models_treatments.py:142
msgid "TREATMENT"
msgstr ""
-#: models_treatments.py:223 templates/ishtar/sheet_treatment.html:50
+#: models_treatments.py:199 templates/ishtar/sheet_treatment.html:50
msgid "Downstream finds"
msgstr ""
-#: models_treatments.py:335 templates/ishtar/sheet_find.html:100
-#: templates/ishtar/sheet_find.html:142
+#: models_treatments.py:311 templates/ishtar/sheet_find.html:99
+#: templates/ishtar/sheet_find.html:141
msgid "Doer"
msgstr ""
-#: models_treatments.py:336 models_treatments.py:337
+#: models_treatments.py:312 models_treatments.py:313
msgid "Related finds"
msgstr ""
-#: models_treatments.py:479
+#: models_treatments.py:455
msgid "Is upstream"
msgstr ""
-#: models_treatments.py:491
+#: models_treatments.py:467
msgid "Treatment request types"
msgstr ""
-#: models_treatments.py:507
+#: models_treatments.py:483
msgid "Internal reference"
msgstr ""
-#: models_treatments.py:516
+#: models_treatments.py:492
msgid "Person in charge"
msgstr ""
-#: models_treatments.py:538
+#: models_treatments.py:514
msgid "Treatment requests"
msgstr ""
-#: models_treatments.py:618
+#: models_treatments.py:594
msgid "Treatment documentation"
msgstr ""
-#: models_treatments.py:619
+#: models_treatments.py:595
msgid "Treament documentations"
msgstr ""
-#: models_treatments.py:648
+#: models_treatments.py:624
msgid "Treatment file"
msgstr ""
-#: models_treatments.py:652
+#: models_treatments.py:628
msgid "Treatment request documentation"
msgstr ""
-#: models_treatments.py:653
+#: models_treatments.py:629
msgid "Treatment request documentations"
msgstr ""
@@ -1127,51 +1112,51 @@ msgstr ""
msgid "Administrative index"
msgstr ""
-#: templates/ishtar/sheet_find.html:78
+#: templates/ishtar/sheet_find.html:76
msgid "Warehouse"
msgstr ""
-#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
+#: templates/ishtar/sheet_find.html:94 templates/ishtar/sheet_find.html:136
msgid "Year - index"
msgstr ""
-#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
+#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
msgid "Related finds (max. 15 displayed)"
msgstr ""
-#: templates/ishtar/sheet_find.html:127
+#: templates/ishtar/sheet_find.html:126
msgid "Export as CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:127 templates/ishtar/sheet_find.html:170
+#: templates/ishtar/sheet_find.html:126 templates/ishtar/sheet_find.html:169
msgid "CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:175
+#: templates/ishtar/sheet_find.html:174
msgid "Associated base finds"
msgstr ""
-#: templates/ishtar/sheet_find.html:182
+#: templates/ishtar/sheet_find.html:181
msgid "Internal ID"
msgstr ""
-#: templates/ishtar/sheet_find.html:214
+#: templates/ishtar/sheet_find.html:213
msgid "Coordinates"
msgstr ""
-#: templates/ishtar/sheet_find.html:221
+#: templates/ishtar/sheet_find.html:220
msgid "SRID"
msgstr ""
-#: templates/ishtar/sheet_find.html:238
+#: templates/ishtar/sheet_find.html:237
msgid "Title"
msgstr ""
-#: templates/ishtar/sheet_find.html:240
+#: templates/ishtar/sheet_find.html:239
msgid "Authors"
msgstr ""
-#: templates/ishtar/sheet_find.html:241
+#: templates/ishtar/sheet_find.html:240
msgid "Link"
msgstr ""
@@ -1265,94 +1250,94 @@ msgstr ""
msgid "Find: source deletion"
msgstr ""
-#: views.py:257
+#: views.py:256
msgid "New basket"
msgstr ""
-#: views.py:276
+#: views.py:275
msgid "Manage items in basket"
msgstr ""
-#: views.py:296
+#: views.py:295
msgid "Manage basket"
msgstr ""
-#: views.py:387
+#: views.py:386
msgid "Delete basket"
msgstr ""
-#: views.py:437
+#: views.py:436
msgid "New treatment"
msgstr ""
-#: views.py:445 views.py:537
+#: views.py:444 views.py:536
msgid "Modify"
msgstr ""
-#: views.py:462
+#: views.py:461
msgid "Treatment deletion"
msgstr ""
-#: views.py:469
+#: views.py:468
msgid "Treatment: search administrative act"
msgstr ""
-#: views.py:478
+#: views.py:477
msgid "Treatment: new administrative act"
msgstr ""
-#: views.py:488
+#: views.py:487
msgid "Treatment: administrative act modification"
msgstr ""
-#: views.py:497
+#: views.py:496
msgid "Treatment: administrative act deletion"
msgstr ""
-#: views.py:530
+#: views.py:529
msgid "New treatment request"
msgstr ""
-#: views.py:553
+#: views.py:552
msgid "Treatment request deletion"
msgstr ""
-#: views.py:560
+#: views.py:559
msgid "Treatment request: search administrative act"
msgstr ""
-#: views.py:570
+#: views.py:569
msgid "Treatment request: new administrative act"
msgstr ""
-#: views.py:580
+#: views.py:579
msgid "Treatment request: administrative act modification"
msgstr ""
-#: views.py:589
+#: views.py:588
msgid "Treatment request: administrative act deletion"
msgstr ""
-#: views.py:615
+#: views.py:614
msgid "Treatment: source search"
msgstr ""
-#: views.py:630
+#: views.py:629
msgid "Treatment: source modification"
msgstr ""
-#: views.py:645
+#: views.py:644
msgid "Treatment: source deletion"
msgstr ""
-#: views.py:658
+#: views.py:657
msgid "Treatment request: source search"
msgstr ""
-#: views.py:674
+#: views.py:673
msgid "Treatment request: source modification"
msgstr ""
-#: views.py:692
+#: views.py:691
msgid "Treatment request: source deletion"
msgstr ""
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index b0b0c5e82..89c88e4a4 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -13,7 +13,7 @@ msgstr ""
msgid "Warehouse"
msgstr ""
-#: forms.py:47 forms.py:52 models.py:434
+#: forms.py:47 forms.py:52 models.py:435
msgid "Division"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "Person in charge"
msgstr ""
-#: forms.py:116 forms.py:186 models.py:53 models.py:283
+#: forms.py:116 forms.py:186 models.py:53 models.py:284
msgid "Comment"
msgstr ""
@@ -81,7 +81,7 @@ msgstr ""
msgid "Would you like to delete this warehouse?"
msgstr ""
-#: forms.py:160 models.py:294 models.py:431
+#: forms.py:160 models.py:295 models.py:432
#: templates/ishtar/sheet_container.html:4
msgid "Container"
msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
msgid "Ref."
msgstr ""
-#: forms.py:166 forms.py:242 models.py:246 models.py:281
+#: forms.py:166 forms.py:242 models.py:246 models.py:282
msgid "Container type"
msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
msgid "Current location (warehouse)"
msgstr ""
-#: forms.py:174 models.py:278
+#: forms.py:174 models.py:279
msgid "Responsible warehouse"
msgstr ""
@@ -149,7 +149,7 @@ msgstr ""
msgid "Packaged finds"
msgstr ""
-#: forms.py:286 models.py:284
+#: forms.py:286 models.py:285
msgid "Localisation"
msgstr ""
@@ -177,7 +177,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:57 models.py:295 templates/ishtar/sheet_warehouse.html:21
+#: ishtar_menu.py:57 models.py:296 templates/ishtar/sheet_warehouse.html:21
#: templates/ishtar/sheet_warehouse.html:54
msgid "Containers"
msgstr ""
@@ -186,11 +186,11 @@ msgstr ""
msgid "Warehouse types"
msgstr ""
-#: models.py:58 models.py:289
+#: models.py:58 models.py:290
msgid "External ID"
msgstr ""
-#: models.py:60 models.py:291
+#: models.py:60 models.py:292
msgid "External ID is set automatically"
msgstr ""
@@ -234,39 +234,39 @@ msgstr ""
msgid "Container types"
msgstr ""
-#: models.py:267
+#: models.py:268
msgid "Location - index"
msgstr ""
-#: models.py:268
+#: models.py:269
msgid "Precise localisation"
msgstr ""
-#: models.py:269
+#: models.py:270
msgid "Type"
msgstr ""
-#: models.py:275
+#: models.py:276
msgid "Location (warehouse)"
msgstr ""
-#: models.py:282
+#: models.py:283
msgid "Container ref."
msgstr ""
-#: models.py:286
+#: models.py:287
msgid "Cached location"
msgstr ""
-#: models.py:435
+#: models.py:436
msgid "Reference"
msgstr ""
-#: models.py:438
+#: models.py:439
msgid "Container localisation"
msgstr ""
-#: models.py:439
+#: models.py:440
msgid "Container localisations"
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 6b50ca537..7fdef0720 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -35,12 +35,10 @@ msgid "Ishtar administration"
msgstr ""
#: apps.py:17
-#| msgid "Context record"
msgid "Ishtar - Context record"
msgstr ""
#: apps.py:22
-#| msgid "Ishtar site profile"
msgid "Ishtar - File"
msgstr ""
@@ -49,17 +47,14 @@ msgid "Ishtar - Find"
msgstr ""
#: apps.py:32
-#| msgid "Ishtar administration"
msgid "Ishtar - Operation"
msgstr ""
#: apps.py:37
-#| msgid "Ishtar user"
msgid "Ishtar - Warehouse"
msgstr ""
#: apps.py:42
-#| msgid "Importer - Column"
msgid "Ishtar - Common"
msgstr ""
@@ -250,7 +245,6 @@ msgid "Target"
msgstr ""
#: forms_common.py:157
-#| msgid "Not member?"
msgid "Remember"
msgstr ""
@@ -263,7 +257,6 @@ msgid "this import only"
msgstr ""
#: forms_common.py:183
-#| msgid "Name"
msgid "me"
msgstr ""
@@ -272,7 +265,6 @@ msgid "the current group: {}"
msgstr ""
#: forms_common.py:192
-#| msgid "Ishtar users"
msgid "all users"
msgstr ""
@@ -706,7 +698,6 @@ msgid "Tiny label"
msgstr ""
#: models.py:1109
-#| msgid "Person deletion"
msgid "Inverse relation"
msgstr ""
@@ -789,7 +780,6 @@ msgid "CSS code for warehouse module"
msgstr ""
#: models.py:1274
-#| msgid "Preservation type"
msgid "Preservation module"
msgstr ""
@@ -1379,12 +1369,10 @@ msgid "All user can modify it"
msgstr ""
#: models_imports.py:512
-#| msgid "Importer - Target key"
msgid "Importer - Target key group"
msgstr ""
#: models_imports.py:513
-#| msgid "Importer - Targets keys"
msgid "Importer - Target key groups"
msgstr ""
@@ -1437,7 +1425,8 @@ msgid "Container type"
msgstr ""
#: models_imports.py:615
-msgid "Preservation type"
+#| msgid "Treatment"
+msgid "Treatment type"
msgstr ""
#: models_imports.py:616
@@ -2023,7 +2012,6 @@ msgid "Back to import list"
msgstr ""
#: templates/ishtar/formset_import_match.html:23
-#| msgid "Forum"
msgid "For"
msgstr ""
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index e8db22f9c..b8e0754e1 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -1427,7 +1427,7 @@ msgid "Container type"
msgstr ""
#: models_imports.py:615
-msgid "Preservation type"
+msgid "Treatment type"
msgstr ""
#: models_imports.py:616
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index c049067f9..68753f13c 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -11,173 +11,173 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-10-04 11:03-0400\n"
+"PO-Revision-Date: 2017-10-11 09:56-0400\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.9.6\n"
-#: admin.py:39 models_finds.py:216
+#: admin.py:39 models_finds.py:229
msgid "Point (2D)"
msgstr "Point (2D)"
-#: admin.py:41 models_finds.py:218
+#: admin.py:41 models_finds.py:231
msgid "Line"
msgstr "Ligne"
-#: admin.py:43 models_finds.py:219
+#: admin.py:43 models_finds.py:232
msgid "Polygon"
msgstr "Polygon"
-#: forms.py:96 forms.py:100 forms.py:386 models_finds.py:551
-#: models_finds.py:831 wizards.py:64
+#: forms.py:96 forms.py:100 forms.py:389 models_finds.py:565
+#: models_finds.py:846 wizards.py:64
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:129 ishtar_menu.py:32 models_finds.py:741 models_finds.py:1328
-#: models_finds.py:1349 models_treatments.py:320
+#: forms.py:129 ishtar_menu.py:32 models_finds.py:756 models_finds.py:1343
+#: models_finds.py:1364 models_treatments.py:296
#: templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr "Mobilier"
-#: forms.py:140 forms.py:368 forms.py:650 models_finds.py:184
-#: models_finds.py:649 templates/ishtar/sheet_find.html:16
+#: forms.py:140 forms.py:371 forms.py:653 models_finds.py:197
+#: models_finds.py:663 templates/ishtar/sheet_find.html:16
msgid "Free ID"
msgstr "ID libre"
-#: forms.py:142 models_finds.py:698
+#: forms.py:142 models_finds.py:712
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:143 forms.py:408 forms_treatments.py:133 models_finds.py:188
-#: models_finds.py:650 models_treatments.py:126
+#: forms.py:143 forms.py:411 forms_treatments.py:133 models_finds.py:201
+#: models_finds.py:664 models_treatments.py:102
msgid "Description"
msgstr "Description"
-#: forms.py:146 models_finds.py:195
+#: forms.py:146 models_finds.py:208
msgid "Discovery date"
msgstr "Date de découverte"
-#: forms.py:148 forms.py:410 models_finds.py:197
+#: forms.py:148 forms.py:413 models_finds.py:210
msgid "Batch/object"
msgstr "Lot/objet"
-#: forms.py:150 models_finds.py:673
+#: forms.py:150 models_finds.py:687
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:153 forms.py:398 forms.py:654 models_finds.py:52
+#: forms.py:153 forms.py:401 forms.py:657 models_finds.py:52
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:156 models_finds.py:120 models_finds.py:572 models_finds.py:676
+#: forms.py:156 models_finds.py:133 models_finds.py:586 models_finds.py:690
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:159 forms.py:404 models_finds.py:680
+#: forms.py:159 forms.py:407 models_finds.py:694
msgid "Integrity / interest"
msgstr "Intégrité / intérêt"
-#: forms.py:162 forms.py:406 models_finds.py:683
+#: forms.py:162 forms.py:409 models_finds.py:697
msgid "Remarkability"
msgstr "Remarquabilité"
-#: forms.py:165 models_finds.py:202
+#: forms.py:165 models_finds.py:215
msgid "Point of topographic reference"
msgstr "Point de référence topographique"
-#: forms.py:168 models_finds.py:204 templates/ishtar/sheet_find.html:216
+#: forms.py:168 models_finds.py:217 templates/ishtar/sheet_find.html:215
msgid "X"
msgstr "X"
-#: forms.py:169 models_finds.py:205 templates/ishtar/sheet_find.html:217
+#: forms.py:169 models_finds.py:218 templates/ishtar/sheet_find.html:216
msgid "Y"
msgstr "Y"
-#: forms.py:170 models_finds.py:206 templates/ishtar/sheet_find.html:218
+#: forms.py:170 models_finds.py:219 templates/ishtar/sheet_find.html:217
msgid "Z"
msgstr "Z"
-#: forms.py:172 models_finds.py:214
+#: forms.py:172 models_finds.py:227
msgid "Spatial Reference System"
msgstr "Système de référence spatiale"
-#: forms.py:175 models_finds.py:207
+#: forms.py:175 models_finds.py:220
msgid "Estimated error for X"
msgstr "Erreur estimée pour X"
-#: forms.py:177 models_finds.py:209
+#: forms.py:177 models_finds.py:222
msgid "Estimated error for Y"
msgstr "Erreur estimée pour Y"
-#: forms.py:179 models_finds.py:211
+#: forms.py:179 models_finds.py:224
msgid "Estimated error for Z"
msgstr "Erreur estimée pour Z"
-#: forms.py:180 models_finds.py:687
+#: forms.py:180 models_finds.py:701
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:181 models_finds.py:688
+#: forms.py:181 models_finds.py:702
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:182 models_finds.py:689
+#: forms.py:182 models_finds.py:703
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: forms.py:183 models_finds.py:690
+#: forms.py:183 models_finds.py:704
msgid "Diameter (cm)"
msgstr "Diamètre (cm)"
-#: forms.py:184 models_finds.py:691
+#: forms.py:184 models_finds.py:705
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: forms.py:185 forms.py:655 models_finds.py:655
+#: forms.py:185 forms.py:658 models_finds.py:669
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:186 forms.py:656 models_finds.py:656
+#: forms.py:186 forms.py:659 models_finds.py:670
msgid "Weight (g)"
msgstr "Poids (g)"
-#: forms.py:188 models_finds.py:692
+#: forms.py:188 models_finds.py:706
msgid "Dimensions comment"
msgstr "Commentaire concernant les dimensions"
-#: forms.py:189 forms.py:657 models_finds.py:659
+#: forms.py:189 forms.py:660 models_finds.py:673
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:191 models_finds.py:686
+#: forms.py:191 models_finds.py:700
msgid "Minimum number of individuals (MNI)"
msgstr "Nombre minimum d'individus (NMI)"
-#: forms.py:192 models_finds.py:694
+#: forms.py:192 models_finds.py:708
msgid "Mark"
msgstr "Marque"
-#: forms.py:193 forms.py:411 models_finds.py:700
+#: forms.py:193 forms.py:414 models_finds.py:714
msgid "Check"
msgstr "Vérification"
-#: forms.py:195 models_finds.py:702
+#: forms.py:195 models_finds.py:716
msgid "Check date"
msgstr "Date de vérification"
#: forms.py:196 forms_treatments.py:135 forms_treatments.py:486
-#: models_finds.py:189 models_finds.py:695 models_treatments.py:125
-#: models_treatments.py:532
+#: models_finds.py:202 models_finds.py:709 models_treatments.py:101
+#: models_treatments.py:508
msgid "Comment"
msgstr "Commentaires"
-#: forms.py:199 models_finds.py:696
+#: forms.py:199 models_finds.py:710
msgid "Comment on dating"
msgstr "Commentaire général sur les datations"
-#: forms.py:200 models_finds.py:704
+#: forms.py:200 models_finds.py:718
msgid "Estimated value"
msgstr "Valeur estimée"
@@ -212,228 +212,236 @@ msgstr ""
msgid "Preservation"
msgstr "Conservation"
-#: forms.py:298 forms.py:402 models_finds.py:63 models_finds.py:712
+#: forms.py:298 forms.py:405 models_finds.py:63 models_finds.py:726
msgid "Conservatory state"
msgstr "État sanitaire"
-#: forms.py:301 models_finds.py:720
+#: forms.py:301 models_finds.py:735
msgid "Alteration"
msgstr "Altération"
-#: forms.py:304 models_finds.py:724
+#: forms.py:304 models_finds.py:739
msgid "Alteration cause"
msgstr "Cause d'altération"
-#: forms.py:307 forms.py:401 models_finds.py:74
-msgid "Preservation type"
-msgstr "Type de conservation"
+#: forms.py:307 models_finds.py:732
+msgid "Recommended treatments"
+msgstr "Traitements recommandés"
+
+#: forms.py:309 models_finds.py:743
+msgid "Treatment emergency"
+msgstr "Urgence du traitement"
-#: forms.py:309 models_finds.py:731
+#: forms.py:311 models_finds.py:746
msgid "Insurance value"
msgstr "Valeur d'assurance"
-#: forms.py:311 models_finds.py:733
+#: forms.py:313 models_finds.py:748
msgid "Appraisal date"
msgstr "Date d'évaluation"
-#: forms.py:313 models_finds.py:714
+#: forms.py:315 models_finds.py:728
msgid "Conservatory comment"
msgstr "Commentaire relatif à la conservation"
-#: forms.py:331 forms.py:362 models_finds.py:667
+#: forms.py:334 forms.py:365 models_finds.py:681
msgid "Dating"
msgstr "Datation"
-#: forms.py:336 forms.py:397
+#: forms.py:339 forms.py:400
msgid "Period"
msgstr "Période"
-#: forms.py:337 forms_treatments.py:137 forms_treatments.py:290
-#: forms_treatments.py:488 models_finds.py:1354 models_treatments.py:128
-#: models_treatments.py:331 templates/ishtar/sheet_find.html:102
-#: templates/ishtar/sheet_find.html:144
+#: forms.py:340 forms_treatments.py:137 forms_treatments.py:290
+#: forms_treatments.py:488 models_finds.py:1369 models_treatments.py:104
+#: models_treatments.py:307 templates/ishtar/sheet_find.html:101
+#: templates/ishtar/sheet_find.html:143
msgid "Start date"
msgstr "Date de début"
-#: forms.py:339 models_finds.py:1355 models_treatments.py:332
-#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
+#: forms.py:342 models_finds.py:1370 models_treatments.py:308
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:144
msgid "End date"
msgstr "Date de fin"
-#: forms.py:340
+#: forms.py:343
msgid "Quality"
msgstr "Qualité"
-#: forms.py:342
+#: forms.py:345
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:344
+#: forms.py:347
msgid "Precise dating"
msgstr "Datation précise"
-#: forms.py:366 models_finds.py:221
+#: forms.py:369 models_finds.py:234
msgid "Short ID"
msgstr "ID court"
-#: forms.py:367 models_finds.py:224
+#: forms.py:370 models_finds.py:237
msgid "Complete ID"
msgstr "ID complet"
-#: forms.py:371 forms_treatments.py:53 forms_treatments.py:95
+#: forms.py:374 forms_treatments.py:53 forms_treatments.py:95
#: forms_treatments.py:336 forms_treatments.py:408 forms_treatments.py:458
-#: forms_treatments.py:590 models_treatments.py:102 models_treatments.py:505
+#: forms_treatments.py:590 models_treatments.py:78 models_treatments.py:481
msgid "Year"
msgstr "Année"
-#: forms.py:373
+#: forms.py:376
msgid "Operation's number (index by year)"
msgstr "Numéro de l'opération (index par année)"
-#: forms.py:376
+#: forms.py:379
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:380
+#: forms.py:383
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:392
+#: forms.py:395
msgid "Search within related operations"
msgstr "Rechercher parmi les opérations liées"
-#: forms.py:395
+#: forms.py:398
msgid "Search within related context records"
msgstr "Recherche parmi les Unités d'Enregistrement associées"
-#: forms.py:399 models_finds.py:119
+#: forms.py:402 models_finds.py:132
msgid "Object type"
msgstr "Type d'objet"
-#: forms.py:412 forms_treatments.py:56
+#: forms.py:404
+msgid "Preservation type"
+msgstr "Type de conservation"
+
+#: forms.py:415 forms_treatments.py:56
msgid "Has an image?"
msgstr "Dispose d'une image ?"
-#: forms.py:466
+#: forms.py:469
msgid "Warehouse (location)"
msgstr "Dépôt (lieu)"
-#: forms.py:472
+#: forms.py:475
msgid "Warehouse (responsible)"
msgstr "Dépôt (responsable)"
-#: forms.py:477
+#: forms.py:480
msgid "Container ID"
msgstr "Identifiant du contenant"
-#: forms.py:478
+#: forms.py:481
msgid "Container ref."
msgstr "Réf. contenant"
-#: forms.py:482 forms.py:505 views.py:159
+#: forms.py:485 forms.py:508 views.py:159
msgid "Find search"
msgstr "Rechercher un mobilier"
-#: forms.py:530 models_treatments.py:232
+#: forms.py:533 models_treatments.py:208
#: templates/ishtar/sheet_treatment.html:45
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:532 models_finds.py:742
+#: forms.py:535 models_finds.py:757
msgid "Finds"
msgstr "Mobilier"
-#: forms.py:544
+#: forms.py:547
msgid "You should at least select one archaeological find."
msgstr "Vous devez sélectionner au moins un mobilier archéologique."
-#: forms.py:647
+#: forms.py:650
msgid "Resulting find"
msgstr "Mobilier résultant"
-#: forms.py:652
+#: forms.py:655
msgid "Precise description"
msgstr "Description précise"
-#: forms.py:667
+#: forms.py:670
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:672
+#: forms.py:675
msgid "Would you like to delete this find?"
msgstr "Voulez-vous supprimer ce mobilier ?"
-#: forms.py:676 models_treatments.py:91
+#: forms.py:679 models_treatments.py:67
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:689
+#: forms.py:692
msgid "Archaeological find search"
msgstr "Rechercher un mobilier"
-#: forms.py:691
+#: forms.py:694
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:696
+#: forms.py:699
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:698
+#: forms.py:701
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:705
+#: forms.py:708
msgid "Period of the archaeological find"
msgstr "Période du mobilier"
-#: forms.py:707
+#: forms.py:710
msgid "Material type of the archaeological find"
msgstr "Type de matériau du mobilier"
-#: forms.py:709
+#: forms.py:712
msgid "Description of the archaeological find"
msgstr "Description du mobilier"
-#: forms.py:721 forms_treatments.py:691 forms_treatments.py:717
+#: forms.py:724 forms_treatments.py:691 forms_treatments.py:717
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:723 forms_treatments.py:693 forms_treatments.py:719
+#: forms.py:726 forms_treatments.py:693 forms_treatments.py:719
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:740
+#: forms.py:743
msgid "Another basket already exists with this name."
msgstr "Un autre panier existant utilise déjà ce nom."
-#: forms.py:750 forms.py:754 forms_treatments.py:174 ishtar_menu.py:57
+#: forms.py:753 forms.py:757 forms_treatments.py:174 ishtar_menu.py:57
msgid "Basket"
msgstr "Panier"
-#: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:98
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:74
+#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
msgid "Label"
msgstr "Intitulé"
-#: forms_treatments.py:52 forms_treatments.py:94 models_treatments.py:100
+#: forms_treatments.py:52 forms_treatments.py:94 models_treatments.py:76
msgid "Other ref."
msgstr "Autre réf."
#: forms_treatments.py:54 forms_treatments.py:240 forms_treatments.py:337
#: forms_treatments.py:400 forms_treatments.py:409 forms_treatments.py:511
-#: forms_treatments.py:591 forms_treatments.py:658 models_treatments.py:103
-#: models_treatments.py:506
+#: forms_treatments.py:591 forms_treatments.py:658 models_treatments.py:79
+#: models_treatments.py:482
msgid "Index"
msgstr "Index"
#: forms_treatments.py:55 forms_treatments.py:100 forms_treatments.py:298
-#: forms_treatments.py:353 forms_treatments.py:679 models_treatments.py:56
-#: models_treatments.py:108 models_treatments.py:330
+#: forms_treatments.py:353 forms_treatments.py:679 models_finds.py:89
+#: models_treatments.py:84 models_treatments.py:306
msgid "Treatment type"
msgstr "Type de traitement"
-#: forms_treatments.py:67 forms_treatments.py:661 views.py:416
+#: forms_treatments.py:67 forms_treatments.py:661 views.py:415
msgid "Treatment search"
msgstr "Rechercher un traitement"
@@ -441,8 +449,8 @@ msgstr "Rechercher un traitement"
msgid "Base treatment"
msgstr "Traitement de base"
-#: forms_treatments.py:102 models_treatments.py:93 models_treatments.py:110
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
+#: forms_treatments.py:102 models_treatments.py:69 models_treatments.py:86
+#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
msgid "State"
msgstr "État"
@@ -450,15 +458,15 @@ msgstr "État"
msgid "Target"
msgstr "Destination"
-#: forms_treatments.py:106 forms_treatments.py:469 models_treatments.py:118
+#: forms_treatments.py:106 forms_treatments.py:469 models_treatments.py:94
msgid "Responsible"
msgstr "Responsable"
-#: forms_treatments.py:112 models_treatments.py:121
+#: forms_treatments.py:112 models_treatments.py:97
msgid "Organization"
msgstr "Organisation"
-#: forms_treatments.py:118 models_treatments.py:113 models_treatments.py:333
+#: forms_treatments.py:118 models_treatments.py:89 models_treatments.py:309
msgid "Location"
msgstr "Lieu"
@@ -470,12 +478,12 @@ msgstr "Contenant (pertinent dans le cadre du conditionnement)"
msgid "External ref."
msgstr "Réf. externe"
-#: forms_treatments.py:131 models_treatments.py:127
+#: forms_treatments.py:131 models_treatments.py:103
msgid "Goal"
msgstr "But"
#: forms_treatments.py:139 forms_treatments.py:290 forms_treatments.py:494
-#: forms_treatments.py:546 models_treatments.py:129 models_treatments.py:526
+#: forms_treatments.py:546 models_treatments.py:105 models_treatments.py:502
msgid "Closing date"
msgstr "Date de clôture"
@@ -524,12 +532,12 @@ msgstr "Un responsable ou une organisation doit être défini."
msgid "Another treatment with this index exists for {}."
msgstr "Un autre traitement avec cet index existe pour {}."
-#: forms_treatments.py:270 models_treatments.py:106
+#: forms_treatments.py:270 models_treatments.py:82
msgid "Associated request"
msgstr "Demande associée"
#: forms_treatments.py:274 forms_treatments.py:449 ishtar_menu.py:108
-#: models_treatments.py:537 models_treatments.py:565 models_treatments.py:644
+#: models_treatments.py:513 models_treatments.py:541 models_treatments.py:620
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:188
msgid "Treatment request"
msgstr "Demande de traitement"
@@ -612,7 +620,7 @@ msgstr "Référence interne du traitement"
msgid "Modified by"
msgstr "Modifié par"
-#: forms_treatments.py:406 forms_treatments.py:456 models_treatments.py:511
+#: forms_treatments.py:406 forms_treatments.py:456 models_treatments.py:487
msgid "Name"
msgstr "Nom"
@@ -620,9 +628,9 @@ msgstr "Nom"
msgid "Internal ref."
msgstr "Réf. interne"
-#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:92
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
-#: templates/ishtar/sheet_find.html:239
+#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:68
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:238
msgid "Type"
msgstr "Type"
@@ -630,21 +638,21 @@ msgstr "Type"
msgid "In charge"
msgstr "Responsable"
-#: forms_treatments.py:418 forms_treatments.py:475 models_treatments.py:520
+#: forms_treatments.py:418 forms_treatments.py:475 models_treatments.py:496
#: templates/ishtar/sheet_treatmentfile.html:30
msgid "Applicant"
msgstr "Demandeur"
-#: forms_treatments.py:424 forms_treatments.py:481 models_treatments.py:524
+#: forms_treatments.py:424 forms_treatments.py:481 models_treatments.py:500
#: templates/ishtar/sheet_treatmentfile.html:37
msgid "Applicant organisation"
msgstr "Organisation du demandeur"
-#: forms_treatments.py:437 forms_treatments.py:666 views.py:520
+#: forms_treatments.py:437 forms_treatments.py:666 views.py:519
msgid "Treatment request search"
msgstr "Rechercher une demande de traitement"
-#: forms_treatments.py:492 forms_treatments.py:545 models_treatments.py:530
+#: forms_treatments.py:492 forms_treatments.py:545 models_treatments.py:506
msgid "Reception date"
msgstr "Date de réception"
@@ -660,12 +668,12 @@ msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ? "
msgid "Would you like to delete this treatment request?"
msgstr "Voulez-vous supprimer cette demande de traitement ?"
-#: forms_treatments.py:544 models_treatments.py:528
+#: forms_treatments.py:544 models_treatments.py:504
msgid "Creation date"
msgstr "Date de création"
#: forms_treatments.py:554 forms_treatments.py:610 forms_treatments.py:706
-#: models_treatments.py:490 models_treatments.py:513
+#: models_treatments.py:466 models_treatments.py:489
msgid "Treatment request type"
msgstr "Type de demande de traitement"
@@ -723,12 +731,12 @@ msgstr "Gestion des éléments"
msgid "Documentation"
msgstr "Documentation"
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1351
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1366
msgid "Administrative act"
msgstr "Acte administratif"
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:233
-#: templates/ishtar/sheet_find.html:235
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:232
+#: templates/ishtar/sheet_find.html:234
msgid "Documents"
msgstr "Documents"
@@ -736,8 +744,8 @@ msgstr "Documents"
msgid "Source"
msgstr "Documentation"
-#: ishtar_menu.py:185 models_treatments.py:146 models_treatments.py:322
-#: models_treatments.py:611 models_treatments.py:614
+#: ishtar_menu.py:185 models_treatments.py:122 models_treatments.py:298
+#: models_treatments.py:587 models_treatments.py:590
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr "Traitement"
@@ -754,7 +762,7 @@ msgstr "Code"
msgid "Recommendation"
msgstr "Recommandation"
-#: models_finds.py:53 models_finds.py:571 models_finds.py:652
+#: models_finds.py:53 models_finds.py:585 models_finds.py:666
msgid "Material types"
msgstr "Types de matériau"
@@ -762,372 +770,360 @@ msgstr "Types de matériau"
msgid "Conservatory states"
msgstr "États sanitaires"
-#: models_finds.py:75
-msgid "Preservation types"
-msgstr "Types de conservation"
+#: models_finds.py:73 models_finds.py:119 models_finds.py:662
+#: models_treatments.py:302
+msgid "Order"
+msgstr "Ordre"
+
+#: models_finds.py:74
+msgid "Parent type"
+msgstr "Type parent"
+
+#: models_finds.py:76
+msgid "Virtual"
+msgstr "Virtuel"
+
+#: models_finds.py:78
+msgid "Upstream is many"
+msgstr "Les éléments amont sont multiples"
+
+#: models_finds.py:80
+msgid "Check this if for this treatment from many finds you'll get one."
+msgstr ""
+"Cochez cela si, pour ce traitement, à partir de plusieurs éléments vous en "
+"obtenez un seul."
+
+#: models_finds.py:83
+msgid "Downstream is many"
+msgstr "Les éléments aval sont multiples"
#: models_finds.py:85
+msgid "Check this if for this treatment from one find you'll get many."
+msgstr ""
+"Cochez cela si, pour ce traitement, à partir d'un seul élément vous en "
+"obtenez plusieurs."
+
+#: models_finds.py:90 models_treatments.py:190
+msgid "Treatment types"
+msgstr "Types de traitement"
+
+#: models_finds.py:98
msgid "Integrity / interest type"
msgstr "Type d'intégrité / intérêt"
-#: models_finds.py:86
+#: models_finds.py:99
msgid "Integrity / interest types"
msgstr "Types d'intégrité / intérêt"
-#: models_finds.py:96
+#: models_finds.py:109
msgid "Remarkability type"
msgstr "Type de remarquabilité"
-#: models_finds.py:97
+#: models_finds.py:110
msgid "Remarkability types"
msgstr "Types de remarquabilité"
-#: models_finds.py:106 models_finds.py:648 models_treatments.py:40
-#: models_treatments.py:326
-msgid "Order"
-msgstr "Ordre"
-
-#: models_finds.py:108
+#: models_finds.py:121
msgid "Batch type"
msgstr "Type de lot"
-#: models_finds.py:109
+#: models_finds.py:122
msgid "Batch types"
msgstr "Types de lot"
-#: models_finds.py:130
+#: models_finds.py:143
msgid "Alteration type"
msgstr "Type d'altération"
-#: models_finds.py:131
+#: models_finds.py:144
msgid "Alteration types"
msgstr "Types d'altération"
-#: models_finds.py:141
+#: models_finds.py:154
msgid "Alteration cause type"
msgstr "Type de cause d'altération"
-#: models_finds.py:142
+#: models_finds.py:155
msgid "Alteration cause types"
msgstr "Types de cause d'altération"
-#: models_finds.py:152
+#: models_finds.py:165
msgid "Treatment emergency type"
-msgstr "Type de traitement d'urgence"
+msgstr "Type d'urgence du traitement"
-#: models_finds.py:153
+#: models_finds.py:166
msgid "Treatment emergency types"
-msgstr "Types de traitement d'urgence"
+msgstr "Types d'urgence du traitement"
-#: models_finds.py:185 models_finds.py:645 models_treatments.py:123
-#: models_treatments.py:509
+#: models_finds.py:198 models_finds.py:659 models_treatments.py:99
+#: models_treatments.py:485
msgid "External ID"
msgstr "ID externe"
-#: models_finds.py:187 models_finds.py:647
+#: models_finds.py:200 models_finds.py:661
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models_finds.py:190
+#: models_finds.py:203
msgid "Special interest"
msgstr "Intérêt spécifique"
-#: models_finds.py:194
+#: models_finds.py:207
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models_finds.py:200
+#: models_finds.py:213
msgid "Material index"
msgstr "Index matériel"
-#: models_finds.py:217
+#: models_finds.py:230
msgid "Point (3D)"
msgstr "Point (3D)"
-#: models_finds.py:222 models_finds.py:225
+#: models_finds.py:235 models_finds.py:238
msgid "Cached value - do not edit"
msgstr "Valeur en cache - ne pas éditer"
-#: models_finds.py:231 models_finds.py:643
+#: models_finds.py:244 models_finds.py:657
msgid "Base find"
msgstr "Mobilier de base"
-#: models_finds.py:232
+#: models_finds.py:245
msgid "Base finds"
msgstr "Mobilier de base"
-#: models_finds.py:475
+#: models_finds.py:488
msgid "g"
msgstr "g"
-#: models_finds.py:476
+#: models_finds.py:489
msgid "kg"
msgstr "kg"
-#: models_finds.py:478
+#: models_finds.py:491
msgid "Not checked"
msgstr "Non vérifié"
-#: models_finds.py:479
+#: models_finds.py:492
msgid "Checked but incorrect"
msgstr "Vérifié mais incorrect"
-#: models_finds.py:480
+#: models_finds.py:493
msgid "Checked and correct"
msgstr "Vérifié et correct"
-#: models_finds.py:552 templates/ishtar/sheet_find.html:18
+#: models_finds.py:566 templates/ishtar/sheet_find.html:18
msgid "Base find - Short ID"
msgstr "Mobilier de base - ID court"
-#: models_finds.py:553 templates/ishtar/sheet_find.html:17
+#: models_finds.py:567 templates/ishtar/sheet_find.html:17
msgid "Base find - Complete ID"
msgstr "Mobilier de base - ID complet"
-#: models_finds.py:555
+#: models_finds.py:569
msgid "Operation (code)"
msgstr "Opération (code)"
-#: models_finds.py:557
+#: models_finds.py:571
msgid "Town"
msgstr "Ville"
-#: models_finds.py:559
+#: models_finds.py:573
msgid "Operation (name)"
msgstr "Opération (nom)"
-#: models_finds.py:561
+#: models_finds.py:575
msgid "Parcel"
msgstr "Parcelle"
-#: models_finds.py:562
+#: models_finds.py:576
msgid "Batch"
msgstr "Lot"
-#: models_finds.py:563
+#: models_finds.py:577
msgid "Base find - Comment"
msgstr "Mobilier de base - Commentaires"
-#: models_finds.py:564
+#: models_finds.py:578
msgid "Base find - Description"
msgstr "Mobilier de base - Description"
-#: models_finds.py:565
+#: models_finds.py:579
msgid "Base find - Topographic localisation"
msgstr "Mobilier de base - Localisation topographique"
-#: models_finds.py:567
+#: models_finds.py:581
msgid "Base find - Special interest"
msgstr "Mobilier de base - Intérêt spécifique"
-#: models_finds.py:568
+#: models_finds.py:582
msgid "Base find - Discovery date"
msgstr "Mobilier de base - Date de découverte"
-#: models_finds.py:569 models_finds.py:670 models_treatments.py:130
-#: models_treatments.py:334 templates/ishtar/sheet_find.html:101
-#: templates/ishtar/sheet_find.html:143
+#: models_finds.py:583 models_finds.py:684 models_treatments.py:106
+#: models_treatments.py:310 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:142
msgid "Container"
msgstr "Contenant"
-#: models_finds.py:570
+#: models_finds.py:584
msgid "Periods"
msgstr "Périodes"
-#: models_finds.py:657
+#: models_finds.py:671
msgid "Weight unit"
msgstr "Unité de poids"
-#: models_finds.py:663 templates/ishtar/sheet_find.html:89
+#: models_finds.py:677 templates/ishtar/sheet_find.html:88
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models_finds.py:666 templates/ishtar/sheet_find.html:131
+#: models_finds.py:680 templates/ishtar/sheet_find.html:130
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models_finds.py:707
+#: models_finds.py:721
msgid "Collection"
msgstr "Collection"
-#: models_finds.py:717
-msgid "Type of preservation to consider"
-msgstr "Mesures de conservation à envisager"
-
-#: models_finds.py:728
-msgid "Treatment emergency"
-msgstr "Traitement d'urgence"
-
-#: models_finds.py:736 models_treatments.py:142 models_treatments.py:533
+#: models_finds.py:751 models_treatments.py:118 models_treatments.py:509
msgid "Cached name"
msgstr "Nom en cache"
-#: models_finds.py:754
+#: models_finds.py:769
msgid "FIND"
msgstr "MOBILIER"
-#: models_finds.py:840 wizards.py:63 wizards.py:200
+#: models_finds.py:855 wizards.py:63 wizards.py:200
msgid "Operation"
msgstr "Opération"
-#: models_finds.py:1127
+#: models_finds.py:1142
msgid "No container have been set - the localisation cannot be set."
msgstr ""
"Aucun contenant n'a été défini - la localisation ne peut être définie."
-#: models_finds.py:1133
+#: models_finds.py:1148
msgid "The division number {} have not been set for the warehouse {}."
msgstr "La division numéro {} n'a pas été définie pour le dépôt {}."
-#: models_finds.py:1314
+#: models_finds.py:1329
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models_finds.py:1315
+#: models_finds.py:1330
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models_finds.py:1352
+#: models_finds.py:1367
msgid "Person"
msgstr "Individu"
-#: models_finds.py:1358
+#: models_finds.py:1373
msgid "Property"
msgstr "Propriété"
-#: models_finds.py:1359
+#: models_finds.py:1374
msgid "Properties"
msgstr "Propriétés"
#: models_treatments.py:41
-msgid "Parent type"
-msgstr "Type parent"
-
-#: models_treatments.py:43
-msgid "Virtual"
-msgstr "Virtuel"
-
-#: models_treatments.py:45
-msgid "Upstream is many"
-msgstr "Les éléments amont sont multiples"
-
-#: models_treatments.py:47
-msgid "Check this if for this treatment from many finds you'll get one."
-msgstr ""
-"Cochez cela si, pour ce traitement, à partir de plusieurs éléments vous en "
-"obtenez un seul."
-
-#: models_treatments.py:50
-msgid "Downstream is many"
-msgstr "Les éléments aval sont multiples"
-
-#: models_treatments.py:52
-msgid "Check this if for this treatment from one find you'll get many."
-msgstr ""
-"Cochez cela si, pour ce traitement, à partir d'un seul élément vous en "
-"obtenez plusieurs."
-
-#: models_treatments.py:57 models_treatments.py:214
-msgid "Treatment types"
-msgstr "Types de traitement"
-
-#: models_treatments.py:65
msgid "Treatment state type"
msgstr "Type d'état de traitement"
-#: models_treatments.py:66
+#: models_treatments.py:42
msgid "Treatment state types"
msgstr "Types d'état de traitement"
-#: models_treatments.py:90
+#: models_treatments.py:66
msgid "Downstream find"
msgstr "Mobilier aval"
-#: models_treatments.py:115
+#: models_treatments.py:91
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
"Endroit où le traitement est réalisé. Renseignez le dépôt de destination "
"pour un déplacement."
-#: models_treatments.py:132
+#: models_treatments.py:108
msgid "Estimated cost"
msgstr "Coût estimé"
-#: models_treatments.py:134
+#: models_treatments.py:110
msgid "Quoted cost"
msgstr "Coût devisé"
-#: models_treatments.py:136
+#: models_treatments.py:112
msgid "Realized cost"
msgstr "Coût réalisé"
-#: models_treatments.py:138
+#: models_treatments.py:114
msgid "Insurance cost"
msgstr "Coût d'assurance"
-#: models_treatments.py:140
+#: models_treatments.py:116
msgid "Target a basket"
msgstr "Appliquer à un panier"
-#: models_treatments.py:147 templates/ishtar/sheet_find.html:86
+#: models_treatments.py:123 templates/ishtar/sheet_find.html:85
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Treatments"
msgstr "Traitements"
-#: models_treatments.py:166
+#: models_treatments.py:142
msgid "TREATMENT"
msgstr "TRAITEMENT"
-#: models_treatments.py:223 templates/ishtar/sheet_treatment.html:50
+#: models_treatments.py:199 templates/ishtar/sheet_treatment.html:50
msgid "Downstream finds"
msgstr "Mobilier aval"
-#: models_treatments.py:335 templates/ishtar/sheet_find.html:100
-#: templates/ishtar/sheet_find.html:142
+#: models_treatments.py:311 templates/ishtar/sheet_find.html:99
+#: templates/ishtar/sheet_find.html:141
msgid "Doer"
msgstr "Opérateur"
-#: models_treatments.py:336 models_treatments.py:337
+#: models_treatments.py:312 models_treatments.py:313
msgid "Related finds"
msgstr "Mobilier associé"
-#: models_treatments.py:479
+#: models_treatments.py:455
msgid "Is upstream"
msgstr "Est en amont"
-#: models_treatments.py:491
+#: models_treatments.py:467
msgid "Treatment request types"
msgstr "Types de demande de traitement"
-#: models_treatments.py:507
+#: models_treatments.py:483
msgid "Internal reference"
msgstr "Référence interne"
-#: models_treatments.py:516
+#: models_treatments.py:492
msgid "Person in charge"
msgstr "Personne responsable"
-#: models_treatments.py:538
+#: models_treatments.py:514
msgid "Treatment requests"
msgstr "Demandes de traitement"
-#: models_treatments.py:618
+#: models_treatments.py:594
msgid "Treatment documentation"
msgstr "Documentation de traitement"
-#: models_treatments.py:619
+#: models_treatments.py:595
msgid "Treament documentations"
msgstr "Documentations de traitement"
-#: models_treatments.py:648
+#: models_treatments.py:624
msgid "Treatment file"
msgstr "Dossier de traitement"
-#: models_treatments.py:652
+#: models_treatments.py:628
msgid "Treatment request documentation"
msgstr "Documentation de demande de traitement"
-#: models_treatments.py:653
+#: models_treatments.py:629
msgid "Treatment request documentations"
msgstr "Documentations de demande de traitement"
@@ -1147,51 +1143,51 @@ msgstr "Mobilier - Index administratif"
msgid "Administrative index"
msgstr "Index administratif"
-#: templates/ishtar/sheet_find.html:78
+#: templates/ishtar/sheet_find.html:76
msgid "Warehouse"
msgstr "Dépôt"
-#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137
+#: templates/ishtar/sheet_find.html:94 templates/ishtar/sheet_find.html:136
msgid "Year - index"
msgstr "Année - index"
-#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
+#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
msgid "Related finds (max. 15 displayed)"
msgstr "Mobilier associé (max. 15 affichés)"
-#: templates/ishtar/sheet_find.html:127
+#: templates/ishtar/sheet_find.html:126
msgid "Export as CSV"
msgstr "Export en CSV"
-#: templates/ishtar/sheet_find.html:127 templates/ishtar/sheet_find.html:170
+#: templates/ishtar/sheet_find.html:126 templates/ishtar/sheet_find.html:169
msgid "CSV"
msgstr "CSV"
-#: templates/ishtar/sheet_find.html:175
+#: templates/ishtar/sheet_find.html:174
msgid "Associated base finds"
msgstr "Mobilier de base associé"
-#: templates/ishtar/sheet_find.html:182
+#: templates/ishtar/sheet_find.html:181
msgid "Internal ID"
msgstr "ID interne"
-#: templates/ishtar/sheet_find.html:214
+#: templates/ishtar/sheet_find.html:213
msgid "Coordinates"
msgstr "Coordonnées"
-#: templates/ishtar/sheet_find.html:221
+#: templates/ishtar/sheet_find.html:220
msgid "SRID"
msgstr "SRID"
-#: templates/ishtar/sheet_find.html:238
+#: templates/ishtar/sheet_find.html:237
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:240
+#: templates/ishtar/sheet_find.html:239
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:241
+#: templates/ishtar/sheet_find.html:240
msgid "Link"
msgstr "Lien"
@@ -1285,94 +1281,94 @@ msgstr "Mobilier : modifier une documentation associée"
msgid "Find: source deletion"
msgstr "Mobilier : supprimer un mobilier associé"
-#: views.py:257
+#: views.py:256
msgid "New basket"
msgstr "Ajouter un panier"
-#: views.py:276
+#: views.py:275
msgid "Manage items in basket"
msgstr "Gérer les éléments dans un panier"
-#: views.py:296
+#: views.py:295
msgid "Manage basket"
msgstr "Gérer un panier"
-#: views.py:387
+#: views.py:386
msgid "Delete basket"
msgstr "Supprimer un panier"
-#: views.py:437
+#: views.py:436
msgid "New treatment"
msgstr "Ajouter un traitement"
-#: views.py:445 views.py:537
+#: views.py:444 views.py:536
msgid "Modify"
msgstr "Modifier"
-#: views.py:462
+#: views.py:461
msgid "Treatment deletion"
msgstr "Supprimer un traitement"
-#: views.py:469
+#: views.py:468
msgid "Treatment: search administrative act"
msgstr "Traitement : rechercher un acte administratif"
-#: views.py:478
+#: views.py:477
msgid "Treatment: new administrative act"
msgstr "Traitement : ajouter un acte administratif"
-#: views.py:488
+#: views.py:487
msgid "Treatment: administrative act modification"
msgstr "Traitement : modifier un acte administratif"
-#: views.py:497
+#: views.py:496
msgid "Treatment: administrative act deletion"
msgstr "Traitement : supprimer un acte administratif"
-#: views.py:530
+#: views.py:529
msgid "New treatment request"
msgstr "Ajouter une demande de traitement"
-#: views.py:553
+#: views.py:552
msgid "Treatment request deletion"
msgstr "Supprimer une demande de traitement"
-#: views.py:560
+#: views.py:559
msgid "Treatment request: search administrative act"
msgstr "Demande de traitement : rechercher un acte administratif"
-#: views.py:570
+#: views.py:569
msgid "Treatment request: new administrative act"
msgstr "Demande de traitement : ajouter un acte administratif"
-#: views.py:580
+#: views.py:579
msgid "Treatment request: administrative act modification"
msgstr "Demande de traitement : modifier un acte administratif"
-#: views.py:589
+#: views.py:588
msgid "Treatment request: administrative act deletion"
msgstr "Demande de traitement : supprimer un acte administratif"
-#: views.py:615
+#: views.py:614
msgid "Treatment: source search"
msgstr "Traitement : rechercher une documentation associée"
-#: views.py:630
+#: views.py:629
msgid "Treatment: source modification"
msgstr "Traitement : modifier une documentation associée"
-#: views.py:645
+#: views.py:644
msgid "Treatment: source deletion"
msgstr "Traitement : supprimer une documentation associée"
-#: views.py:658
+#: views.py:657
msgid "Treatment request: source search"
msgstr "Demande de traitement : rechercher une documentation associée"
-#: views.py:674
+#: views.py:673
msgid "Treatment request: source modification"
msgstr "Demande de traitement : modifier une documentation associée"
-#: views.py:692
+#: views.py:691
msgid "Treatment request: source deletion"
msgstr "Demande de traitement : supprimer une documentation associée"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index aaf3b62b5..b9c9ca55b 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -22,7 +22,7 @@ msgstr ""
msgid "Warehouse"
msgstr "Dépôt"
-#: forms.py:47 forms.py:52 models.py:434
+#: forms.py:47 forms.py:52 models.py:435
msgid "Division"
msgstr "Division"
@@ -58,7 +58,7 @@ msgstr "Rechercher un dépôt"
msgid "Person in charge"
msgstr "Responsable"
-#: forms.py:116 forms.py:186 models.py:53 models.py:283
+#: forms.py:116 forms.py:186 models.py:53 models.py:284
msgid "Comment"
msgstr "Commentaires"
@@ -90,7 +90,7 @@ msgstr "Téléphone mobile"
msgid "Would you like to delete this warehouse?"
msgstr "Voulez-vous supprimer ce dépôt ?"
-#: forms.py:160 models.py:294 models.py:431
+#: forms.py:160 models.py:295 models.py:432
#: templates/ishtar/sheet_container.html:4
msgid "Container"
msgstr "Contenant"
@@ -99,7 +99,7 @@ msgstr "Contenant"
msgid "Ref."
msgstr "Réf."
-#: forms.py:166 forms.py:242 models.py:246 models.py:281
+#: forms.py:166 forms.py:242 models.py:246 models.py:282
msgid "Container type"
msgstr "Type de contenant"
@@ -107,7 +107,7 @@ msgstr "Type de contenant"
msgid "Current location (warehouse)"
msgstr "Lieu actuel (dépôt)"
-#: forms.py:174 models.py:278
+#: forms.py:174 models.py:279
msgid "Responsible warehouse"
msgstr "Dépôt responsable"
@@ -160,7 +160,7 @@ msgstr "Date"
msgid "Packaged finds"
msgstr "Mobilier conditionné"
-#: forms.py:286 models.py:284
+#: forms.py:286 models.py:285
msgid "Localisation"
msgstr "Localisation"
@@ -188,7 +188,7 @@ msgstr "Modification"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:57 models.py:295 templates/ishtar/sheet_warehouse.html:21
+#: ishtar_menu.py:57 models.py:296 templates/ishtar/sheet_warehouse.html:21
#: templates/ishtar/sheet_warehouse.html:54
msgid "Containers"
msgstr "Contenants"
@@ -197,11 +197,11 @@ msgstr "Contenants"
msgid "Warehouse types"
msgstr "Types de dépôt"
-#: models.py:58 models.py:289
+#: models.py:58 models.py:290
msgid "External ID"
msgstr "ID externe"
-#: models.py:60 models.py:291
+#: models.py:60 models.py:292
msgid "External ID is set automatically"
msgstr "L'ID externe est attribué automatiquement"
@@ -245,39 +245,39 @@ msgstr "Volume (l)"
msgid "Container types"
msgstr "Types de contenant"
-#: models.py:267
+#: models.py:268
msgid "Location - index"
msgstr "Lieu - index"
-#: models.py:268
+#: models.py:269
msgid "Precise localisation"
msgstr "Localisation précise"
-#: models.py:269
+#: models.py:270
msgid "Type"
msgstr "Type"
-#: models.py:275
+#: models.py:276
msgid "Location (warehouse)"
msgstr "Lieu (dépôt)"
-#: models.py:282
+#: models.py:283
msgid "Container ref."
msgstr "Réf. du contenant"
-#: models.py:286
+#: models.py:287
msgid "Cached location"
msgstr "Lieu - en cache"
-#: models.py:435
+#: models.py:436
msgid "Reference"
msgstr "Référence"
-#: models.py:438
+#: models.py:439
msgid "Container localisation"
msgstr "Localisation de contenant"
-#: models.py:439
+#: models.py:440
msgid "Container localisations"
msgstr "Localisations de contenant"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index 37ea00bdf..be22b918c 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-10-04 11:13-0400\n"
+"PO-Revision-Date: 2017-10-11 09:57-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -1498,8 +1498,8 @@ msgid "Container type"
msgstr "Type de contenant"
#: models_imports.py:615
-msgid "Preservation type"
-msgstr "Type de conservation"
+msgid "Treatment type"
+msgstr "Type de traitement"
#: models_imports.py:616
msgid "Object type"