From c0e04135cf0900022a4e476595bb1d6b14b43afc Mon Sep 17 00:00:00 2001
From: Étienne Loks Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -152,108 +162,118 @@ msgstr ""
msgid "This ID already exists for this operation."
msgstr ""
-#: forms.py:255 forms.py:282 models.py:70
+#: forms.py:255 forms.py:276 models.py:74
msgid "Dating"
msgstr ""
-#: forms.py:261 models.py:60
+#: forms.py:261 models.py:64
msgid "Start date"
msgstr ""
-#: forms.py:262 models.py:61
+#: forms.py:262 models.py:65
msgid "End date"
msgstr ""
-#: forms.py:263 models.py:64
+#: forms.py:263 models.py:68
msgid "Quality"
msgstr ""
-#: forms.py:264 models.py:42 models.py:62
+#: forms.py:264 models.py:42 models.py:66
msgid "Dating type"
msgstr ""
-#: forms.py:291 ishtar_menu.py:29 models.py:84 models.py:688
+#: forms.py:277
+#| msgid "Context record relations"
+msgid "Context record - 030 - Dating"
+msgstr ""
+
+#: forms.py:287 ishtar_menu.py:29 models.py:88 models.py:704
msgid "Context record"
msgstr ""
-#: forms.py:306
+#: forms.py:303
msgid "Relations"
msgstr ""
-#: forms.py:310 forms.py:318 models.py:276
-#: templates/ishtar/sheet_contextrecord.html:49
+#: forms.py:304
+#| msgid "Context record relations"
+msgid "Context record - 050 - Relations"
+msgstr ""
+
+#: forms.py:309 forms.py:320 models.py:291
+#: templates/ishtar/sheet_contextrecord.html:59
msgid "Interpretation"
msgstr ""
-#: forms.py:314
+#: forms.py:316
msgid "Comments on dating"
msgstr ""
-#: forms.py:316 models.py:275
+#: forms.py:318 models.py:290
msgid "Filling"
msgstr ""
-#: forms.py:320 models.py:296
+#: forms.py:322 models.py:311
msgid "Activity"
msgstr ""
-#: forms.py:322 models.py:294
+#: forms.py:324 models.py:309
msgid "Identification"
msgstr ""
-#: forms.py:324 models.py:279
+#: forms.py:326 models.py:294
msgid "TAQ"
msgstr ""
-#: forms.py:325 models.py:283
+#: forms.py:327 models.py:298
msgid "Estimated TAQ"
msgstr ""
-#: forms.py:327 models.py:286
+#: forms.py:329 models.py:301
msgid "TPQ"
msgstr ""
-#: forms.py:328 models.py:290
+#: forms.py:330 models.py:305
msgid "Estimated TPQ"
msgstr ""
-#: forms.py:343
+#: forms.py:340
msgid "Operation search"
msgstr ""
-#: forms.py:345
+#: forms.py:342
msgid "You should select an operation."
msgstr ""
-#: forms.py:350
+#: forms.py:347
msgid "Would you like to delete this context record?"
msgstr ""
-#: forms.py:359
+#: forms.py:357
msgid "You should select a context record."
msgstr ""
-#: forms.py:364
+#: forms.py:362
msgid "Year of the operation"
msgstr ""
-#: forms.py:366
+#: forms.py:364
msgid "Numeric reference"
msgstr ""
-#: forms.py:373
+#: forms.py:371
msgid "Town of the operation"
msgstr ""
-#: forms.py:375
+#: forms.py:373
msgid "Period of the context record"
msgstr ""
-#: forms.py:390
+#: forms.py:388
msgid "Documentation search"
msgstr ""
-#: forms.py:392
+#: forms.py:390
msgid "You should select a document."
msgstr ""
@@ -277,288 +297,278 @@ msgstr ""
msgid "Dating types"
msgstr ""
-#: models.py:51
+#: models.py:53
msgid "Dating quality type"
msgstr ""
-#: models.py:52
+#: models.py:54
msgid "Dating quality types"
msgstr ""
-#: models.py:66
+#: models.py:70
msgid "Precise dating"
msgstr ""
-#: models.py:71
+#: models.py:75
msgid "Datings"
msgstr ""
-#: models.py:91
+#: models.py:95
msgid "Find"
msgstr ""
-#: models.py:110 models.py:127 models.py:141
+#: models.py:114 models.py:133 models.py:149
msgid "Order"
msgstr ""
-#: models.py:112
+#: models.py:116
msgid "Parent context record type"
msgstr ""
-#: models.py:116
+#: models.py:120
msgid "Context record Type"
msgstr ""
-#: models.py:117
+#: models.py:121
msgid "Context record Types"
msgstr ""
-#: models.py:130
+#: models.py:136
msgid "Activity Type"
msgstr ""
-#: models.py:131
+#: models.py:137
msgid "Activity Types"
msgstr ""
-#: models.py:144
+#: models.py:152
msgid "Identification Type"
msgstr ""
-#: models.py:145
+#: models.py:153
msgid "Identification Types"
msgstr ""
-#: models.py:156
+#: models.py:166
msgid "Excavation technique type"
msgstr ""
-#: models.py:157
+#: models.py:167
msgid "Excavation technique types"
msgstr ""
-#: models.py:165
+#: models.py:177
msgid "Documentation type"
msgstr ""
-#: models.py:166
+#: models.py:178
msgid "Documentation types"
msgstr ""
-#: models.py:205 models.py:615
+#: models.py:219 models.py:630
msgid "Periods"
msgstr ""
-#: models.py:206
+#: models.py:220
msgid "Datings (period)"
msgstr ""
-#: models.py:207
+#: models.py:221
msgid "Related context records"
msgstr ""
-#: models.py:210
+#: models.py:224
msgid "Parcel (external ID)"
msgstr ""
-#: models.py:211 models.py:212
+#: models.py:225 models.py:226
msgid "Parcel (town)"
msgstr ""
-#: models.py:213
+#: models.py:227
msgid "Parcel (year)"
msgstr ""
-#: models.py:244
+#: models.py:259
msgid "External ID"
msgstr ""
-#: models.py:246
+#: models.py:261
msgid "External ID is set automatically"
msgstr ""
-#: models.py:267
+#: models.py:282
msgid "A short description of the location of the context record"
msgstr ""
-#: models.py:271
+#: models.py:286
msgid "Comment on datings"
msgstr ""
-#: models.py:280
+#: models.py:295
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
msgstr ""
-#: models.py:284
+#: models.py:299
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr ""
-#: models.py:287
+#: models.py:302
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
msgstr ""
-#: models.py:291
+#: models.py:306
msgid "Estimation of a \"Terminus Post Quem\""
msgstr ""
-#: models.py:302
+#: models.py:317
msgid "Point (2D)"
msgstr ""
-#: models.py:303
+#: models.py:318
msgid "Point (3D)"
msgstr ""
-#: models.py:305
+#: models.py:320
+#| msgid "Image"
+msgid "Images"
+msgstr ""
+
+#: models.py:322
msgid "Cached name"
msgstr ""
-#: models.py:316 models.py:317 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:333 models.py:334 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr ""
-#: models.py:333
+#: models.py:350
msgctxt "short"
msgid "Context record"
msgstr ""
-#: models.py:542 models.py:565 models.py:610
+#: models.py:557 models.py:580 models.py:625
msgid "Relation type"
msgstr ""
-#: models.py:543
+#: models.py:558
msgid "Relation types"
msgstr ""
-#: models.py:560
+#: models.py:575
msgid "ID (left)"
msgstr ""
-#: models.py:561
+#: models.py:576
msgid "Context record type (left)"
msgstr ""
-#: models.py:562
+#: models.py:577
msgid "Parcel (left)"
msgstr ""
-#: models.py:563
+#: models.py:578
msgid "Description (left)"
msgstr ""
-#: models.py:564
+#: models.py:579
msgid "Periods (left)"
msgstr ""
-#: models.py:566
+#: models.py:581
msgid "ID (right)"
msgstr ""
-#: models.py:567
+#: models.py:582
msgid "Context record type (right)"
msgstr ""
-#: models.py:568
+#: models.py:583
msgid "Parcel (right)"
msgstr ""
-#: models.py:569
+#: models.py:584
msgid "Description (right)"
msgstr ""
-#: models.py:570
+#: models.py:585
msgid "Periods (right)"
msgstr ""
-#: models.py:579
+#: models.py:594
msgid "Record relation"
msgstr ""
-#: models.py:580
+#: models.py:595
msgid "Record relations"
msgstr ""
-#: models.py:673
+#: models.py:689
msgid "Context record documentation"
msgstr ""
-#: models.py:674
+#: models.py:690
msgid "Context record documentations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Complete ID"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Temporary ID"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:61
+#: templates/ishtar/sheet_contextrecord.html:70
msgid "Datations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:70
+#: templates/ishtar/sheet_contextrecord.html:79
msgid "Context record relations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:77
+#: templates/ishtar/sheet_contextrecord.html:86
msgid "Operation summary"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:79
+#: templates/ishtar/sheet_contextrecord.html:89
msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:83
+#: templates/ishtar/sheet_contextrecord.html:94
msgid "Numerical reference"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:100
msgid "State"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:101
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:101
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:89
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:97
+#: templates/ishtar/sheet_contextrecord.html:118
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:98
-msgid "Towns"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:99
-msgid "Related operation"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:101
-msgid "No operation linked to this context unit!"
+#: templates/ishtar/sheet_contextrecord.html:127
+#| msgid "No operation linked to this context unit!"
+msgid "No operation linked to this context record!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:130
msgid "Document from this context record"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:109
+#: templates/ishtar/sheet_contextrecord.html:135
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:114
+#: templates/ishtar/sheet_contextrecord.html:140
msgid "Documents from associated finds"
msgstr ""
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index c6f662c3f..76d8a99e2 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -9,248 +9,270 @@
msgid ""
msgstr ""
-#: forms.py:47 forms.py:210 forms.py:255 forms.py:394 forms.py:421
-#: models.py:109 templates/ishtar/sheet_file.html:147
+#: forms.py:50 forms.py:409 forms.py:437
+#| msgid "File search"
+msgid "Full text search"
+msgstr ""
+
+#: forms.py:51 forms.py:216 forms.py:261 forms.py:410 forms.py:438
+#: models.py:125 templates/ishtar/sheet_file.html:190
msgid "Year"
msgstr ""
-#: forms.py:48 forms.py:215 forms.py:257 models.py:111
+#: forms.py:52 forms.py:221 forms.py:263 models.py:127
msgid "Numeric reference"
msgstr ""
-#: forms.py:50 forms.py:217
+#: forms.py:54 forms.py:223
msgid "Other reference"
msgstr ""
-#: forms.py:52 forms.py:429
+#: forms.py:56 forms.py:446
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:55 forms.py:405 forms.py:432 models.py:570
+#: forms.py:59 forms.py:421 forms.py:449 models.py:586
msgid "Department"
msgstr ""
-#: forms.py:56 forms.py:441
+#: forms.py:60 forms.py:458
msgid "File name"
msgstr ""
-#: forms.py:57 forms.py:154 forms.py:221 models.py:119
+#: forms.py:61 forms.py:160 forms.py:227 models.py:135
msgid "File type"
msgstr ""
-#: forms.py:58
+#: forms.py:62
msgid "Is active?"
msgstr ""
-#: forms.py:59 forms.py:156 forms.py:314
+#: forms.py:63 forms.py:162 forms.py:327
msgid "Saisine type"
msgstr ""
-#: forms.py:60 forms.py:304 models.py:61 models.py:150
+#: forms.py:64 forms.py:317 models.py:63 models.py:166
msgid "Permit type"
msgstr ""
-#: forms.py:62 forms.py:307 models.py:151
+#: forms.py:66 forms.py:320 models.py:167
msgid "Permit reference"
msgstr ""
-#: forms.py:63 forms.py:227 forms.py:362 models.py:180
-#: templates/ishtar/sheet_file.html:99
+#: forms.py:67 forms.py:233 forms.py:377 models.py:196
msgid "Comment"
msgstr ""
-#: forms.py:65 templates/ishtar/sheet_file.html:119
+#: forms.py:69 templates/ishtar/sheet_file.html:166
msgid "In charge"
msgstr ""
-#: forms.py:72 forms.py:281 forms.py:443 models.py:126
+#: forms.py:76 forms.py:294 forms.py:460 models.py:142
msgid "General contractor"
msgstr ""
-#: forms.py:79 forms.py:451
+#: forms.py:83 forms.py:468
msgid "Organization of general contractor"
msgstr ""
-#: forms.py:87 forms.py:474
+#: forms.py:91 forms.py:491
msgid "Created by"
msgstr ""
-#: forms.py:94 forms.py:482
+#: forms.py:98 forms.py:499
msgid "Modified by"
msgstr ""
-#: forms.py:125
+#: forms.py:130
msgid "Archaeological file search"
msgstr ""
-#: forms.py:139
+#: forms.py:144
msgid "You should select a file."
msgstr ""
-#: forms.py:142 forms.py:219 models.py:159
+#: forms.py:148 forms.py:225 models.py:175
msgid "Creation date"
msgstr ""
-#: forms.py:143 forms.py:317 models.py:161
+#: forms.py:149 forms.py:330 models.py:177
msgid "Reception date"
msgstr ""
-#: forms.py:148
+#: forms.py:154
msgid "Slicing"
msgstr ""
-#: forms.py:150
+#: forms.py:156
msgid "Department detail"
msgstr ""
-#: forms.py:152
+#: forms.py:158
msgid "Date get from"
msgstr ""
-#: forms.py:158
+#: forms.py:164
msgid "Date after"
msgstr ""
-#: forms.py:160
+#: forms.py:166
msgid "Date before"
msgstr ""
-#: forms.py:197 templates/ishtar/sheet_file.html:19
+#: forms.py:203 templates/ishtar/sheet_file.html:34
msgid "General"
msgstr ""
-#: forms.py:202 models.py:121
+#: forms.py:208 models.py:137
msgid "Person in charge"
msgstr ""
-#: forms.py:218 models.py:118
+#: forms.py:224 models.py:134
msgid "Name"
msgstr ""
-#: forms.py:223 models.py:163 templates/ishtar/sheet_file.html:42
+#: forms.py:229 models.py:179
msgid "Related file"
msgstr ""
-#: forms.py:231 models.py:171
+#: forms.py:237 models.py:187
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:234 models.py:177 templates/ishtar/sheet_file.html:53
+#: forms.py:240 models.py:193
msgid "Main address"
msgstr ""
-#: forms.py:235
+#: forms.py:241
msgid "Main address - complement"
msgstr ""
-#: forms.py:248
+#: forms.py:254
#, python-format
msgid " Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms.py:274
+#: forms.py:258
msgid "You should at least provide X, Y and the spatial reference system used."
msgstr ""
-#: forms.py:283
+#: forms.py:267
msgid "Coordinates are not relevant for the spatial reference system used: {}."
msgstr ""
-#: forms.py:289 templates/ishtar/sheet_find.html:64
+#: forms.py:273 templates/ishtar/sheet_find.html:70
msgid "Preservation"
msgstr ""
-#: forms.py:298 forms.py:406 models_finds.py:63 models_finds.py:729
+#: forms.py:274
+#| msgid "Preservation"
+msgid "Find - 030 - Preservation"
+msgstr ""
+
+#: forms.py:284 forms.py:387 models_finds.py:63 models_finds.py:729
msgid "Conservatory state"
msgstr ""
-#: forms.py:301 models_finds.py:738
+#: forms.py:287 models_finds.py:738
msgid "Alteration"
msgstr ""
-#: forms.py:304 models_finds.py:742
+#: forms.py:290 models_finds.py:742
msgid "Alteration cause"
msgstr ""
-#: forms.py:307 models_finds.py:735
+#: forms.py:293 models_finds.py:735
msgid "Recommended treatments"
msgstr ""
-#: forms.py:309 models_finds.py:746
+#: forms.py:295 models_finds.py:746
msgid "Treatment emergency"
msgstr ""
-#: forms.py:311 models_finds.py:749
+#: forms.py:297 models_finds.py:749
msgid "Insurance value"
msgstr ""
-#: forms.py:313 models_finds.py:751
+#: forms.py:299 models_finds.py:751
msgid "Appraisal date"
msgstr ""
-#: forms.py:315 models_finds.py:731
+#: forms.py:301 models_finds.py:731
msgid "Conservatory comment"
msgstr ""
-#: forms.py:334 forms.py:365 models_finds.py:684
+#: forms.py:320 forms.py:344 models_finds.py:684
msgid "Dating"
msgstr ""
-#: forms.py:339 forms.py:401
+#: forms.py:325 forms.py:382
msgid "Period"
msgstr ""
-#: forms.py:340 forms_treatments.py:137 forms_treatments.py:290
-#: forms_treatments.py:488 models_finds.py:1405 models_treatments.py:104
-#: models_treatments.py:309 templates/ishtar/sheet_find.html:103
-#: templates/ishtar/sheet_find.html:145
+#: forms.py:326 forms_treatments.py:142 forms_treatments.py:290
+#: forms_treatments.py:490 models_finds.py:1407 models_treatments.py:113
+#: models_treatments.py:322 templates/ishtar/sheet_find.html:109
+#: templates/ishtar/sheet_find.html:147
msgid "Start date"
msgstr ""
-#: forms.py:342 models_finds.py:1406 models_treatments.py:310
-#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:146
+#: forms.py:328 models_finds.py:1408 models_treatments.py:323
+#: templates/ishtar/sheet_find.html:110 templates/ishtar/sheet_find.html:148
msgid "End date"
msgstr ""
-#: forms.py:343
+#: forms.py:329
msgid "Quality"
msgstr ""
-#: forms.py:345
+#: forms.py:331
msgid "Dating type"
msgstr ""
-#: forms.py:347
+#: forms.py:333
msgid "Precise dating"
msgstr ""
-#: forms.py:369
+#: forms.py:345
+msgid "Find - 040 - Dating"
+msgstr ""
+
+#: forms.py:350 forms_treatments.py:52 forms_treatments.py:336
+#: forms_treatments.py:406 forms_treatments.py:592
msgid "Full text search"
msgstr ""
-#: forms.py:370 models_finds.py:234
+#: forms.py:351 models_finds.py:234
msgid "Short ID"
msgstr ""
-#: forms.py:371 models_finds.py:237
+#: forms.py:352 models_finds.py:237
msgid "Complete ID"
msgstr ""
-#: forms.py:375 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:78 models_treatments.py:483
+#: forms.py:356 forms_treatments.py:55 forms_treatments.py:100
+#: forms_treatments.py:337 forms_treatments.py:409 forms_treatments.py:460
+#: forms_treatments.py:593 models_treatments.py:87 models_treatments.py:503
msgid "Year"
msgstr ""
-#: forms.py:377
+#: forms.py:358
msgid "Operation's number (index by year)"
msgstr ""
-#: forms.py:380
+#: forms.py:361
msgid "Code PATRIARCHE"
msgstr ""
-#: forms.py:384
+#: forms.py:365
msgid "Archaeological site"
msgstr ""
-#: forms.py:396
+#: forms.py:377
msgid "Search within related operations"
msgstr ""
-#: forms.py:399
+#: forms.py:380
msgid "Search within related context records"
msgstr ""
-#: forms.py:403 models_finds.py:132
+#: forms.py:384 models_finds.py:132
msgid "Object type"
msgstr ""
-#: forms.py:405
+#: forms.py:386
msgid "Preservation type"
msgstr ""
-#: forms.py:416 forms_treatments.py:56
+#: forms.py:397 forms_treatments.py:58
msgid "Has an image?"
msgstr ""
-#: forms.py:470
+#: forms.py:451
msgid "Warehouse (location)"
msgstr ""
-#: forms.py:476
+#: forms.py:457
msgid "Warehouse (responsible)"
msgstr ""
-#: forms.py:481
+#: forms.py:462
msgid "Container ID"
msgstr ""
-#: forms.py:482
+#: forms.py:463
msgid "Container ref."
msgstr ""
-#: forms.py:486 forms.py:509 views.py:159
+#: forms.py:468 forms.py:491 views.py:159
msgid "Find search"
msgstr ""
-#: forms.py:534 models_treatments.py:209
-#: templates/ishtar/sheet_treatment.html:47
+#: forms.py:516 models_treatments.py:220
+#: templates/ishtar/sheet_treatment.html:56
msgid "Upstream finds"
msgstr ""
-#: forms.py:536 models_finds.py:769
+#: forms.py:518 models_finds.py:770
msgid "Finds"
msgstr ""
-#: forms.py:548
+#: forms.py:530
msgid "You should at least select one archaeological find."
msgstr ""
-#: forms.py:651
+#: forms.py:633
msgid "Resulting find"
msgstr ""
-#: forms.py:656
+#: forms.py:638
msgid "Precise description"
msgstr ""
-#: forms.py:671
+#: forms.py:652
msgid "Resulting finds"
msgstr ""
-#: forms.py:676
+#: forms.py:657
msgid "Would you like to delete this find?"
msgstr ""
-#: forms.py:680 models_treatments.py:67
+#: forms.py:661 models_treatments.py:69
msgid "Upstream find"
msgstr ""
-#: forms.py:693
+#: forms.py:674
msgid "Archaeological find search"
msgstr ""
-#: forms.py:695
+#: forms.py:676
msgid "You should select an archaeological find."
msgstr ""
-#: forms.py:700
+#: forms.py:681
msgid "Year of the operation"
msgstr ""
-#: forms.py:702
+#: forms.py:683
msgid "Numeric reference"
msgstr ""
-#: forms.py:709
+#: forms.py:690
msgid "Period of the archaeological find"
msgstr ""
-#: forms.py:711
+#: forms.py:692
msgid "Material type of the archaeological find"
msgstr ""
-#: forms.py:713
+#: forms.py:694
msgid "Description of the archaeological find"
msgstr ""
-#: forms.py:725 forms_treatments.py:691 forms_treatments.py:717
+#: forms.py:706 forms_treatments.py:693 forms_treatments.py:719
msgid "Documentation search"
msgstr ""
-#: forms.py:727 forms_treatments.py:693 forms_treatments.py:719
+#: forms.py:708 forms_treatments.py:695 forms_treatments.py:721
msgid "You should select a document."
msgstr ""
-#: forms.py:744
+#: forms.py:725
msgid "Another basket already exists with this name."
msgstr ""
-#: forms.py:754 forms.py:758 forms_treatments.py:174 ishtar_menu.py:57
+#: forms.py:735 forms.py:739 forms_treatments.py:186 ishtar_menu.py:57
msgid "Basket"
msgstr ""
-#: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:74
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
+#: forms_treatments.py:53 forms_treatments.py:96 models_treatments.py:83
+#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:141
msgid "Label"
msgstr ""
-#: forms_treatments.py:52 forms_treatments.py:94 models_treatments.py:76
+#: forms_treatments.py:54 forms_treatments.py:99 models_treatments.py:85
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:79
-#: models_treatments.py:484
+#: forms_treatments.py:56 forms_treatments.py:238 forms_treatments.py:338
+#: forms_treatments.py:400 forms_treatments.py:410 forms_treatments.py:513
+#: forms_treatments.py:594 forms_treatments.py:659 models_treatments.py:88
+#: models_treatments.py:504
msgid "Index"
msgstr ""
-#: forms_treatments.py:55 forms_treatments.py:100 forms_treatments.py:298
-#: forms_treatments.py:353 forms_treatments.py:679 models_finds.py:89
-#: models_treatments.py:84 models_treatments.py:308
+#: forms_treatments.py:57 forms_treatments.py:105 forms_treatments.py:298
+#: forms_treatments.py:354 forms_treatments.py:681 models_finds.py:89
+#: models_treatments.py:93 models_treatments.py:321
msgid "Treatment type"
msgstr ""
-#: forms_treatments.py:67 forms_treatments.py:661 views.py:415
+#: forms_treatments.py:70 forms_treatments.py:663 views.py:415
msgid "Treatment search"
msgstr ""
-#: forms_treatments.py:79
+#: forms_treatments.py:82
msgid "Base treatment"
msgstr ""
-#: forms_treatments.py:102 models_treatments.py:69 models_treatments.py:86
-#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
+#: forms_treatments.py:83
+#| msgid "Treatment name"
+msgid "Treatment - 020 - General"
+msgstr ""
+
+#: forms_treatments.py:107 models_treatments.py:71 models_treatments.py:95
+#: templates/ishtar/sheet_find.html:105 templates/ishtar/sheet_find.html:143
msgid "State"
msgstr ""
-#: forms_treatments.py:104
+#: forms_treatments.py:109
msgid "Target"
msgstr ""
-#: forms_treatments.py:106 forms_treatments.py:469 models_treatments.py:94
+#: forms_treatments.py:111 forms_treatments.py:471 models_treatments.py:103
msgid "Responsible"
msgstr ""
-#: forms_treatments.py:112 models_treatments.py:97
+#: forms_treatments.py:117 models_treatments.py:106
msgid "Organization"
msgstr ""
-#: forms_treatments.py:118 models_treatments.py:89 models_treatments.py:311
+#: forms_treatments.py:123 models_treatments.py:98 models_treatments.py:324
msgid "Location"
msgstr ""
-#: forms_treatments.py:124
+#: forms_treatments.py:129
msgid "Container (relevant for packaging)"
msgstr ""
-#: forms_treatments.py:130 forms_treatments.py:465
+#: forms_treatments.py:135 forms_treatments.py:467
msgid "External ref."
msgstr ""
-#: forms_treatments.py:131 models_treatments.py:103
+#: forms_treatments.py:136 models_treatments.py:112
msgid "Goal"
msgstr ""
-#: forms_treatments.py:139 forms_treatments.py:290 forms_treatments.py:494
-#: forms_treatments.py:546 models_treatments.py:105 models_treatments.py:504
+#: forms_treatments.py:144 forms_treatments.py:290 forms_treatments.py:496
+#: forms_treatments.py:548 models_treatments.py:114 models_treatments.py:524
msgid "Closing date"
msgstr ""
-#: forms_treatments.py:141
+#: forms_treatments.py:146
#, python-brace-format
msgid "Estimated cost ({currency})"
msgstr ""
-#: forms_treatments.py:143
+#: forms_treatments.py:148
#, python-brace-format
msgid "Quoted cost ({currency})"
msgstr ""
-#: forms_treatments.py:145
+#: forms_treatments.py:150
#, python-brace-format
msgid "Realized cost ({currency})"
msgstr ""
-#: forms_treatments.py:147
+#: forms_treatments.py:152
#, python-brace-format
msgid "Insurance cost ({currency})"
msgstr ""
-#: forms_treatments.py:174
+#: forms_treatments.py:186
msgid "Single find"
msgstr ""
-#: forms_treatments.py:212
+#: forms_treatments.py:210
msgid ""
"The container field is attached to the treatment. If no packaging treatment "
"is done it is not relevant."
msgstr ""
-#: forms_treatments.py:217
+#: forms_treatments.py:215
msgid "If a packaging treatment is done, the container field must be filled."
msgstr ""
-#: forms_treatments.py:221
+#: forms_treatments.py:219
msgid "A responsible or an organization must be defined."
msgstr ""
-#: forms_treatments.py:264
+#: forms_treatments.py:262
msgid "Another treatment with this index exists for {}."
msgstr ""
-#: forms_treatments.py:270 models_treatments.py:82
+#: forms_treatments.py:268 models_treatments.py:91
msgid "Associated request"
msgstr ""
-#: forms_treatments.py:274 forms_treatments.py:449 ishtar_menu.py:108
-#: models_treatments.py:516 models_treatments.py:544 models_treatments.py:623
+#: forms_treatments.py:269
+#| msgid "Treatment request source"
+msgid "Treatment - 010 - Request choice"
+msgstr ""
+
+#: forms_treatments.py:274 forms_treatments.py:451 ishtar_menu.py:108
+#: models_treatments.py:536 models_treatments.py:564 models_treatments.py:644
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:188
msgid "Treatment request"
msgstr ""
@@ -535,149 +563,159 @@ msgstr ""
msgid "Would you like to delete this treatment?"
msgstr ""
-#: forms_treatments.py:288
+#: forms_treatments.py:289
msgid "months"
msgstr ""
-#: forms_treatments.py:288
+#: forms_treatments.py:289
msgid "years"
msgstr ""
-#: forms_treatments.py:294 forms_treatments.py:550
+#: forms_treatments.py:294 forms_treatments.py:552
msgid "Slicing"
msgstr ""
-#: forms_treatments.py:297 forms_treatments.py:553
+#: forms_treatments.py:297 forms_treatments.py:555
msgid "Date get from"
msgstr ""
-#: forms_treatments.py:300 forms_treatments.py:556
+#: forms_treatments.py:300 forms_treatments.py:558
msgid "Date after"
msgstr ""
-#: forms_treatments.py:302 forms_treatments.py:558
+#: forms_treatments.py:302 forms_treatments.py:560
msgid "Date before"
msgstr ""
-#: forms_treatments.py:338 forms_treatments.py:386 forms_treatments.py:592
-#: forms_treatments.py:643
+#: forms_treatments.py:339 forms_treatments.py:389 forms_treatments.py:595
+#: forms_treatments.py:648
msgid "Act type"
msgstr ""
-#: forms_treatments.py:339 forms_treatments.py:593
+#: forms_treatments.py:340 forms_treatments.py:596
msgid "Indexed?"
msgstr ""
-#: forms_treatments.py:340 forms_treatments.py:594
+#: forms_treatments.py:341 forms_treatments.py:597
msgid "Object"
msgstr ""
-#: forms_treatments.py:344 forms_treatments.py:598
+#: forms_treatments.py:345 forms_treatments.py:601
msgid "Signature date after"
msgstr ""
-#: forms_treatments.py:346 forms_treatments.py:600
+#: forms_treatments.py:347 forms_treatments.py:603
msgid "Signature date before"
msgstr ""
-#: forms_treatments.py:348 forms_treatments.py:674
+#: forms_treatments.py:349 forms_treatments.py:676
msgid "Treatment name"
msgstr ""
-#: forms_treatments.py:349 forms_treatments.py:675
+#: forms_treatments.py:350 forms_treatments.py:677
msgid "Treatment year"
msgstr ""
-#: forms_treatments.py:350 forms_treatments.py:676
+#: forms_treatments.py:351 forms_treatments.py:678
msgid "Treatment index"
msgstr ""
-#: forms_treatments.py:352 forms_treatments.py:678
+#: forms_treatments.py:353 forms_treatments.py:680
msgid "Treatment internal reference"
msgstr ""
-#: forms_treatments.py:356 forms_treatments.py:612
+#: forms_treatments.py:357 forms_treatments.py:615
msgid "Modified by"
msgstr ""
-#: forms_treatments.py:406 forms_treatments.py:456 models_treatments.py:489
+#: forms_treatments.py:387
+#| msgid "Treatment: administrative act deletion"
+msgid "Treatment - Administrative act - General"
+msgstr ""
+
+#: forms_treatments.py:407 forms_treatments.py:458 models_treatments.py:509
msgid "Name"
msgstr ""
-#: forms_treatments.py:407 forms_treatments.py:463
+#: forms_treatments.py:408 forms_treatments.py:465
msgid "Internal ref."
msgstr ""
-#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:68
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
+#: forms_treatments.py:411 forms_treatments.py:469 models_treatments.py:70
+#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:142
#: templates/ishtar/sheet_find.html:240
msgid "Type"
msgstr ""
-#: forms_treatments.py:412
+#: forms_treatments.py:413
msgid "In charge"
msgstr ""
-#: forms_treatments.py:418 forms_treatments.py:475 models_treatments.py:498
-#: templates/ishtar/sheet_treatmentfile.html:32
+#: forms_treatments.py:419 forms_treatments.py:477 models_treatments.py:518
+#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Applicant"
msgstr ""
-#: forms_treatments.py:424 forms_treatments.py:481 models_treatments.py:502
-#: templates/ishtar/sheet_treatmentfile.html:39
+#: forms_treatments.py:425 forms_treatments.py:483 models_treatments.py:522
+#: templates/ishtar/sheet_treatmentfile.html:53
msgid "Applicant organisation"
msgstr ""
-#: forms_treatments.py:437 forms_treatments.py:666 views.py:519
+#: forms_treatments.py:439 forms_treatments.py:668 views.py:519
msgid "Treatment request search"
msgstr ""
-#: forms_treatments.py:492 forms_treatments.py:545 models_treatments.py:508
+#: forms_treatments.py:494 forms_treatments.py:547 models_treatments.py:528
msgid "Reception date"
msgstr ""
-#: forms_treatments.py:534
+#: forms_treatments.py:536
msgid "Another treatment request with this index exists for {}."
msgstr ""
-#: forms_treatments.py:540
+#: forms_treatments.py:542
msgid "Are you sure you want to delete this treatment request?"
msgstr ""
-#: forms_treatments.py:541
+#: forms_treatments.py:543
msgid "Would you like to delete this treatment request?"
msgstr ""
-#: forms_treatments.py:544 models_treatments.py:506
+#: forms_treatments.py:546 models_treatments.py:526
msgid "Creation date"
msgstr ""
-#: forms_treatments.py:554 forms_treatments.py:610 forms_treatments.py:706
-#: models_treatments.py:468 models_treatments.py:491
+#: forms_treatments.py:556 forms_treatments.py:613 forms_treatments.py:708
+#: models_treatments.py:481 models_treatments.py:511
msgid "Treatment request type"
msgstr ""
-#: forms_treatments.py:602 forms_treatments.py:698
+#: forms_treatments.py:605 forms_treatments.py:700
msgid "Treatment request name"
msgstr ""
-#: forms_treatments.py:604 forms_treatments.py:700
+#: forms_treatments.py:607 forms_treatments.py:702
msgid "Treatment request year"
msgstr ""
-#: forms_treatments.py:606 forms_treatments.py:702
+#: forms_treatments.py:609 forms_treatments.py:704
msgid "Treatment request index"
msgstr ""
-#: forms_treatments.py:608 forms_treatments.py:704
+#: forms_treatments.py:611 forms_treatments.py:706
msgid "Treatment request internal reference"
msgstr ""
-#: forms_treatments.py:663
+#: forms_treatments.py:646
+#| msgid "Treatment request: new administrative act"
+msgid "Treatment request - Administrative act - General"
+msgstr ""
+
+#: forms_treatments.py:665
msgid "You should select a treatment."
msgstr ""
-#: forms_treatments.py:669
+#: forms_treatments.py:671
msgid "You should select a treatment request."
msgstr ""
@@ -711,7 +749,7 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1402
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1404
msgid "Administrative act"
msgstr ""
@@ -724,8 +762,8 @@ msgstr ""
msgid "Source"
msgstr ""
-#: ishtar_menu.py:185 models_treatments.py:123 models_treatments.py:300
-#: models_treatments.py:590 models_treatments.py:593
+#: ishtar_menu.py:185 models_treatments.py:134 models_treatments.py:313
+#: models_treatments.py:610 models_treatments.py:613
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr ""
@@ -751,7 +789,7 @@ msgid "Conservatory states"
msgstr ""
#: models_finds.py:73 models_finds.py:119 models_finds.py:665
-#: models_treatments.py:304
+#: models_treatments.py:317
msgid "Order"
msgstr ""
@@ -779,7 +817,7 @@ msgstr ""
msgid "Check this if for this treatment from one find you'll get many."
msgstr ""
-#: models_finds.py:90 models_treatments.py:191
+#: models_finds.py:90 models_treatments.py:202
msgid "Treatment types"
msgstr ""
@@ -831,8 +869,8 @@ msgstr ""
msgid "Treatment emergency types"
msgstr ""
-#: models_finds.py:198 models_finds.py:662 models_treatments.py:99
-#: models_treatments.py:487
+#: models_finds.py:198 models_finds.py:662 models_treatments.py:108
+#: models_treatments.py:507
msgid "External ID"
msgstr ""
@@ -888,11 +926,11 @@ msgstr ""
msgid "Checked and correct"
msgstr ""
-#: models_finds.py:569 templates/ishtar/sheet_find.html:18
+#: models_finds.py:569 templates/ishtar/sheet_find.html:20
msgid "Base find - Short ID"
msgstr ""
-#: models_finds.py:570 templates/ishtar/sheet_find.html:17
+#: models_finds.py:570 templates/ishtar/sheet_find.html:19
msgid "Base find - Complete ID"
msgstr ""
@@ -936,9 +974,9 @@ msgstr ""
msgid "Base find - Discovery date"
msgstr ""
-#: models_finds.py:586 models_finds.py:687 models_treatments.py:106
-#: models_treatments.py:312 templates/ishtar/sheet_find.html:102
-#: templates/ishtar/sheet_find.html:144
+#: models_finds.py:586 models_finds.py:687 models_treatments.py:115
+#: models_treatments.py:325 templates/ishtar/sheet_find.html:108
+#: templates/ishtar/sheet_find.html:146
msgid "Container"
msgstr ""
@@ -950,11 +988,11 @@ msgstr ""
msgid "Weight unit"
msgstr ""
-#: models_finds.py:680 templates/ishtar/sheet_find.html:90
+#: models_finds.py:680 templates/ishtar/sheet_find.html:98
msgid "Upstream treatment"
msgstr ""
-#: models_finds.py:683 templates/ishtar/sheet_find.html:132
+#: models_finds.py:683 templates/ishtar/sheet_find.html:136
msgid "Downstream treatment"
msgstr ""
@@ -962,43 +1000,48 @@ msgstr ""
msgid "Collection"
msgstr ""
-#: models_finds.py:754 models_treatments.py:118 models_treatments.py:511
+#: models_finds.py:753 models_treatments.py:127
+#| msgid "Image"
+msgid "Images"
+msgstr ""
+
+#: models_finds.py:755 models_treatments.py:129 models_treatments.py:531
msgid "Cached name"
msgstr ""
-#: models_finds.py:781
+#: models_finds.py:782
msgid "FIND"
msgstr ""
-#: models_finds.py:867 wizards.py:63 wizards.py:200
+#: models_finds.py:868 wizards.py:63 wizards.py:200
msgid "Operation"
msgstr ""
-#: models_finds.py:1166
+#: models_finds.py:1167
msgid "No container have been set - the localisation cannot be set."
msgstr ""
-#: models_finds.py:1172
+#: models_finds.py:1173
msgid "The division number {} have not been set for the warehouse {}."
msgstr ""
-#: models_finds.py:1365
+#: models_finds.py:1367
msgid "Find documentation"
msgstr ""
-#: models_finds.py:1366
+#: models_finds.py:1368
msgid "Find documentations"
msgstr ""
-#: models_finds.py:1403
+#: models_finds.py:1405
msgid "Person"
msgstr ""
-#: models_finds.py:1409
+#: models_finds.py:1411
msgid "Property"
msgstr ""
-#: models_finds.py:1410
+#: models_finds.py:1412
msgid "Properties"
msgstr ""
@@ -1010,127 +1053,127 @@ msgstr ""
msgid "Treatment state types"
msgstr ""
-#: models_treatments.py:66
+#: models_treatments.py:68
msgid "Downstream find"
msgstr ""
-#: models_treatments.py:91
+#: models_treatments.py:100
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-#: models_treatments.py:108
+#: models_treatments.py:117
msgid "Estimated cost"
msgstr ""
-#: models_treatments.py:110
+#: models_treatments.py:119
msgid "Quoted cost"
msgstr ""
-#: models_treatments.py:112
+#: models_treatments.py:121
msgid "Realized cost"
msgstr ""
-#: models_treatments.py:114
+#: models_treatments.py:123
msgid "Insurance cost"
msgstr ""
-#: models_treatments.py:116
+#: models_treatments.py:125
msgid "Target a basket"
msgstr ""
-#: models_treatments.py:124 templates/ishtar/sheet_find.html:87
-#: templates/ishtar/sheet_treatmentfile.html:47
+#: models_treatments.py:135 templates/ishtar/sheet_find.html:95
+#: templates/ishtar/sheet_treatmentfile.html:61
msgid "Treatments"
msgstr ""
-#: models_treatments.py:143
+#: models_treatments.py:154
msgid "TREATMENT"
msgstr ""
-#: models_treatments.py:200 templates/ishtar/sheet_treatment.html:52
+#: models_treatments.py:211 templates/ishtar/sheet_treatment.html:61
msgid "Downstream finds"
msgstr ""
-#: models_treatments.py:313 templates/ishtar/sheet_find.html:101
-#: templates/ishtar/sheet_find.html:143
+#: models_treatments.py:326 templates/ishtar/sheet_find.html:107
+#: templates/ishtar/sheet_find.html:145
msgid "Doer"
msgstr ""
-#: models_treatments.py:314 models_treatments.py:315
+#: models_treatments.py:327 models_treatments.py:328
msgid "Related finds"
msgstr ""
-#: models_treatments.py:457
+#: models_treatments.py:470
msgid "Is upstream"
msgstr ""
-#: models_treatments.py:469
+#: models_treatments.py:482
msgid "Treatment request types"
msgstr ""
-#: models_treatments.py:485
+#: models_treatments.py:505
msgid "Internal reference"
msgstr ""
-#: models_treatments.py:494
+#: models_treatments.py:514
msgid "Person in charge"
msgstr ""
-#: models_treatments.py:517
+#: models_treatments.py:537
msgid "Treatment requests"
msgstr ""
-#: models_treatments.py:597
+#: models_treatments.py:618
msgid "Treatment documentation"
msgstr ""
-#: models_treatments.py:598
+#: models_treatments.py:619
msgid "Treament documentations"
msgstr ""
-#: models_treatments.py:627
+#: models_treatments.py:648
msgid "Treatment file"
msgstr ""
-#: models_treatments.py:631
+#: models_treatments.py:653
msgid "Treatment request documentation"
msgstr ""
-#: models_treatments.py:632
+#: models_treatments.py:654
msgid "Treatment request documentations"
msgstr ""
-#: templates/ishtar/sheet_find.html:13
+#: templates/ishtar/sheet_find.html:21
+msgid "Find - Administrative ID"
+msgstr ""
+
+#: templates/ishtar/sheet_find.html:31
msgid ""
"This sheet has a downstream treatment: it is related to an old version of "
"the find."
msgstr ""
-#: templates/ishtar/sheet_find.html:19
-msgid "Find - Administrative ID"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:27
+#: templates/ishtar/sheet_find.html:38
msgid "Administrative index"
msgstr ""
-#: templates/ishtar/sheet_find.html:78
+#: templates/ishtar/sheet_find.html:84
msgid "Warehouse"
msgstr ""
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:140
msgid "Year - index"
msgstr ""
-#: templates/ishtar/sheet_find.html:100 templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:106 templates/ishtar/sheet_find.html:144
msgid "Related finds (max. 15 displayed)"
msgstr ""
-#: templates/ishtar/sheet_find.html:128
+#: templates/ishtar/sheet_find.html:132
msgid "Export as CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:128 templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:132 templates/ishtar/sheet_find.html:171
msgid "CSV"
msgstr ""
@@ -1174,36 +1217,36 @@ msgstr ""
msgid "Related find"
msgstr ""
-#: templates/ishtar/sheet_treatment.html:19
+#: templates/ishtar/sheet_treatment.html:25
msgctxt "Treatment"
msgid "Closed"
msgstr ""
-#: templates/ishtar/sheet_treatment.html:21
+#: templates/ishtar/sheet_treatment.html:27
msgctxt "Treatment"
msgid "Active"
msgstr ""
-#: templates/ishtar/sheet_treatment.html:57
+#: templates/ishtar/sheet_treatment.html:66
msgid "Related operations"
msgstr ""
-#: templates/ishtar/sheet_treatment.html:61
-#: templates/ishtar/sheet_treatmentfile.html:52
+#: templates/ishtar/sheet_treatment.html:70
+#: templates/ishtar/sheet_treatmentfile.html:66
msgid "Associated documents"
msgstr ""
-#: templates/ishtar/sheet_treatment.html:66
-#: templates/ishtar/sheet_treatmentfile.html:57
+#: templates/ishtar/sheet_treatment.html:75
+#: templates/ishtar/sheet_treatmentfile.html:71
msgid "Administrative acts"
msgstr ""
-#: templates/ishtar/sheet_treatmentfile.html:15
+#: templates/ishtar/sheet_treatmentfile.html:24
msgctxt "Treatment request"
msgid "Closed"
msgstr ""
-#: templates/ishtar/sheet_treatmentfile.html:17
+#: templates/ishtar/sheet_treatmentfile.html:26
msgctxt "Treatment request"
msgid "Active"
msgstr ""
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 1fbd0c77d..3ad502eea 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -8,22 +8,22 @@
msgid ""
msgstr ""
-#: admin.py:90 models.py:379
+#: admin.py:90 models.py:381
msgid "Point"
msgstr ""
-#: admin.py:92 models.py:380
+#: admin.py:92 models.py:382
msgid "Multi polygon"
msgstr ""
-#: forms.py:70 forms.py:371 forms.py:1058 forms.py:1073 forms.py:1077
-#: models.py:1301 templates/ishtar/blocks/window_tables/parcels.html:10
-#: templates/ishtar/sheet_operation.html:155
+#: forms.py:71 forms.py:1081 forms.py:1097 forms.py:1103 models.py:1309
+#: templates/ishtar/blocks/window_tables/parcels.html:9
+#: templates/ishtar/sheet_operation.html:218
msgid "Parcels"
msgstr ""
-#: forms.py:73 forms.py:206 forms.py:1041 models.py:1287
-#: templates/ishtar/blocks/window_tables/parcels.html:7
+#: forms.py:74 forms.py:207 forms.py:1056 models.py:1295
+#: templates/ishtar/blocks/window_tables/parcels.html:6
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
#: templates/ishtar/dashboards/dashboard_operation.html:687
@@ -31,104 +31,109 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:75 forms.py:484 forms.py:786 forms.py:1302 models.py:288
-#: models.py:1091 models.py:1285
-#: templates/ishtar/blocks/window_tables/parcels.html:8
+#: forms.py:76 forms.py:483 forms.py:786 forms.py:1331 models.py:288
+#: models.py:1101 models.py:1293
+#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Year"
msgstr ""
-#: forms.py:78 models.py:1288
-#: templates/ishtar/blocks/window_tables/parcels.html:9
+#: forms.py:79 models.py:1296
+#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Section"
msgstr ""
-#: forms.py:81 models.py:1290
+#: forms.py:82 models.py:1298
msgid "Parcel number"
msgstr ""
-#: forms.py:83 models.py:1292 models.py:1309 models.py:1358
+#: forms.py:84 models.py:1300 models.py:1317 models.py:1366
msgid "Public domain"
msgstr ""
-#: forms.py:127
+#: forms.py:128
msgid "Town section is required."
msgstr ""
-#: forms.py:163
+#: forms.py:164
msgid "public domain"
msgstr ""
-#: forms.py:170
+#: forms.py:171
msgid "Current parcels"
msgstr ""
-#: forms.py:172
+#: forms.py:173
msgid "Deleted parcels"
msgstr ""
-#: forms.py:209
+#: forms.py:210
msgid "Full text input"
msgstr ""
-#: forms.py:211
+#: forms.py:212
msgid "example: \"2013: XD:1 to 13,24,33 to 39, YD:24\" or \"AB:24,AC:42\""
msgstr ""
-#: forms.py:365
+#: forms.py:366
msgid "There are identical parcels."
msgstr ""
-#: forms.py:380
+#: forms.py:377
msgid "Relation type"
msgstr ""
-#: forms.py:383 ishtar_menu.py:30 models.py:385 models.py:892 models.py:927
-#: models.py:969 models.py:1073 models.py:1284
-#: templates/ishtar/sheet_operation.html:4 wizards.py:351 wizards.py:362
+#: forms.py:380 ishtar_menu.py:30 models.py:387 models.py:892 models.py:929
+#: models.py:971 models.py:1083 models.py:1292
+#: templates/ishtar/sheet_operation.html:4 wizards.py:355 wizards.py:366
msgid "Operation"
msgstr ""
-#: forms.py:406
+#: forms.py:403
msgid ":"
msgstr ""
-#: forms.py:414 forms.py:637 forms.py:1266
+#: forms.py:411 forms.py:633 forms.py:1294
msgid "You should select an operation."
msgstr ""
-#: forms.py:418
+#: forms.py:415
msgid "You should select a relation type."
msgstr ""
-#: forms.py:423
+#: forms.py:420
msgid "An operation cannot be related to herself."
msgstr ""
-#: forms.py:453
+#: forms.py:450
msgid "Current relations"
msgstr ""
-#: forms.py:455
+#: forms.py:452
msgid "Deleted relations"
msgstr ""
-#: forms.py:479 templates/ishtar/sheet_operation.html:88
+#: forms.py:476 templates/ishtar/sheet_operation.html:146
msgid "Relations"
msgstr ""
-#: forms.py:483
+#: forms.py:477
+#| msgid "Operation record relations"
+msgid "Operation - 080 - Relations"
+msgstr ""
+
+#: forms.py:482 forms.py:1330
msgid "Full text search"
msgstr ""
-#: forms.py:485 forms.py:1272 models.py:289
+#: forms.py:484 forms.py:1300 models.py:289
msgid "Numeric reference"
msgstr ""
-#: forms.py:492 forms.py:1314
+#: forms.py:491 forms.py:1343
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:495 forms.py:1317 models.py:893
+#: forms.py:494 forms.py:1346 models.py:893
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -137,209 +142,219 @@ msgstr ""
msgid "Department"
msgstr ""
-#: forms.py:496 forms.py:1139 models.py:87
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
-#: templates/ishtar/sheet_operation.html:22
+#: forms.py:495 forms.py:1168 models.py:87
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
+#: templates/ishtar/sheet_operation.html:28
msgid "Name"
msgstr ""
-#: forms.py:498 forms.py:782 models.py:351
+#: forms.py:497 forms.py:784 models.py:351
msgid "Address / Locality"
msgstr ""
-#: forms.py:500 forms.py:704 forms.py:784 forms.py:1279 models.py:296
+#: forms.py:499 forms.py:703 forms.py:780 forms.py:1307 models.py:296
msgid "Operation type"
msgstr ""
-#: forms.py:502
+#: forms.py:501
msgid "Is open?"
msgstr ""
-#: forms.py:510 forms.py:816 models.py:281
+#: forms.py:509 forms.py:816 models.py:281
msgid "In charge"
msgstr ""
-#: forms.py:517 models.py:1067
+#: forms.py:516 models.py:1077
msgid "Scientist in charge"
msgstr ""
-#: forms.py:519 forms.py:706 forms.py:806 models.py:279
+#: forms.py:518 forms.py:705 forms.py:806 models.py:279
msgid "Operator"
msgstr ""
-#: forms.py:528 forms.py:1144 models.py:91 models.py:298
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
+#: forms.py:527 forms.py:1173 models.py:91 models.py:298
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Remains"
msgstr ""
-#: forms.py:529 forms.py:1122 forms.py:1141 models.py:89 models.py:304
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
+#: forms.py:528 forms.py:1151 forms.py:1170 models.py:89 models.py:304
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Periods"
msgstr ""
-#: forms.py:530
+#: forms.py:529
msgid "Started before"
msgstr ""
-#: forms.py:532
+#: forms.py:530
msgid "Started after"
msgstr ""
-#: forms.py:534
+#: forms.py:531
msgid "Ended before"
msgstr ""
-#: forms.py:536
+#: forms.py:532
msgid "Ended after"
msgstr ""
-#: forms.py:539
+#: forms.py:534
msgid "Search within relations"
msgstr ""
-#: forms.py:541 forms.py:868
+#: forms.py:536 forms.py:864
msgid "Comment"
msgstr ""
-#: forms.py:542
+#: forms.py:537
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:544 forms.py:871 models.py:354
+#: forms.py:539 forms.py:867 models.py:354
msgid "Comment about scientific documentation"
msgstr ""
-#: forms.py:545 forms.py:873 models.py:366
+#: forms.py:540 forms.py:869 models.py:368
msgid "Record quality"
msgstr ""
-#: forms.py:546 forms.py:838 models.py:316
+#: forms.py:541 forms.py:835 models.py:316
msgid "Report processing"
msgstr ""
-#: forms.py:548 forms.py:876 models.py:361
+#: forms.py:543 forms.py:872 models.py:363
msgid "Virtual operation"
msgstr ""
-#: forms.py:550 forms.py:1184 forms.py:1188 models.py:95
+#: forms.py:545 forms.py:1208 forms.py:1212 models.py:95
msgid "Archaeological site"
msgstr ""
-#: forms.py:556 forms.py:1321
+#: forms.py:551 forms.py:1350
msgid "Created by"
msgstr ""
-#: forms.py:562 forms.py:1327
+#: forms.py:557 forms.py:1356
msgid "Modified by"
msgstr ""
-#: forms.py:569
+#: forms.py:564
msgid "Documentation deadline before"
msgstr ""
-#: forms.py:571
+#: forms.py:566
msgid "Documentation deadline after"
msgstr ""
-#: forms.py:573 forms.py:861 models.py:373
+#: forms.py:568 forms.py:857 models.py:375
msgid "Documentation received"
msgstr ""
-#: forms.py:575
+#: forms.py:570
msgid "Finds deadline before"
msgstr ""
-#: forms.py:577
+#: forms.py:572
msgid "Finds deadline after"
msgstr ""
-#: forms.py:579 forms.py:866 models.py:377
+#: forms.py:574 forms.py:862 models.py:379
msgid "Finds received"
msgstr ""
-#: forms.py:624 forms.py:1264 views.py:163
+#: forms.py:620 forms.py:1292 views.py:165
msgid "Operation search"
msgstr ""
-#: forms.py:668
+#: forms.py:664
msgid "Associated file"
msgstr ""
-#: forms.py:672 forms.py:974 models.py:537 models.py:968 models.py:1078
-#: wizards.py:79
+#: forms.py:668 forms.py:978 models.py:537 models.py:970 models.py:1088
+#: wizards.py:80
msgid "Archaeological file"
msgstr ""
-#: forms.py:679 forms.py:681 models.py:368
+#: forms.py:675 forms.py:679 models.py:370
msgid "Abstract"
msgstr ""
-#: forms.py:684
+#: forms.py:676
+#| msgid "Operation search"
+msgid "Operation - 090 - Abstract"
+msgstr ""
+
+#: forms.py:683
msgid "months"
msgstr ""
-#: forms.py:684
+#: forms.py:683
msgid "years"
msgstr ""
-#: forms.py:686 models.py:265
+#: forms.py:685 models.py:265
msgid "Creation date"
msgstr ""
-#: forms.py:687
+#: forms.py:686
msgid "Start of field work"
msgstr ""
-#: forms.py:689
+#: forms.py:688
msgid "All"
msgstr ""
-#: forms.py:690
+#: forms.py:689
msgid "Preventive"
msgstr ""
-#: forms.py:691
+#: forms.py:690
msgid "Research"
msgstr ""
-#: forms.py:695
+#: forms.py:694
msgid "Slicing"
msgstr ""
-#: forms.py:698
+#: forms.py:697
msgid "Department detail"
msgstr ""
-#: forms.py:700
+#: forms.py:699
msgid "Date get from"
msgstr ""
-#: forms.py:702
+#: forms.py:701
msgid "Preventive/Research"
msgstr ""
-#: forms.py:708
+#: forms.py:707
msgid "Date after"
msgstr ""
-#: forms.py:710
+#: forms.py:708
msgid "Date before"
msgstr ""
-#: forms.py:712
+#: forms.py:709
msgid "With reports"
msgstr ""
-#: forms.py:713
+#: forms.py:710
msgid "With finds"
msgstr ""
-#: forms.py:765 forms.py:1375 templates/ishtar/sheet_administrativeact.html:20
-#: templates/ishtar/sheet_operation.html:26
+#: forms.py:762 forms.py:1405 templates/ishtar/sheet_administrativeact.html:23
+#: templates/ishtar/sheet_operation.html:36
msgid "General"
msgstr ""
-#: forms.py:780 models.py:350
+#: forms.py:763
+#| msgid "Operation year"
+msgid "Operation - 010 - General"
+msgstr ""
+
+#: forms.py:782 models.py:350
msgid "Generic name"
msgstr ""
@@ -359,236 +374,287 @@ msgstr ""
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:831 models.py:55 models.py:268 models.py:1500
+#: forms.py:830 models.py:55 models.py:268 models.py:1503
msgid "Start date"
msgstr ""
-#: forms.py:833 models.py:270
+#: forms.py:831 models.py:270
msgid "Excavation end date"
msgstr ""
-#: forms.py:836 models.py:271
+#: forms.py:833 models.py:271
msgid "Report delivery date"
msgstr ""
-#: forms.py:858 models.py:370
+#: forms.py:854 models.py:372
msgid "Deadline for submission of the documentation"
msgstr ""
-#: forms.py:863 models.py:375
+#: forms.py:859 models.py:377
msgid "Deadline for submission of the finds"
msgstr ""
-#: forms.py:878
+#: forms.py:874
msgid "Image"
msgstr ""
-#: forms.py:879
+#: forms.py:875
#, python-format
msgid ""
" Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms.py:927
+#: forms.py:928
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
-#: forms.py:932
+#: forms.py:933
msgid "The excavation end date cannot be before the start date."
msgstr ""
-#: forms.py:960
+#: forms.py:964
#, python-format
msgid ""
"Operation code already exists for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:964
+#: forms.py:968
msgid "Bad operation code"
msgstr ""
-#: forms.py:970 models.py:552 models.py:922
+#: forms.py:974 models.py:552 models.py:922
msgid "Operation code"
msgstr ""
-#: forms.py:999 forms.py:1003 models.py:285
+#: forms.py:1004 forms.py:1011 models.py:285
msgid "Collaborators"
msgstr ""
-#: forms.py:1011
+#: forms.py:1005
+msgid "Operation - 020 - Collaborators"
+msgstr ""
+
+#: forms.py:1020
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:1012 models.py:302
+#: forms.py:1021
+msgid "Operation - 033 - Preventive - Excavation"
+msgstr ""
+
+#: forms.py:1024 models.py:302
#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr ""
-#: forms.py:1013 models.py:307
+#: forms.py:1025 models.py:307
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:1015 models.py:310
+#: forms.py:1027 models.py:310
msgid "Optional man-days"
msgstr ""
-#: forms.py:1017 models.py:313
+#: forms.py:1029 models.py:313
msgid "Effective man-days"
msgstr ""
-#: forms.py:1027
+#: forms.py:1039
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:1030 models.py:333
+#: forms.py:1040
+msgid "Operation - 037 - Preventive - Diagnostic"
+msgstr ""
+
+#: forms.py:1045 models.py:333
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:1032 models.py:336
+#: forms.py:1047 models.py:336
msgid "Prescription on large area"
msgstr ""
-#: forms.py:1035 models.py:338
+#: forms.py:1050 models.py:338
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:1039 forms.py:1054 models.py:300 models.py:1101
+#: forms.py:1054 forms.py:1070 forms.py:1075 models.py:300 models.py:1111
msgid "Towns"
msgstr ""
-#: forms.py:1061 models.py:1300 models.py:1498
+#: forms.py:1071
+#| msgid "Operation's town"
+msgid "Operation - 040 - Towns"
+msgstr ""
+
+#: forms.py:1076
+#| msgid "Operation's town"
+msgid "Operation - 040 - Towns (2)"
+msgstr ""
+
+#: forms.py:1084 models.py:1308 models.py:1501
msgid "Parcel"
msgstr ""
-#: forms.py:1106 models.py:47
+#: forms.py:1098
+#| msgid "Operation search"
+msgid "Operation - 050 - Parcels"
+msgstr ""
+
+#: forms.py:1105
+msgid "Operation - 050 - Parcels (2)"
+msgstr ""
+
+#: forms.py:1135 models.py:47
msgid "Remain types"
msgstr ""
-#: forms.py:1110 models.py:46
+#: forms.py:1136
+#| msgid "Operation record relations"
+msgid "Operation - 060 - Remains"
+msgstr ""
+
+#: forms.py:1142 models.py:46
msgid "Remain type"
msgstr ""
-#: forms.py:1126 templates/ishtar/sheet_operation.html:175
-#: templates/ishtar/sheet_operation.html:206
+#: forms.py:1152
+#| msgid "Operation code"
+msgid "Operation - 070 - Periods"
+msgstr ""
+
+#: forms.py:1158 templates/ishtar/sheet_operation.html:241
+#: templates/ishtar/sheet_operation.html:278
msgid "Period"
msgstr ""
-#: forms.py:1138 models.py:86
+#: forms.py:1167 models.py:86
msgid "Reference"
msgstr ""
-#: forms.py:1167
+#: forms.py:1191
msgid "This reference already exists."
msgstr ""
-#: forms.py:1199 models.py:96 models.py:358
-#: templates/ishtar/sheet_operation.html:99
+#: forms.py:1223 models.py:96 models.py:360
+#: templates/ishtar/sheet_operation.html:162
msgid "Archaeological sites"
msgstr ""
-#: forms.py:1203
+#: forms.py:1225
+#| msgid "Archaeological sites"
+msgid "Operation - 030 - Archaeological sites"
+msgstr ""
+
+#: forms.py:1230
msgid "Associated archaeological sites"
msgstr ""
-#: forms.py:1209 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
+#: forms.py:1236 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
msgid "Search"
msgstr ""
-#: forms.py:1214
+#: forms.py:1241
msgid "Would you like to close this operation?"
msgstr ""
-#: forms.py:1219
+#: forms.py:1246
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1228 forms.py:1303 forms.py:1442 models.py:929 models.py:1058
+#: forms.py:1255 forms.py:1332 forms.py:1472 models.py:931 models.py:1068
msgid "Index"
msgstr ""
-#: forms.py:1258
+#: forms.py:1285
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1270
+#: forms.py:1298
msgid "Operation's year"
msgstr ""
-#: forms.py:1278
+#: forms.py:1306
msgid "Operation's town"
msgstr ""
-#: forms.py:1291
+#: forms.py:1319
msgid "Documentation search"
msgstr ""
-#: forms.py:1293
+#: forms.py:1321
msgid "You should select a document."
msgstr ""
-#: forms.py:1311 forms.py:1378 models.py:982 models.py:1052
+#: forms.py:1340 forms.py:1411 models.py:984 models.py:1062
msgid "Act type"
msgstr ""
-#: forms.py:1312 forms.py:1512
+#: forms.py:1341 forms.py:1542
msgid "Indexed?"
msgstr ""
-#: forms.py:1318 forms.py:1383 models.py:1092
-#: templates/ishtar/blocks/window_tables/administrativacts.html:10
+#: forms.py:1347 forms.py:1416 models.py:1102
+#: templates/ishtar/blocks/window_tables/administrativacts.html:9
msgid "Object"
msgstr ""
-#: forms.py:1355 views.py:349
+#: forms.py:1385 views.py:353
msgid "Administrative act search"
msgstr ""
-#: forms.py:1370 forms.py:1470 forms.py:1537
+#: forms.py:1400 forms.py:1500 forms.py:1567
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1386 models.py:1089
+#: forms.py:1406
+#| msgid "Operation: administrative act deletion"
+msgid "Operation - Administrative act - General"
+msgstr ""
+
+#: forms.py:1419 models.py:1099
msgid "Signature date"
msgstr ""
-#: forms.py:1430
+#: forms.py:1460
#, python-format
msgid ""
"This index already exists for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1434
+#: forms.py:1464
msgid "Bad index"
msgstr ""
-#: forms.py:1447
+#: forms.py:1477
msgid "Would you like to delete this administrative act?"
msgstr ""
-#: forms.py:1452
+#: forms.py:1482
msgid "Template"
msgstr ""
-#: forms.py:1476 forms.py:1480
+#: forms.py:1506 forms.py:1510
msgid "This document is not intended for this type of act."
msgstr ""
-#: forms.py:1498
+#: forms.py:1528
msgid "Doc generation"
msgstr ""
-#: forms.py:1500
+#: forms.py:1530
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1521 ishtar_menu.py:123 views.py:402
+#: forms.py:1551 ishtar_menu.py:123 views.py:406
msgctxt "admin act register"
msgid "Register"
msgstr ""
@@ -609,7 +675,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:59 models.py:1108
+#: ishtar_menu.py:59 models.py:1118
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
@@ -634,16 +700,16 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:139 models.py:386
+#: ishtar_menu.py:139 models.py:388
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr ""
-#: models.py:54 models.py:72 models.py:1978
+#: models.py:54 models.py:72 models.py:1981
msgid "Order"
msgstr ""
-#: models.py:56 models.py:1501
+#: models.py:56 models.py:1504
msgid "End date"
msgstr ""
@@ -731,7 +797,7 @@ msgstr ""
msgid "Archaeological sites (reference)"
msgstr ""
-#: models.py:267 templates/ishtar/sheet_operation.html:39
+#: models.py:267 templates/ishtar/sheet_operation.html:57
msgid "Closing date"
msgstr ""
@@ -739,7 +805,7 @@ msgstr ""
msgid "In charge scientist"
msgstr ""
-#: models.py:293 models.py:1280
+#: models.py:293 models.py:1288
msgid "File"
msgstr ""
@@ -752,15 +818,20 @@ msgid "General comment"
msgstr ""
#: models.py:355
+#| msgid "Image"
+msgid "Images"
+msgstr ""
+
+#: models.py:357
msgid "Cached name"
msgstr ""
-#: models.py:363
+#: models.py:365
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
-#: models.py:422
+#: models.py:424
msgid "OPE"
msgstr ""
@@ -834,176 +905,176 @@ msgstr ""
msgid "Document code"
msgstr ""
-#: models.py:933
+#: models.py:935
msgid "Operation documentation"
msgstr ""
-#: models.py:934
+#: models.py:936
msgid "Operation documentations"
msgstr ""
-#: models.py:937
+#: models.py:939
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:939
+#: models.py:941
msgid "Can view own Operation source"
msgstr ""
-#: models.py:941
+#: models.py:943
msgid "Can add own Operation source"
msgstr ""
-#: models.py:943
+#: models.py:945
msgid "Can change own Operation source"
msgstr ""
-#: models.py:945
+#: models.py:947
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:970 models.py:1083
+#: models.py:972 models.py:1093
msgid "Treatment request"
msgstr ""
-#: models.py:971 models.py:1088
+#: models.py:973 models.py:1098
msgid "Treatment"
msgstr ""
-#: models.py:973
+#: models.py:975
msgid "Intended to"
msgstr ""
-#: models.py:975
+#: models.py:977
msgid "Code"
msgstr ""
-#: models.py:978
+#: models.py:980
msgid "Associated template"
msgstr ""
-#: models.py:979
+#: models.py:981
msgid "Indexed"
msgstr ""
-#: models.py:983
+#: models.py:985
msgid "Act types"
msgstr ""
-#: models.py:1049 models.py:1129
-#: templates/ishtar/blocks/window_tables/administrativacts.html:7
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
+#: models.py:1053 models.py:1139
+#: templates/ishtar/blocks/window_tables/administrativacts.html:6
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Ref."
msgstr ""
-#: models.py:1056
+#: models.py:1066
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:1062
+#: models.py:1072
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:1070
+#: models.py:1080
msgid "Signatory"
msgstr ""
-#: models.py:1098
+#: models.py:1108
msgid "Departments"
msgstr ""
-#: models.py:1099
+#: models.py:1109
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:1102
+#: models.py:1112
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:1109 templates/ishtar/sheet_operation.html:107
-#: templates/ishtar/sheet_operation.html:149
+#: models.py:1119 templates/ishtar/sheet_operation.html:170
+#: templates/ishtar/sheet_operation.html:212
msgid "Administrative acts"
msgstr ""
-#: models.py:1223
+#: models.py:1233
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1293
+#: models.py:1301
msgid "External ID"
msgstr ""
-#: models.py:1296
+#: models.py:1304
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1297
+#: models.py:1305
msgid "Address - Locality"
msgstr ""
-#: models.py:1496
+#: models.py:1499
msgid "Owner"
msgstr ""
-#: models.py:1504
+#: models.py:1507
msgid "Parcel owner"
msgstr ""
-#: models.py:1505
+#: models.py:1508
msgid "Parcel owners"
msgstr ""
-#: models.py:1539
+#: models.py:1542
msgid "Recorded"
msgstr ""
-#: models.py:1540
+#: models.py:1543
msgid "Effective"
msgstr ""
-#: models.py:1541
+#: models.py:1544
msgid "Active"
msgstr ""
-#: models.py:1542
+#: models.py:1545
msgid "Field completed"
msgstr ""
-#: models.py:1543
+#: models.py:1546
msgid "Associated report"
msgstr ""
-#: models.py:1544
+#: models.py:1547
msgid "Closed"
msgstr ""
-#: models.py:1545
+#: models.py:1548
msgid "Documented and closed"
msgstr ""
-#: models.py:1979
+#: models.py:1982
msgid "Is preventive"
msgstr ""
-#: models.py:1982
+#: models.py:1985
msgid "Operation type old"
msgstr ""
-#: models.py:1983
+#: models.py:1986
msgid "Operation types old"
msgstr ""
-#: templates/ishtar/blocks/window_tables/administrativacts.html:8
-#: templates/ishtar/sheet_operation.html:167
-#: templates/ishtar/sheet_operation.html:221
+#: templates/ishtar/blocks/window_tables/administrativacts.html:7
+#: templates/ishtar/sheet_operation.html:231
+#: templates/ishtar/sheet_operation.html:295
msgid "Type"
msgstr ""
-#: templates/ishtar/blocks/window_tables/administrativacts.html:9
+#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Date"
msgstr ""
-#: templates/ishtar/blocks/window_tables/administrativacts.html:20
+#: templates/ishtar/blocks/window_tables/administrativacts.html:21
msgid "No administrative act associated"
msgstr ""
@@ -1011,7 +1082,7 @@ msgstr ""
msgid "No archaeological site associated"
msgstr ""
-#: templates/ishtar/blocks/window_tables/parcels.html:22
+#: templates/ishtar/blocks/window_tables/parcels.html:23
msgid "No parcel"
msgstr ""
@@ -1039,12 +1110,12 @@ msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:463
#: templates/ishtar/dashboards/dashboard_operation.html:687
-#: templates/ishtar/sheet_operation.html:167
-#: templates/ishtar/sheet_operation.html:175
-#: templates/ishtar/sheet_operation.html:190
-#: templates/ishtar/sheet_operation.html:198
-#: templates/ishtar/sheet_operation.html:206
-#: templates/ishtar/sheet_operation.html:221
+#: templates/ishtar/sheet_operation.html:231
+#: templates/ishtar/sheet_operation.html:241
+#: templates/ishtar/sheet_operation.html:258
+#: templates/ishtar/sheet_operation.html:268
+#: templates/ishtar/sheet_operation.html:278
+#: templates/ishtar/sheet_operation.html:295
msgid "Number"
msgstr ""
@@ -1070,6 +1141,7 @@ msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:479
#: templates/ishtar/dashboards/dashboard_operation.html:499
#: templates/ishtar/dashboards/dashboard_operation.html:623
+#: templates/ishtar/sheet_operation.html:49
msgid "State"
msgstr ""
@@ -1232,7 +1304,7 @@ msgid "area by organization by realisation year"
msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:670
-#: templates/ishtar/sheet_operation.html:42
+#: templates/ishtar/sheet_operation.html:74
msgid "Cost"
msgstr ""
@@ -1244,110 +1316,106 @@ msgstr ""
msgid "main towns by cost"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:36
-#: templates/ishtar/sheet_operation.html:41
+#: templates/ishtar/sheet_administrativeact.html:40
+#: templates/ishtar/sheet_operation.html:66
msgid "Surface"
msgstr ""
-#: templates/ishtar/sheet_operation.html:14
-msgid "This operation is virtual."
-msgstr ""
-
-#: templates/ishtar/sheet_operation.html:17
-msgid "Patriarche OA code not yet recorded!"
-msgstr ""
-
-#: templates/ishtar/sheet_operation.html:23
+#: templates/ishtar/sheet_operation.html:29
msgid "Address"
msgstr ""
-#: templates/ishtar/sheet_operation.html:30
+#: templates/ishtar/sheet_operation.html:41
msgid "Begining date"
msgstr ""
-#: templates/ishtar/sheet_operation.html:37
-msgid "State:"
-msgstr ""
-
-#: templates/ishtar/sheet_operation.html:37
+#: templates/ishtar/sheet_operation.html:51
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_operation.html:38
+#: templates/ishtar/sheet_operation.html:52
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:39
+#: templates/ishtar/sheet_operation.html:59
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_operation.html:43
+#: templates/ishtar/sheet_operation.html:82
msgid "Duration"
msgstr ""
-#: templates/ishtar/sheet_operation.html:43
-msgid "Day"
+#: templates/ishtar/sheet_operation.html:84
+msgid "days"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:124
+msgid "This operation is virtual."
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:130
+msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_operation.html:78
+#: templates/ishtar/sheet_operation.html:136
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:103
+#: templates/ishtar/sheet_operation.html:166
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_operation.html:111
+#: templates/ishtar/sheet_operation.html:174
msgid "Document from this operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:117
-#: templates/ishtar/sheet_operation.html:160
+#: templates/ishtar/sheet_operation.html:180
+#: templates/ishtar/sheet_operation.html:223
msgid "Context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:122
+#: templates/ishtar/sheet_operation.html:185
msgid "Context record relations"
msgstr ""
-#: templates/ishtar/sheet_operation.html:127
+#: templates/ishtar/sheet_operation.html:190
msgid "Documents from associated context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:132
-#: templates/ishtar/sheet_operation.html:183
+#: templates/ishtar/sheet_operation.html:195
+#: templates/ishtar/sheet_operation.html:250
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:137
+#: templates/ishtar/sheet_operation.html:200
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:142
+#: templates/ishtar/sheet_operation.html:205
msgid "Associated containers"
msgstr ""
-#: templates/ishtar/sheet_operation.html:146
+#: templates/ishtar/sheet_operation.html:209
msgid "Statistics"
msgstr ""
-#: templates/ishtar/sheet_operation.html:147
+#: templates/ishtar/sheet_operation.html:210
msgid "These numbers are updated hourly"
msgstr ""
-#: templates/ishtar/sheet_operation.html:190
+#: templates/ishtar/sheet_operation.html:258
msgid "Material type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:198
+#: templates/ishtar/sheet_operation.html:268
msgid "Object type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:214
+#: templates/ishtar/sheet_operation.html:287
msgid "Sources"
msgstr ""
-#: templates/ishtar/sheet_operation.html:230
+#: templates/ishtar/sheet_operation.html:305
msgid "Finds by context records"
msgstr ""
@@ -1363,55 +1431,55 @@ msgstr ""
msgid "This act is indexed!"
msgstr ""
-#: views.py:219
+#: views.py:223
msgid "New operation"
msgstr ""
-#: views.py:264
+#: views.py:268
msgid "Operation modification"
msgstr ""
-#: views.py:292
+#: views.py:296
msgid "Operation closing"
msgstr ""
-#: views.py:303
+#: views.py:307
msgid "Operation deletion"
msgstr ""
-#: views.py:308
+#: views.py:312
msgid "Operation: source search"
msgstr ""
-#: views.py:316
+#: views.py:320
msgid "Operation: source creation"
msgstr ""
-#: views.py:328
+#: views.py:332
msgid "Operation: source modification"
msgstr ""
-#: views.py:343
+#: views.py:347
msgid "Operation: source deletion"
msgstr ""
-#: views.py:362
+#: views.py:366
msgid "Operation: new administrative act"
msgstr ""
-#: views.py:372
+#: views.py:376
msgid "Operation: administrative act modification"
msgstr ""
-#: views.py:396
+#: views.py:400
msgid "Operation: administrative act deletion"
msgstr ""
-#: widgets.py:56
+#: widgets.py:59
msgid "Add"
msgstr ""
-#: wizards.py:202
+#: wizards.py:206
msgid ""
"Warning: No Archaeological File is provided. If you have forget it return to "
"the first step."
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index 323978feb..984138a94 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -5,160 +5,182 @@
# Valérie-Emma Leroux Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms.py:215
+#: forms.py:222
msgid "ID"
msgstr ""
-#: forms.py:237
+#: forms.py:244
msgid "This ID already exists for this warehouse."
msgstr ""
-#: forms.py:255 forms.py:261 views.py:142
+#: forms.py:264 forms.py:270 views.py:142
msgid "Container search"
msgstr ""
-#: forms.py:257 forms.py:263
+#: forms.py:266 forms.py:272
msgid "You should select a container."
msgstr ""
-#: forms.py:258
+#: forms.py:267
msgid "Add a new container"
msgstr ""
-#: forms.py:268 ishtar_menu.py:36 views.py:95
+#: forms.py:277 ishtar_menu.py:36 views.py:95
msgid "Packaging"
msgstr ""
-#: forms.py:274
+#: forms.py:283
msgid "Packager"
msgstr ""
-#: forms.py:280
+#: forms.py:289
msgid "Date"
msgstr ""
-#: forms.py:284
+#: forms.py:293
msgid "Packaged finds"
msgstr ""
-#: forms.py:288 models.py:296
+#: forms.py:297
+#| msgid "Container localisation"
+msgid "Container - 020 - Localisation"
+msgstr ""
+
+#: forms.py:299 models.py:302
msgid "Localisation"
msgstr ""
-#: forms.py:313 forms.py:314
+#: forms.py:324 forms.py:325
msgid "Would you like to delete this container?"
msgstr ""
@@ -182,8 +204,8 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:57 models.py:309 templates/ishtar/sheet_warehouse.html:23
-#: templates/ishtar/sheet_warehouse.html:56
+#: ishtar_menu.py:57 models.py:315 templates/ishtar/sheet_warehouse.html:37
+#: templates/ishtar/sheet_warehouse.html:66
msgid "Containers"
msgstr ""
@@ -191,115 +213,115 @@ msgstr ""
msgid "Warehouse types"
msgstr ""
-#: models.py:61 models.py:303
+#: models.py:61 models.py:309
msgid "External ID"
msgstr ""
-#: models.py:63 models.py:305
+#: models.py:63 models.py:311
msgid "External ID is set automatically"
msgstr ""
-#: models.py:69
+#: models.py:71
msgid "Warehouses"
msgstr ""
-#: models.py:206
+#: models.py:208
msgid "Description"
msgstr ""
-#: models.py:211 models.py:212
+#: models.py:213 models.py:214
msgid "Collection"
msgstr ""
-#: models.py:221
+#: models.py:223
msgid "Warehouse division type"
msgstr ""
-#: models.py:222
+#: models.py:224
msgid "Warehouse division types"
msgstr ""
-#: models.py:244
+#: models.py:246
msgid "Length (mm)"
msgstr ""
-#: models.py:245
+#: models.py:247
msgid "Width (mm)"
msgstr ""
-#: models.py:246
+#: models.py:248
msgid "Height (mm)"
msgstr ""
-#: models.py:247
+#: models.py:249
msgid "Volume (l)"
msgstr ""
-#: models.py:252
+#: models.py:254
msgid "Container types"
msgstr ""
-#: models.py:279
+#: models.py:285
msgid "Location - index"
msgstr ""
-#: models.py:280
+#: models.py:286
msgid "Precise localisation"
msgstr ""
-#: models.py:281
+#: models.py:287
msgid "Type"
msgstr ""
-#: models.py:287
+#: models.py:293
msgid "Location (warehouse)"
msgstr ""
-#: models.py:294
+#: models.py:300
msgid "Container ref."
msgstr ""
-#: models.py:298
+#: models.py:304
msgid "Cached location"
msgstr ""
-#: models.py:528
+#: models.py:534
msgid "Reference"
msgstr ""
-#: models.py:531
+#: models.py:537
msgid "Container localisation"
msgstr ""
-#: models.py:532
+#: models.py:538
msgid "Container localisations"
msgstr ""
-#: templates/ishtar/sheet_container.html:30
+#: templates/ishtar/sheet_container.html:40
msgid "Content"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:28
+#: templates/ishtar/sheet_warehouse.html:42
msgid "Attached containers"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:32
+#: templates/ishtar/sheet_warehouse.html:46
msgid "Statistics"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:33
+#: templates/ishtar/sheet_warehouse.html:47
msgid "These numbers are updated hourly"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:35
+#: templates/ishtar/sheet_warehouse.html:49
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:42
+#: templates/ishtar/sheet_warehouse.html:56
msgid "Finds by location in the warehouse"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:62
+#: templates/ishtar/sheet_warehouse.html:72
msgid "Containers by location in the warehouse"
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 750d36161..5fbb973e5 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -17,34 +17,49 @@ msgstr ""
msgid "email address"
msgstr ""
-#: __init__.py:10 templates/ishtar/sheet_source.html:8
+#: __init__.py:10 templates/ishtar/sheet_source.html:20
msgid "Related item"
msgstr ""
-#: admin.py:82
+#: admin.py:100
msgid "Export selected as CSV file"
msgstr ""
-#: admin.py:190 admin.py:209 models.py:774
+#: admin.py:212 admin.py:231 models.py:775
msgid "Parent"
msgstr ""
-#: admin.py:197
+#: admin.py:219
msgid "Center"
msgstr ""
-#: admin.py:199 models.py:2727
+#: admin.py:221 models.py:2888
msgid "Limit"
msgstr ""
-#: admin.py:202 models.py:2737
+#: admin.py:224 models.py:2898
msgid "Town children"
msgstr ""
-#: admin.py:210
+#: admin.py:232
msgid "Parents"
msgstr ""
+#: admin.py:482 models.py:1647
+#| msgid "Format"
+msgid "Form"
+msgstr ""
+
+#: admin.py:484 models.py:1672 models_imports.py:117
+#: templates/ishtar/dashboards/dashboard_main.html:39
+msgid "Users"
+msgstr ""
+
+#: admin.py:504 models.py:1716
+#| msgid "field"
+msgid "Field"
+msgstr ""
+
#: apps.py:9 apps.py:10
msgid "Ishtar administration"
msgstr ""
@@ -196,45 +211,45 @@ msgstr ""
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
-#: forms.py:74
+#: forms.py:75
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr ""
-#: forms.py:90 forms_common.py:712
+#: forms.py:91 forms_common.py:722
msgid "Confirm"
msgstr ""
-#: forms.py:95
+#: forms.py:96
msgid "Are you sure you want to delete?"
msgstr ""
-#: forms.py:129
+#: forms.py:215
msgid "There are identical items."
msgstr ""
-#: forms.py:179 forms.py:180
+#: forms.py:290 forms.py:291
msgid "Closing date"
msgstr ""
-#: forms.py:193
+#: forms.py:303
msgid "You should select an item."
msgstr ""
-#: forms.py:194
+#: forms.py:304
msgid "Add a new item"
msgstr ""
-#: forms.py:308 models.py:1862
+#: forms.py:442 models.py:1956
msgid "Template"
msgstr ""
-#: forms_common.py:41 forms_common.py:59 forms_common.py:270
-#: forms_common.py:494 models.py:1993 models.py:2744
+#: forms_common.py:42 forms_common.py:60 forms_common.py:272
+#: forms_common.py:501 models.py:2087 models.py:2905
#: templates/blocks/JQueryAdvancedTown.html:19
msgid "Town"
msgstr ""
-#: forms_common.py:43
+#: forms_common.py:44
msgid ""
" Type name, department code of the town you would like to select. The "
"search is insensitive to case. Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms_common.py:913 forms_common.py:942 forms_common.py:977 models.py:2590
+#: forms_common.py:929 forms_common.py:958 forms_common.py:993 models.py:2701
#: templates/ishtar/wizard/wizard_person_deletion.html:139
msgid "Author"
msgstr ""
-#: forms_common.py:923
+#: forms_common.py:939
msgid "Additional informations"
msgstr ""
-#: forms_common.py:934
+#: forms_common.py:950
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:950 models.py:2577 models.py:2587 models_imports.py:600
+#: forms_common.py:966 models.py:2685 models.py:2697 models_imports.py:600
msgid "Author type"
msgstr ""
-#: forms_common.py:969
+#: forms_common.py:985
msgid "Author selection"
msgstr ""
-#: forms_common.py:984
+#: forms_common.py:1000
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:988 models.py:2591 models.py:2653
-#: templates/ishtar/blocks/window_tables/documents.html:9
-#: templates/sheet_ope.html:106
+#: forms_common.py:1004 forms_common.py:1005 models.py:2702 models.py:2770
+#: models.py:2840 templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
msgstr ""
-#: ishtar_menu.py:29
+#: ishtar_menu.py:29 templates/registration/activation_complete.html:10
+msgid "Home"
+msgstr ""
+
+#: ishtar_menu.py:30
msgid "Administration"
msgstr ""
-#: ishtar_menu.py:33
+#: ishtar_menu.py:34
msgid "Addition/modification"
msgstr ""
-#: ishtar_menu.py:36 ishtar_menu.py:70 ishtar_menu.py:101
+#: ishtar_menu.py:37 ishtar_menu.py:71 ishtar_menu.py:102
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:39 models.py:1640 views.py:1684
+#: ishtar_menu.py:40 models.py:1731 views.py:1748
msgid "Global variables"
msgstr ""
-#: ishtar_menu.py:44
+#: ishtar_menu.py:45
msgid "Directory"
msgstr ""
-#: ishtar_menu.py:50 ishtar_menu.py:78 templates/blocks/JQueryJqGrid.html:3
+#: ishtar_menu.py:51 ishtar_menu.py:79 templates/blocks/DataTables.html:6
+#: templates/blocks/JQueryJqGrid.html:6
msgid "Search"
msgstr ""
-#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15
+#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_list.html:19
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:58 ishtar_menu.py:88
+#: ishtar_menu.py:59 ishtar_menu.py:89
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:62 ishtar_menu.py:93
+#: ishtar_menu.py:63 ishtar_menu.py:94
msgid "Automatic merge"
msgstr ""
-#: ishtar_menu.py:66 ishtar_menu.py:97
+#: ishtar_menu.py:67 ishtar_menu.py:98
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:109 models_imports.py:800
+#: ishtar_menu.py:110 models_imports.py:802
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:112 views.py:1692
+#: ishtar_menu.py:113 views.py:1756
msgid "New import"
msgstr ""
-#: ishtar_menu.py:116 views.py:1711
+#: ishtar_menu.py:117 views.py:1775
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:120 views.py:1750
+#: ishtar_menu.py:121 views.py:1814
msgid "Old imports"
msgstr ""
-#: models.py:227
+#: models.py:228
msgid "Not a valid item."
msgstr ""
-#: models.py:242
+#: models.py:243
msgid "A selected item is not a valid item."
msgstr ""
-#: models.py:253
+#: models.py:254
msgid "This item already exists."
msgstr ""
-#: models.py:428 models.py:1953 models.py:1969 models.py:2547
+#: models.py:429 models.py:2047 models.py:2063 models.py:2655
#: models_imports.py:339
msgid "Label"
msgstr ""
-#: models.py:430
+#: models.py:431
msgid "Textual ID"
msgstr ""
-#: models.py:433
+#: models.py:434
msgid ""
"The slug is the standardized version of the name. It contains only lowercase "
"letters, numbers and hyphens. Each slug must be unique."
msgstr ""
-#: models.py:437 models.py:1865 models.py:2550 models_imports.py:129
-#: models_imports.py:509
+#: models.py:438 models.py:1648 models.py:1959 models.py:2658
+#: models_imports.py:129 models_imports.py:509
msgid "Available"
msgstr ""
-#: models.py:789 models.py:933 models_imports.py:530
+#: models.py:790 models.py:935 models_imports.py:530
#: templates/ishtar/formset_import_match.html:21
msgid "Key"
msgstr ""
-#: models.py:795
+#: models.py:796
msgid "Specific key to an import"
msgstr ""
-#: models.py:918 models.py:939 models.py:1318 models.py:2574 models.py:2844
-#: models.py:2901
+#: models.py:920 models.py:941 models.py:1330 models.py:2682 models.py:3005
+#: models.py:3064
msgid "Order"
msgstr ""
-#: models.py:921
+#: models.py:923
msgid "Json data - Menu"
msgstr ""
-#: models.py:922
+#: models.py:924
msgid "Json data - Menus"
msgstr ""
-#: models.py:934
+#: models.py:936
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
"explain it. For instance for the key 'my_subkey' with data such as "
@@ -709,577 +733,652 @@ msgid ""
"my_key__my_subkey."
msgstr ""
-#: models.py:938
+#: models.py:940
msgid "Display"
msgstr ""
-#: models.py:943
+#: models.py:945
msgid "Json data - Field"
msgstr ""
-#: models.py:944
+#: models.py:946
msgid "Json data - Fields"
msgstr ""
-#: models.py:955
+#: models.py:957
msgid "Content types of the field and of the menu do not match"
msgstr ""
-#: models.py:1015
+#: models.py:1017
msgid "Search vector"
msgstr ""
-#: models.py:1016
+#: models.py:1018
msgid "Auto filled at save"
msgstr ""
-#: models.py:1142
+#: models.py:1151
msgid "Last editor"
msgstr ""
-#: models.py:1145
+#: models.py:1154
msgid "Creator"
msgstr ""
-#: models.py:1319
+#: models.py:1331
msgid "Symmetrical"
msgstr ""
-#: models.py:1320
+#: models.py:1332
msgid "Tiny label"
msgstr ""
-#: models.py:1323
+#: models.py:1335
msgid "Inverse relation"
msgstr ""
-#: models.py:1333
+#: models.py:1345
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:1450
+#: models.py:1463
msgid "Euro"
msgstr ""
-#: models.py:1451
+#: models.py:1464
msgid "US dollar"
msgstr ""
-#: models.py:1452 views.py:1486 views.py:1546
+#: models.py:1465 views.py:1548 views.py:1609
msgid "Operations"
msgstr ""
-#: models.py:1453 views.py:1488 views.py:1550
+#: models.py:1466 views.py:1550 views.py:1613
msgid "Context records"
msgstr ""
-#: models.py:1459 models.py:1859 models_imports.py:114
+#: models.py:1472 models.py:1953 models_imports.py:114
msgid "Slug"
msgstr ""
-#: models.py:1462
+#: models.py:1475
msgid "CSS color code for base module"
msgstr ""
-#: models.py:1464
+#: models.py:1477
msgid "Files module"
msgstr ""
-#: models.py:1466
+#: models.py:1479
msgid "CSS color code for files module"
msgstr ""
-#: models.py:1468
+#: models.py:1481
msgid "Context records module"
msgstr ""
-#: models.py:1471
+#: models.py:1484
msgid "CSS color code for context record module"
msgstr ""
-#: models.py:1473
+#: models.py:1486
msgid "Finds module"
msgstr ""
-#: models.py:1474
+#: models.py:1487
msgid "Need context records module"
msgstr ""
-#: models.py:1476
+#: models.py:1489
msgid "Find index is based on"
msgstr ""
-#: models.py:1478
+#: models.py:1491
msgid ""
"To prevent irrelevant indexes, change this parameter only if there is no "
"find in the database"
msgstr ""
-#: models.py:1481
+#: models.py:1494
msgid "CSS color code for find module"
msgstr ""
-#: models.py:1484
+#: models.py:1497
msgid "Warehouses module"
msgstr ""
-#: models.py:1485
+#: models.py:1498
msgid "Need finds module"
msgstr ""
-#: models.py:1487
+#: models.py:1500
msgid "CSS code for warehouse module"
msgstr ""
-#: models.py:1489
+#: models.py:1502
msgid "Preservation module"
msgstr ""
-#: models.py:1491
+#: models.py:1504
msgid "Mapping module"
msgstr ""
-#: models.py:1493
+#: models.py:1506
msgid "CSS code for mapping module"
msgstr ""
-#: models.py:1496
+#: models.py:1509
msgid "Home page"
msgstr ""
-#: models.py:1497
+#: models.py:1510
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax. {random_image} can be used to display a random image."
msgstr ""
-#: models.py:1501
+#: models.py:1514
msgid "File external id"
msgstr ""
-#: models.py:1503
+#: models.py:1516
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1508
+#: models.py:1521
msgid "Parcel external id"
msgstr ""
-#: models.py:1511
+#: models.py:1524
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1516
+#: models.py:1529
msgid "Context record external id"
msgstr ""
-#: models.py:1518
+#: models.py:1531
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1523
+#: models.py:1536
msgid "Base find external id"
msgstr ""
-#: models.py:1525
+#: models.py:1538
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1530
+#: models.py:1543
msgid "Find external id"
msgstr ""
-#: models.py:1532
+#: models.py:1545
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1537
+#: models.py:1550
msgid "Container external id"
msgstr ""
-#: models.py:1539
+#: models.py:1552
msgid ""
"Formula to manage container external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1544
+#: models.py:1557
msgid "Warehouse external id"
msgstr ""
-#: models.py:1546
+#: models.py:1559
msgid ""
"Formula to manage warehouse external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1551
+#: models.py:1564
msgid "Raw name for person"
msgstr ""
-#: models.py:1553
+#: models.py:1566
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1557
+#: models.py:1570
msgid "Current active"
msgstr ""
-#: models.py:1558
+#: models.py:1571
msgid "Currency"
msgstr ""
-#: models.py:1562
+#: models.py:1575
msgid "Ishtar site profile"
msgstr ""
-#: models.py:1563
+#: models.py:1576
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:1633
+#: models.py:1650
+msgid "Enable this form"
+msgstr ""
+
+#: models.py:1651
+msgid ""
+"Disable with caution: disabling a form with mandatory fields may lead to "
+"database errors."
+msgstr ""
+
+#: models.py:1654
+msgid "Apply to all"
+msgstr ""
+
+#: models.py:1655
+msgid ""
+"Apply this form to all users. If set to True, selecting user and user type "
+"is useless."
+msgstr ""
+
+#: models.py:1661
+msgid "Custom form"
+msgstr ""
+
+#: models.py:1662
+msgid "Custom forms"
+msgstr ""
+
+#: models.py:1678
+#| msgid "User type"
+msgid "User types"
+msgstr ""
+
+#: models.py:1719
+msgid "Excluded field"
+msgstr ""
+
+#: models.py:1720
+msgid "Excluded fields"
+msgstr ""
+
+#: models.py:1724
msgid "Variable name"
msgstr ""
-#: models.py:1634
+#: models.py:1725
msgid "Description of the variable"
msgstr ""
-#: models.py:1636 models_imports.py:531
+#: models.py:1727 models_imports.py:531
#: templates/ishtar/formset_import_match.html:22
msgid "Value"
msgstr ""
-#: models.py:1639
+#: models.py:1730
msgid "Global variable"
msgstr ""
-#: models.py:1763 models.py:1793
+#: models.py:1857 models.py:1887
msgid "Total"
msgstr ""
-#: models.py:1770 models.py:1954 models.py:1970
-#: templates/ishtar/dashboards/dashboard_main_detail.html:140
-#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
-#: templates/ishtar/sheet_person.html:24
+#: models.py:1864 models.py:2048 models.py:2064
+#: templates/ishtar/dashboards/dashboard_main_detail.html:211
+#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
+#: templates/ishtar/sheet_person.html:27
msgid "Number"
msgstr ""
-#: models.py:1857
+#: models.py:1951
msgid "Administrative Act"
msgstr ""
-#: models.py:1864
+#: models.py:1958
msgid "Associated object"
msgstr ""
-#: models.py:1869
+#: models.py:1963
msgid "Document template"
msgstr ""
-#: models.py:1870
+#: models.py:1964
msgid "Document templates"
msgstr ""
-#: models.py:1958 models.py:1971 models.py:2939 models_imports.py:786
+#: models.py:2052 models.py:2065 models.py:3102 models_imports.py:788
msgid "State"
msgstr ""
-#: models.py:1976 models.py:2731 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:2070 models.py:2892 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:1977
+#: models.py:2071
msgid "Departments"
msgstr ""
-#: models.py:2017
+#: models.py:2111
msgid "Raw phone"
msgstr ""
-#: models.py:2023
+#: models.py:2117
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:2062
+#: models.py:2156
msgid "Tel: "
msgstr ""
-#: models.py:2066
+#: models.py:2160
msgid "Mobile: "
msgstr ""
-#: models.py:2070
+#: models.py:2164
msgid "Email: "
msgstr ""
-#: models.py:2075
+#: models.py:2169
msgid "Merge key"
msgstr ""
-#: models.py:2147
+#: models.py:2241
msgid "Organization types"
msgstr ""
-#: models.py:2174
+#: models.py:2271
msgid "Organizations"
msgstr ""
-#: models.py:2215
+#: models.py:2312
msgid "Groups"
msgstr ""
-#: models.py:2220
+#: models.py:2317
msgid "Person types"
msgstr ""
-#: models.py:2231 models_imports.py:632
+#: models.py:2330 models_imports.py:632
msgid "Title type"
msgstr ""
-#: models.py:2232
+#: models.py:2331
msgid "Title types"
msgstr ""
-#: models.py:2241
+#: models.py:2342
msgid "Mr"
msgstr ""
-#: models.py:2242
+#: models.py:2343
msgid "Miss"
msgstr ""
-#: models.py:2243
+#: models.py:2344
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2244
+#: models.py:2345
msgid "Mrs"
msgstr ""
-#: models.py:2245
+#: models.py:2346
msgid "Doctor"
msgstr ""
-#: models.py:2278
+#: models.py:2382
msgid "Contact type"
msgstr ""
-#: models.py:2281 models.py:2345
+#: models.py:2385 models.py:2449
msgid "Types"
msgstr ""
-#: models.py:2284
+#: models.py:2388
msgid "Is attached to"
msgstr ""
-#: models.py:2289
+#: models.py:2393
msgid "Persons"
msgstr ""
-#: models.py:2486
+#: models.py:2594
msgid "Advanced shortcut menu"
msgstr ""
-#: models.py:2489
+#: models.py:2597
msgid "Ishtar user"
msgstr ""
-#: models.py:2490
+#: models.py:2598
msgid "Ishtar users"
msgstr ""
-#: models.py:2578
+#: models.py:2686
msgid "Author types"
msgstr ""
-#: models.py:2619
+#: models.py:2730
msgid "Source types"
msgstr ""
-#: models.py:2627 models_imports.py:631
+#: models.py:2740 models_imports.py:631
msgid "Support type"
msgstr ""
-#: models.py:2628
+#: models.py:2741
msgid "Support types"
msgstr ""
-#: models.py:2635
+#: models.py:2750
msgid "Format type"
msgstr ""
-#: models.py:2636
+#: models.py:2751
msgid "Format types"
msgstr ""
-#: models.py:2644
+#: models.py:2761
msgid "External ID"
msgstr ""
-#: models.py:2647
+#: models.py:2764
msgid "Support"
msgstr ""
-#: models.py:2649 models_imports.py:601
+#: models.py:2766 models_imports.py:601
msgid "Format"
msgstr ""
-#: models.py:2651
+#: models.py:2768
msgid "Scale"
msgstr ""
-#: models.py:2665
+#: models.py:2782
msgid "Item number"
msgstr ""
-#: models.py:2666
+#: models.py:2783 models.py:2849
msgid "Ref."
msgstr ""
-#: models.py:2669
+#: models.py:2786 models.py:2852
msgid "Internal ref."
msgstr ""
-#: models.py:2724
+#: models.py:2823
+#| msgid "User type"
+msgid "License type"
+msgstr ""
+
+#: models.py:2824
+#| msgid "Title types"
+msgid "License types"
+msgstr ""
+
+#: models.py:2830
+#| msgid "Image"
+msgid "Image type"
+msgstr ""
+
+#: models.py:2831
+#| msgid "Format types"
+msgid "Image types"
+msgstr ""
+
+#: models.py:2838
+msgid "License"
+msgstr ""
+
+#: models.py:2842
+#| msgid "Authors"
+msgid "Authors (raw)"
+msgstr ""
+
+#: models.py:2856
+#| msgid "Image"
+msgid "Images"
+msgstr ""
+
+#: models.py:2885
msgid "Surface (m2)"
msgstr ""
-#: models.py:2725 templates/sheet_ope.html:46 templates/sheet_ope.html:107
+#: models.py:2886
msgid "Localisation"
msgstr ""
-#: models.py:2733
+#: models.py:2894
msgid "Year of creation"
msgstr ""
-#: models.py:2734
+#: models.py:2895
msgid "Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
-#: models.py:2739
+#: models.py:2900
msgid "Cached name"
msgstr ""
-#: models.py:2845
+#: models.py:3006
msgid "Is preventive"
msgstr ""
-#: models.py:2848 models_imports.py:602
+#: models.py:3009 models_imports.py:602
msgid "Operation type"
msgstr ""
-#: models.py:2849
+#: models.py:3010
msgid "Operation types"
msgstr ""
-#: models.py:2879
+#: models.py:3040
msgid "Preventive"
msgstr ""
-#: models.py:2880
+#: models.py:3041
msgid "Research"
msgstr ""
-#: models.py:2903
+#: models.py:3066
msgid "Authority name"
msgstr ""
-#: models.py:2904
+#: models.py:3067
msgid "Authority SRID"
msgstr ""
-#: models.py:2907 models_imports.py:630
+#: models.py:3070 models_imports.py:630
msgid "Spatial reference system"
msgstr ""
-#: models.py:2908
+#: models.py:3071
msgid "Spatial reference systems"
msgstr ""
-#: models.py:2915
+#: models.py:3078
msgid "Filename"
msgstr ""
-#: models.py:2920
+#: models.py:3083
msgid "Administration script"
msgstr ""
-#: models.py:2921
+#: models.py:3084
msgid "Administration scripts"
msgstr ""
-#: models.py:2928
+#: models.py:3091
msgid "Scheduled"
msgstr ""
-#: models.py:2929
+#: models.py:3092
msgid "In progress"
msgstr ""
-#: models.py:2930 models_imports.py:747
+#: models.py:3093 models_imports.py:748
msgid "Finished with errors"
msgstr ""
-#: models.py:2931 models_imports.py:748
+#: models.py:3094 models_imports.py:749
msgid "Finished"
msgstr ""
-#: models.py:2944
+#: models.py:3107
msgid "Result"
msgstr ""
-#: models.py:2947
+#: models.py:3110
msgid "Administration task"
msgstr ""
-#: models.py:2948
+#: models.py:3111
msgid "Administration tasks"
msgstr ""
-#: models.py:2952
+#: models.py:3115
msgid "Unknown"
msgstr ""
-#: models.py:2967
+#: models.py:3130
msgid ""
"ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
"administrator."
msgstr ""
-#: models.py:2976
+#: models.py:3139
msgid ""
"Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
"relative paths, it can be a security issue and this is not allowed. Only put "
"a full path."
msgstr ""
-#: models.py:2987
+#: models.py:3150
msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
msgstr ""
-#: models.py:3003
+#: models.py:3166
msgid ""
"Script \"{}\" is not available in your script directory. Check your "
"configuration."
@@ -1297,10 +1396,6 @@ msgstr ""
msgid "Importer - Models"
msgstr ""
-#: models_imports.py:117 templates/ishtar/dashboards/dashboard_main.html:33
-msgid "Users"
-msgstr ""
-
#: models_imports.py:120
msgid "Associated model"
msgstr ""
@@ -1415,11 +1510,11 @@ msgstr ""
msgid "Importer - Targets"
msgstr ""
-#: models_imports.py:492 views.py:581
+#: models_imports.py:492 views.py:604
msgid "True"
msgstr ""
-#: models_imports.py:493 views.py:583
+#: models_imports.py:493 views.py:606
msgid "False"
msgstr ""
@@ -1539,13 +1634,12 @@ msgstr ""
msgid "String"
msgstr ""
-#: models_imports.py:641 templates/sheet_ope.html:86
+#: models_imports.py:641
msgid "Date"
msgstr ""
#: models_imports.py:643
-#: templates/ishtar/dashboards/dashboard_main_detail.html:125
-#: templates/sheet_ope.html:61 templates/sheet_ope.html:83
+#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
msgstr ""
@@ -1590,112 +1684,112 @@ msgstr ""
msgid "Importer - Formater types"
msgstr ""
-#: models_imports.py:742
-#: templates/ishtar/dashboards/dashboard_main_detail.html:62
+#: models_imports.py:743
+#: templates/ishtar/dashboards/dashboard_main_detail.html:132
msgid "Created"
msgstr ""
-#: models_imports.py:743
+#: models_imports.py:744
msgid "Analyse in progress"
msgstr ""
-#: models_imports.py:744
+#: models_imports.py:745
msgid "Analysed"
msgstr ""
-#: models_imports.py:745
+#: models_imports.py:746
msgid "Import pending"
msgstr ""
-#: models_imports.py:746
+#: models_imports.py:747
msgid "Import in progress"
msgstr ""
-#: models_imports.py:749
+#: models_imports.py:750
msgid "Archived"
msgstr ""
-#: models_imports.py:763
+#: models_imports.py:765
msgid "Imported file"
msgstr ""
-#: models_imports.py:765
+#: models_imports.py:767
msgid "Associated images (zip file)"
msgstr ""
-#: models_imports.py:769
+#: models_imports.py:771
msgid "If a group is selected, target key saved in this group will be used."
msgstr ""
-#: models_imports.py:772
+#: models_imports.py:774
msgid "Encoding"
msgstr ""
-#: models_imports.py:775
+#: models_imports.py:777
msgid "Skip lines"
msgstr ""
-#: models_imports.py:776
+#: models_imports.py:778
msgid "Number of header lines in your file (can be 0)."
msgstr ""
-#: models_imports.py:777 templates/ishtar/import_list.html:50
+#: models_imports.py:779
msgid "Error file"
msgstr ""
-#: models_imports.py:780
+#: models_imports.py:782
msgid "Result file"
msgstr ""
-#: models_imports.py:783 templates/ishtar/import_list.html:56
+#: models_imports.py:785
msgid "Match file"
msgstr ""
-#: models_imports.py:789
+#: models_imports.py:791
msgid "Conservative import"
msgstr ""
-#: models_imports.py:790
+#: models_imports.py:792
msgid "If set to true, do not overload existing values."
msgstr ""
-#: models_imports.py:793
+#: models_imports.py:795
msgid "End date"
msgstr ""
-#: models_imports.py:796
+#: models_imports.py:798
msgid "Remaining seconds"
msgstr ""
-#: models_imports.py:799
+#: models_imports.py:801
msgid "Import"
msgstr ""
-#: models_imports.py:828
+#: models_imports.py:830
msgid "Analyse"
msgstr ""
-#: models_imports.py:830 models_imports.py:833
+#: models_imports.py:832 models_imports.py:835
msgid "Re-analyse"
msgstr ""
-#: models_imports.py:831
+#: models_imports.py:833
msgid "Launch import"
msgstr ""
-#: models_imports.py:834
+#: models_imports.py:836
msgid "Re-import"
msgstr ""
-#: models_imports.py:835
+#: models_imports.py:837
msgid "Archive"
msgstr ""
-#: models_imports.py:837
+#: models_imports.py:839
msgid "Unarchive"
msgstr ""
-#: models_imports.py:838 templates/ishtar/form_delete.html:11 widgets.py:256
+#: models_imports.py:840 templates/ishtar/form_delete.html:11 widgets.py:258
msgid "Delete"
msgstr ""
@@ -1733,110 +1827,159 @@ msgstr ""
msgid "The %(app_name)s team"
msgstr ""
-#: templates/base.html:41
+#: templates/base.html:39
msgid "Searches in the shortcut menu deal with all items."
msgstr ""
-#: templates/base.html:42
+#: templates/base.html:40
msgid "Searches in the shortcut menu deal with only your items."
msgstr ""
-#: templates/base.html:49
-msgid "Logged in"
-msgstr ""
-
-#: templates/base.html:50
-msgid "Log out"
-msgstr ""
-
-#: templates/base.html:51
-msgid "Change password"
+#: templates/base.html:41
+#| msgid "Types"
+msgid "yes"
msgstr ""
-#: templates/base.html:53 templates/registration/activate.html:10
-#: templates/registration/login.html:8 templates/registration/login.html:10
-#: templates/registration/password_reset_complete.html:8
-msgid "Log in"
+#: templates/base.html:42
+msgid "no"
msgstr ""
-#: templates/base.html:82
+#: templates/base.html:68
msgid "Current items"
msgstr ""
-#: templates/base.html:84 templates/ishtar/manage_basket.html:4
-#: templates/welcome.html:7 templates/welcome.html:8 templates/welcome.html:9
-#: templates/welcome.html:10
+#: templates/base.html:70 templates/blocks/bs_form_snippet.html:55
+#: templates/ishtar/manage_basket.html:4 templates/welcome.html:13
+#: templates/welcome.html:14 templates/welcome.html:15
+#: templates/welcome.html:16
msgid ":"
msgstr ""
-#: templates/base.html:128
+#: templates/base.html:107
msgid "Processing..."
msgstr ""
-#: templates/base.html:129
+#: templates/base.html:109
msgid "This can be long."
msgstr ""
-#: templates/base.html:130
+#: templates/base.html:111
msgid "Time to take a coffee?"
msgstr ""
-#: templates/base.html:131
+#: templates/base.html:113
msgid "Time to take another coffee?"
msgstr ""
-#: templates/blocks/JQueryAdvancedTown.html:3
-msgctxt "Region"
-msgid "State"
+#: templates/blocks/DataTables.html:14 templates/blocks/JQueryJqGrid.html:16
+msgid "Pinned search:"
msgstr ""
-#: templates/blocks/JQueryAdvancedTown.html:29
-msgid "Choose a state first"
+#: templates/blocks/DataTables.html:52
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:39
+msgid "Expand table"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:9
-msgid "Search and select an item"
+#: templates/blocks/DataTables.html:58 templates/blocks/JQueryJqGrid.html:26
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:45
+#| msgid "Export as:"
+msgid "Export"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:13
-msgid "Pinned search:"
+#: templates/blocks/DataTables.html:61 templates/blocks/DataTables.html:64
+#: templates/blocks/JQueryJqGrid.html:29 templates/blocks/JQueryJqGrid.html:32
+msgid "Export as CSV - "
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:23 templates/blocks/JQueryJqGrid.html:29
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12
-msgid "Export as CSV"
+#: templates/blocks/DataTables.html:61 templates/blocks/JQueryJqGrid.html:29
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:6
+msgid "simple"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:23 templates/blocks/JQueryJqGrid.html:29
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-msgid "CSV"
+#: templates/blocks/DataTables.html:61
+#| msgid "simple"
+msgid "Simple CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:24
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+#: templates/blocks/DataTables.html:62 templates/blocks/JQueryJqGrid.html:30
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:48
msgid "Export as CSV - full"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:24
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+#: templates/blocks/DataTables.html:62 templates/blocks/JQueryJqGrid.html:30
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:48
msgid "CSV full"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:26
-msgid "Export as CSV - "
+#: templates/blocks/DataTables.html:67 templates/blocks/JQueryJqGrid.html:35
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:47
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:50
+msgid "Export as CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:34 templates/ishtar/manage_basket.html:12
-#: templates/window.html:40
+#: templates/blocks/DataTables.html:67 templates/blocks/JQueryJqGrid.html:29
+#: templates/blocks/JQueryJqGrid.html:35
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:47
+msgid "CSV"
+msgstr ""
+
+#: templates/blocks/DataTables.html:74 templates/blocks/JQueryJqGrid.html:42
+#: templates/ishtar/manage_basket.html:13 templates/window.html:39
msgid "Add"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:108
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
+#: templates/blocks/DataTables.html:157
+#| msgid "Search within all items"
+msgid "Select all items"
+msgstr ""
+
+#: templates/blocks/DataTables.html:158
+#| msgid "Select the main person"
+msgid "Select none"
+msgstr ""
+
+#: templates/blocks/JQueryAdvancedTown.html:3
+msgctxt "Region"
+msgid "State"
+msgstr ""
+
+#: templates/blocks/JQueryAdvancedTown.html:29
+msgid "Choose a state first"
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:12
+msgid "Search and select an item"
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:116
msgid "An error as occured during search. Check your query fields."
msgstr ""
+#: templates/blocks/bs_form_snippet.html:31
+msgid "help"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:41
+#: templates/blocks/bs_form_snippet.html:65
+#| msgid "Advanced menu"
+msgid "Advanced search"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:81
+#| msgid "Reset it"
+msgid "Reset"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:83 templates/ishtar/form.html:26
+#: templates/ishtar/formset.html:8
+#: templates/ishtar/formset_import_match.html:51
+#: templates/ishtar/import_list.html:79 templates/ishtar/merge.html:30
+#: templates/ishtar/simple_form.html:7 templates/ishtar/wizard/search.html:21
+#: templates/ishtar/wizard/validation_bar.html:6
+msgid "Validate"
+msgstr ""
+
#: templates/blocks/comma_list.html:1
msgid "and"
msgstr ""
@@ -1854,61 +1997,58 @@ msgid "Show / hide advanced search"
msgstr ""
#: templates/blocks/form_flex_snippet.html:18
-#: templates/blocks/form_snippet.html:9
+#: templates/blocks/table_form_snippet.html:9
msgid "Help"
msgstr ""
-#: templates/ishtar/basket_list.html:6
-msgid "remove"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:14
-#: templates/ishtar/blocks/shortcut_menu.html:14
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:11
msgid ""
"Simple menu limited to your own items. Be careful only the last 100 items "
"are displayed."
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:14
-#: templates/ishtar/blocks/shortcut_menu.html:14
-msgid "simple"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
-#: templates/ishtar/blocks/shortcut_menu.html:15
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
+#: templates/ishtar/blocks/shortcut_menu.html:7
msgid "Advanced menu"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
-#: templates/ishtar/blocks/shortcut_menu.html:15
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
+#: templates/ishtar/blocks/shortcut_menu.html:7
msgid "advanced"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:18
-#: templates/ishtar/blocks/shortcut_menu.html:18
-msgid ""
-"Pin an item in order to constrain default searches with this item. By "
-"default only your items are displayed. New created and modified items are "
-"auto-pin."
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:20
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:11
msgid "Search within my items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:21
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:16
msgid "Search within all items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:24
-msgid "Refresh menu"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:35
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:42
#: templates/ishtar/blocks/shortcut_menu.html:30
msgid "Unpin"
msgstr ""
+#: templates/ishtar/blocks/base_shortcut_menu.html:18
+#| msgid "Author selection"
+msgid "No default selection"
+msgstr ""
+
+#: templates/ishtar/blocks/base_shortcut_menu.html:26
+msgid ""
+"Pin an item in order to constrain default searches with this item. By "
+"default only your items are displayed. New created and modified items are "
+"auto-pin."
+msgstr ""
+
+#: templates/ishtar/blocks/base_shortcut_menu.html:30
+#| msgid "Author selection"
+msgid "Default selection"
+msgstr ""
+
#: templates/ishtar/blocks/footer.html:2
#, python-format
msgid ""
@@ -1924,12 +2064,12 @@ msgstr ""
msgid "Modify"
msgstr ""
-#: templates/ishtar/blocks/sheet_creation_section.html:3
+#: templates/ishtar/blocks/sheet_creation_section.html:4
msgctxt "Sheet"
msgid "Creation"
msgstr ""
-#: templates/ishtar/blocks/sheet_creation_section.html:12
+#: templates/ishtar/blocks/sheet_creation_section.html:14
msgctxt "Sheet"
msgid "Modification"
msgstr ""
@@ -1939,44 +2079,42 @@ msgid "Internal ID"
msgstr ""
#: templates/ishtar/blocks/window_nav.html:5
-msgid "Previous version"
+#| msgid "Directory"
+msgid "History"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:16
-msgid "Restore this version"
-msgstr ""
-
-#: templates/ishtar/blocks/window_nav.html:16
+#: templates/ishtar/blocks/window_nav.html:17
msgid ""
"Are you sure to restore to this version? All changes made since this version "
"will be lost."
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:21
-msgid "Restore"
+#: templates/ishtar/blocks/window_nav.html:18
+msgid "Restore this version"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:23
-msgid "Next version"
+#: templates/ishtar/blocks/window_nav.html:34
+#| msgid "Action"
+msgid "Actions"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:45
+#: templates/ishtar/blocks/window_nav.html:44
msgid "Item pined in your shortcut menu."
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:45
+#: templates/ishtar/blocks/window_nav.html:44
msgid "Pin"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:51
+#: templates/ishtar/blocks/window_nav.html:49
msgid "Export as OpenOffice.org file"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:51
+#: templates/ishtar/blocks/window_nav.html:52
msgid "Export as PDF file"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:55
+#: templates/ishtar/blocks/window_nav.html:60
msgid "Relation between items are not historized."
msgstr ""
@@ -1989,95 +2127,90 @@ msgstr ""
msgid "Link"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:4
+#: templates/ishtar/dashboards/dashboard_main_detail.html:3
msgid "Numbers"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:11
+#: templates/ishtar/dashboards/dashboard_main_detail.html:12
msgid "Change"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:15
+#: templates/ishtar/dashboards/dashboard_main_detail.html:17
msgid "Total:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:18
+#: templates/ishtar/dashboards/dashboard_main_detail.html:22
msgid "Draw rectangle on the graph to zoom. Double-click to reinitialize."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:20
+#: templates/ishtar/dashboards/dashboard_main_detail.html:28
msgid "Display as an image"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:23
+#: templates/ishtar/dashboards/dashboard_main_detail.html:37
msgid "Right-click on this image to save it."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:40
+#: templates/ishtar/dashboards/dashboard_main_detail.html:55
msgid "By years"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:42
-#: templates/ishtar/dashboards/dashboard_main_detail.html:52
+#: templates/ishtar/dashboards/dashboard_main_detail.html:58
+#: templates/ishtar/dashboards/dashboard_main_detail.html:96
msgid "Average:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:43
-#: templates/ishtar/dashboards/dashboard_main_detail.html:53
+#: templates/ishtar/dashboards/dashboard_main_detail.html:65
+#: templates/ishtar/dashboards/dashboard_main_detail.html:103
msgid "Variance:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:44
-#: templates/ishtar/dashboards/dashboard_main_detail.html:54
+#: templates/ishtar/dashboards/dashboard_main_detail.html:72
+#: templates/ishtar/dashboards/dashboard_main_detail.html:110
msgid "Standard deviation:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:45
-#: templates/ishtar/dashboards/dashboard_main_detail.html:55
+#: templates/ishtar/dashboards/dashboard_main_detail.html:78
+#: templates/ishtar/dashboards/dashboard_main_detail.html:116
msgid "Median:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:46
-#: templates/ishtar/dashboards/dashboard_main_detail.html:56
+#: templates/ishtar/dashboards/dashboard_main_detail.html:84
+#: templates/ishtar/dashboards/dashboard_main_detail.html:122
msgid "Mode:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:50
+#: templates/ishtar/dashboards/dashboard_main_detail.html:93
msgid "By operations"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:60
+#: templates/ishtar/dashboards/dashboard_main_detail.html:130
msgid "Created last"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:73
+#: templates/ishtar/dashboards/dashboard_main_detail.html:142
msgid "Recent changes"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:75
+#: templates/ishtar/dashboards/dashboard_main_detail.html:144
msgid "Modified"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:113
+#: templates/ishtar/dashboards/dashboard_main_detail.html:182
msgid "No data for these criteria."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:131
+#: templates/ishtar/dashboards/dashboard_main_detail.html:202
msgid "Month"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
+#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
msgid "User type"
msgstr ""
-#: templates/ishtar/form.html:14 templates/ishtar/formset.html:8
-#: templates/ishtar/formset_import_match.html:51
-#: templates/ishtar/import_list.html:61 templates/ishtar/merge.html:30
-#: templates/ishtar/simple_form.html:7
-#: templates/ishtar/wizard/default_wizard.html:30
-#: templates/ishtar/wizard/search.html:13
-#: templates/ishtar/wizard/validation_bar.html:3
-msgid "Validate"
+#: templates/ishtar/form.html:20 templates/ishtar/wizard/default_wizard.html:43
+#| msgid "Search and select an item"
+msgid "Search and select an item in the table"
msgstr ""
#: templates/ishtar/formset_import_match.html:5
@@ -2101,7 +2234,7 @@ msgstr ""
msgid "Are you sure?"
msgstr ""
-#: templates/ishtar/import_delete.html:20 wizards.py:383
+#: templates/ishtar/import_delete.html:20 wizards.py:391
msgid "Yes"
msgstr ""
@@ -2109,44 +2242,64 @@ msgstr ""
msgid "Back"
msgstr ""
-#: templates/ishtar/import_list.html:7
+#: templates/ishtar/import_list.html:12
msgid "No pending imports."
msgstr ""
-#: templates/ishtar/import_list.html:14
+#: templates/ishtar/import_list.html:18
msgctxt "file"
msgid "File"
msgstr ""
-#: templates/ishtar/import_list.html:16
+#: templates/ishtar/import_list.html:20
msgid "Status"
msgstr ""
-#: templates/ishtar/import_list.html:17
+#: templates/ishtar/import_list.html:21
msgid "Action"
msgstr ""
-#: templates/ishtar/import_list.html:28
-msgid "Source file"
+#: templates/ishtar/import_list.html:22
+#| msgid "Link unmatched items"
+msgid "Unmatched items"
msgstr ""
-#: templates/ishtar/import_list.html:46 views.py:1764
-msgid "Link unmatched items"
+#: templates/ishtar/import_list.html:23
+#| msgid "error"
+msgid "Error"
msgstr ""
-#: templates/ishtar/import_list.html:53
-msgid "Control file"
+#: templates/ishtar/import_list.html:24
+#| msgid "Control file"
+msgid "Control"
msgstr ""
-#: templates/ishtar/manage_basket.html:9
+#: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54
+#| msgid "Match file"
+msgid "Match"
+msgstr ""
+
+#: templates/ishtar/import_list.html:36
+msgid "Source file"
+msgstr ""
+
+#: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61
+#: templates/ishtar/import_list.html:64
+#| msgctxt "filesystem"
+#| msgid "File"
+msgctxt "not a directory"
+msgid "File"
+msgstr ""
+
+#: templates/ishtar/manage_basket.html:8
msgid "Checking \"Select all\" only selects the current page."
msgstr ""
-#: templates/ishtar/manage_basket.html:13
+#: templates/ishtar/manage_basket.html:16
msgid "Basket content"
msgstr ""
-#: templates/ishtar/manage_basket.html:21 templates/ishtar/sheet.html:28
+#: templates/ishtar/manage_basket.html:24 templates/ishtar/sheet.html:38
msgid "Close"
msgstr ""
@@ -2197,7 +2350,7 @@ msgstr ""
#: templates/ishtar/organization_form.html:40
#: templates/ishtar/organization_person_form.html:35
#: templates/ishtar/person_form.html:46
-#: templates/ishtar/wizard/validation_bar.html:7
+#: templates/ishtar/wizard/validation_bar.html:20
msgid "Cancel"
msgstr ""
@@ -2210,123 +2363,115 @@ msgstr ""
msgid "Contact informations"
msgstr ""
-#: templates/ishtar/sheet.html:34
-msgid "Close all windows"
-msgstr ""
-
-#: templates/ishtar/sheet_organization.html:9
-msgid "Created by:"
-msgstr ""
-
-#: templates/ishtar/sheet_organization.html:16
+#: templates/ishtar/sheet_organization.html:19
msgid "Person in the organization"
msgstr ""
-#: templates/ishtar/sheet_organization.html:31
+#: templates/ishtar/sheet_organization.html:36
msgid "No person in this organization"
msgstr ""
-#: templates/ishtar/sheet_organization.html:35
+#: templates/ishtar/sheet_organization.html:40
msgid "General contractor organization of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_organization.html:40
+#: templates/ishtar/sheet_organization.html:45
msgid "Planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:23
-#: templates/ishtar/wizard/wizard_person.html:19
+#: templates/ishtar/sheet_person.html:26
+#: templates/ishtar/wizard/wizard_person.html:38
msgid "Phone type"
msgstr ""
-#: templates/ishtar/sheet_person.html:46
-#: templates/ishtar/wizard/wizard_person.html:42
+#: templates/ishtar/sheet_person.html:49
+#: templates/ishtar/wizard/wizard_person.html:64
msgid "Business address"
msgstr ""
-#: templates/ishtar/sheet_person.html:55
-#: templates/ishtar/wizard/wizard_person.html:51
+#: templates/ishtar/sheet_person.html:58
+#: templates/ishtar/wizard/wizard_person.html:77
msgid "Other address"
msgstr ""
-#: templates/ishtar/sheet_person.html:64
+#: templates/ishtar/sheet_person.html:67
msgid "Associated organization"
msgstr ""
-#: templates/ishtar/sheet_person.html:76
+#: templates/ishtar/sheet_person.html:79
msgid "Associated operations as scientist"
msgstr ""
-#: templates/ishtar/sheet_person.html:80
+#: templates/ishtar/sheet_person.html:83
msgid "Associated operations as responsible"
msgstr ""
-#: templates/ishtar/sheet_person.html:85
+#: templates/ishtar/sheet_person.html:88
#: templates/ishtar/wizard/wizard_person_deletion.html:6
msgid "In charge of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:90
+#: templates/ishtar/sheet_person.html:93
#: templates/ishtar/wizard/wizard_person_deletion.html:15
msgid "General contractor of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:95
+#: templates/ishtar/sheet_person.html:98
#: templates/ishtar/wizard/wizard_person_deletion.html:24
msgid "Responsible for planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:101
+#: templates/ishtar/sheet_person.html:104
msgid "Documents associated to operations"
msgstr ""
-#: templates/ishtar/sheet_person.html:106
+#: templates/ishtar/sheet_person.html:109
msgid "Documents associated to context records"
msgstr ""
-#: templates/ishtar/sheet_person.html:111
+#: templates/ishtar/sheet_person.html:114
msgid "Documents associated to finds"
msgstr ""
-#: templates/ishtar/sheet_source.html:22
+#: templates/ishtar/sheet_source.html:28
msgid "Web link"
msgstr ""
-#: templates/ishtar/wizard/confirm_wizard.html:17
+#: templates/ishtar/wizard/confirm_wizard.html:12
#: templates/ishtar/wizard/wizard_done_summary.html:6
msgid "You have entered the following informations:"
msgstr ""
-#: templates/ishtar/wizard/confirm_wizard.html:44
+#: templates/ishtar/wizard/confirm_wizard.html:50
msgid "Would you like to save them?"
msgstr ""
-#: templates/ishtar/wizard/default_wizard.html:36
-#: templates/ishtar/wizard/parcels_wizard.html:24
+#: templates/ishtar/wizard/default_wizard.html:31
+#: templates/ishtar/wizard/parcels_wizard.html:33
#: templates/ishtar/wizard/relations_wizard.html:23
-#: templates/ishtar/wizard/search.html:20
+#: templates/ishtar/wizard/search.html:28
#: templates/ishtar/wizard/towns_wizard.html:19
msgid "Add/Modify"
msgstr ""
-#: templates/ishtar/wizard/default_wizard.html:63
+#: templates/ishtar/wizard/default_wizard.html:59
msgid ""
"The form has changed. If you don't validate it, all your changes will be "
"lost."
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:12
+#: templates/ishtar/wizard/parcels_wizard.html:14
msgid ""
"Existing parcels from the operation will be automatically added to the "
"archaeological file."
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:20
+#: templates/ishtar/wizard/parcels_wizard.html:26
#: templates/ishtar/wizard/relations_wizard.html:20
msgid "all"
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:23
+#: templates/ishtar/wizard/parcels_wizard.html:29
msgid "Add all parcels from the archaeological file"
msgstr ""
@@ -2334,7 +2479,7 @@ msgstr ""
msgid "No town set in the associated file."
msgstr ""
-#: templates/ishtar/wizard/validation_bar.html:5
+#: templates/ishtar/wizard/validation_bar.html:13
msgid "Validate and end"
msgstr ""
@@ -2346,7 +2491,7 @@ msgstr ""
msgid "Item successfully deleted"
msgstr ""
-#: templates/ishtar/wizard/wizard_done.html:4
+#: templates/ishtar/wizard/wizard_done.html:6
msgid "Item successfully saved"
msgstr ""
@@ -2371,7 +2516,7 @@ msgstr ""
msgid "Adminact: operator of archaeological operations"
msgstr ""
-#: templates/ishtar/wizard/wizard_person.html:20
+#: templates/ishtar/wizard/wizard_person.html:39
msgctxt "phone number"
msgid "Number"
msgstr ""
@@ -2428,6 +2573,24 @@ msgstr ""
msgid "Owns parcels"
msgstr ""
+#: templates/navbar.html:12
+msgid "Toggle navigation"
+msgstr ""
+
+#: templates/navbar.html:28
+msgid "Log out"
+msgstr ""
+
+#: templates/navbar.html:31
+msgid "Change password"
+msgstr ""
+
+#: templates/navbar.html:37 templates/registration/activate.html:10
+#: templates/registration/login.html:7 templates/registration/login.html:34
+#: templates/registration/password_reset_complete.html:8
+msgid "Log in"
+msgstr ""
+
#: templates/registration/activate.html:8
msgid "Account successfully activated"
msgstr ""
@@ -2444,10 +2607,6 @@ msgstr ""
msgid "Login now"
msgstr ""
-#: templates/registration/activation_complete.html:10
-msgid "Home"
-msgstr ""
-
#: templates/registration/activation_email.txt:2
msgid "Activate account at"
msgstr ""
@@ -2461,19 +2620,19 @@ msgstr ""
msgid "Account activation on"
msgstr ""
-#: templates/registration/login.html:16
+#: templates/registration/login.html:43
msgid "Forgot password?"
msgstr ""
-#: templates/registration/login.html:16
+#: templates/registration/login.html:43
msgid "Reset it"
msgstr ""
-#: templates/registration/login.html:17
+#: templates/registration/login.html:44
msgid "Not member?"
msgstr ""
-#: templates/registration/login.html:17
+#: templates/registration/login.html:44
#: templates/registration/registration_form.html:8
msgid "Register"
msgstr ""
@@ -2518,291 +2677,77 @@ msgstr ""
msgid "You are now registered. Activation email sent."
msgstr ""
-#: templates/sheet_ope.html:4
-msgid "Export as:"
-msgstr ""
-
-#: templates/sheet_ope.html:4
-msgid "OpenOffice.org file"
-msgstr ""
-
-#: templates/sheet_ope.html:4
-msgid "PDF file"
-msgstr ""
-
-#: templates/sheet_ope.html:5
-msgid "General"
-msgstr ""
-
-#: templates/sheet_ope.html:6
-msgid "Year:"
-msgstr ""
-
-#: templates/sheet_ope.html:7
-msgid "Numerical reference:"
-msgstr ""
-
-#: templates/sheet_ope.html:9
-msgid "Patriarche OA code:"
-msgstr ""
-
-#: templates/sheet_ope.html:10
-msgid "Patriarche OA code not yet recorded !"
-msgstr ""
-
-#: templates/sheet_ope.html:12
-msgid "Operation's name:"
-msgstr ""
-
-#: templates/sheet_ope.html:14
-msgid "Edition date:"
-msgstr ""
-
-#: templates/sheet_ope.html:16
-msgid "Begining date:"
-msgstr ""
-
-#: templates/sheet_ope.html:17
-msgid "Field work end date:"
-msgstr ""
-
-#: templates/sheet_ope.html:19
-msgid "Head scientist:"
-msgstr ""
-
-#: templates/sheet_ope.html:20
-msgid "State:"
-msgstr ""
-
-#: templates/sheet_ope.html:20
-msgid "Active file"
-msgstr ""
-
-#: templates/sheet_ope.html:21
-msgid "Closed operation"
-msgstr ""
-
-#: templates/sheet_ope.html:22
-msgid "Closing date:"
-msgstr ""
-
-#: templates/sheet_ope.html:22
-msgid "by"
-msgstr ""
-
-#: templates/sheet_ope.html:24
-msgid "Type:"
-msgstr ""
-
-#: templates/sheet_ope.html:25
-msgid "Surface:"
-msgstr ""
-
-#: templates/sheet_ope.html:26
-msgid "Cost:"
-msgstr ""
-
-#: templates/sheet_ope.html:27
-msgid "Duration:"
-msgstr ""
-
-#: templates/sheet_ope.html:27
-msgid "Day"
-msgstr ""
-
-#: templates/sheet_ope.html:29
-msgid "Remains:"
-msgstr ""
-
-#: templates/sheet_ope.html:30
-msgid "Periods:"
-msgstr ""
-
-#: templates/sheet_ope.html:33
-msgid "Related file:"
-msgstr ""
-
-#: templates/sheet_ope.html:35
-msgid "Operator's reference code:"
-msgstr ""
-
-#: templates/sheet_ope.html:36
-msgid "Planning service:"
-msgstr ""
-
-#: templates/sheet_ope.html:37
-msgid "Permit type:"
-msgstr ""
-
-#: templates/sheet_ope.html:38
-msgid "Permit reference:"
-msgstr ""
-
-#: templates/sheet_ope.html:39
-msgid "General contractor organisation:"
-msgstr ""
-
-#: templates/sheet_ope.html:40
-msgid "General contractor:"
-msgstr ""
-
-#: templates/sheet_ope.html:44
-msgid "Comment:"
-msgstr ""
-
-#: templates/sheet_ope.html:47
-msgid "Towns:"
-msgstr ""
-
-#: templates/sheet_ope.html:49
-msgid "Main address:"
-msgstr ""
-
-#: templates/sheet_ope.html:50
-msgid "Complement:"
-msgstr ""
-
-#: templates/sheet_ope.html:51
-msgid "Postal code:"
-msgstr ""
-
-#: templates/sheet_ope.html:53
-msgid "Lambert X:"
-msgstr ""
-
-#: templates/sheet_ope.html:54
-msgid "Lambert Y:"
-msgstr ""
-
-#: templates/sheet_ope.html:55
-msgid "Altitude (m NGF):"
-msgstr ""
-
-#: templates/sheet_ope.html:58
-msgid "Associated parcels"
-msgstr ""
-
-#: templates/sheet_ope.html:60
-msgid "Commune"
-msgstr ""
-
-#: templates/sheet_ope.html:62
-msgid "Section"
-msgstr ""
-
-#: templates/sheet_ope.html:63 templates/sheet_ope.html:129
-msgid "Parcel"
-msgstr ""
-
-#: templates/sheet_ope.html:64
-msgid "Owner"
-msgstr ""
-
-#: templates/sheet_ope.html:75
-msgid "No parcel associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:79 templates/sheet_ope.html:81
-msgid "Admninistrative acts"
-msgstr ""
-
-#: templates/sheet_ope.html:96
-msgid "No administrative act associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:100
-msgid "Documentation"
-msgstr ""
-
-#: templates/sheet_ope.html:102
-msgid "Documents"
-msgstr ""
-
-#: templates/sheet_ope.html:117
-msgid "No document associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:121 templates/sheet_ope.html:123
-msgid "Context Records"
-msgstr ""
-
-#: templates/sheet_ope.html:125
-msgid "ID"
-msgstr ""
-
-#: templates/sheet_ope.html:127
-msgid "Chronology"
-msgstr ""
-
-#: templates/sheet_ope.html:139
-msgid "Details"
-msgstr ""
-
-#: templates/sheet_ope.html:142
-msgid "No context record associated to this operation"
-msgstr ""
-
#: templates/welcome.html:3
msgid ""
"Welcome in Ishtar, open source software for management and inventory of "
"archaeological data"
msgstr ""
-#: templates/welcome.html:5
+#: templates/welcome.html:11
msgid "Some useful links:"
msgstr ""
-#: templates/welcome.html:7
+#: templates/welcome.html:13
msgid "Presentation site and blog"
msgstr ""
-#: templates/welcome.html:7
+#: templates/welcome.html:13
msgid "stay tuned with Ishtar news!"
msgstr ""
-#: templates/welcome.html:8
+#: templates/welcome.html:14
msgid "Admin interface"
msgstr ""
-#: templates/welcome.html:8
+#: templates/welcome.html:14
msgid "for admin only."
msgstr ""
-#: templates/welcome.html:9
+#: templates/welcome.html:15
msgid "Forum"
msgstr ""
-#: templates/welcome.html:9
+#: templates/welcome.html:15
msgid ""
"need help? find a new bug? a fantastic feature to propose? Here is the place "
"to go."
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "Source code"
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "tickets"
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "where the magic happens."
msgstr ""
-#: templatetags/window_tables.py:96 widgets.py:800
+#: templates/widgets/image_input.html:13
+#| msgid "Delete"
+msgid "delete"
+msgstr ""
+
+#: templatetags/window_tables.py:97 widgets.py:753
msgid "No results"
msgstr ""
-#: templatetags/window_tables.py:97 widgets.py:801
+#: templatetags/window_tables.py:98 widgets.py:754
msgid "Loading..."
msgstr ""
-#: utils.py:124
+#: utils.py:145
msgid " (...)"
msgstr ""
-#: utils.py:172
+#: utils.py:204
+#| msgid "Contact informations"
+msgid "Information"
+msgstr ""
+
+#: utils.py:205
msgid "Load another random image?"
msgstr ""
@@ -2850,92 +2795,96 @@ msgstr ""
msgid "Account deletion"
msgstr ""
-#: views.py:265
+#: views.py:267
msgid "Archaeological file"
msgstr ""
-#: views.py:266
+#: views.py:268
msgid "Operation"
msgstr ""
-#: views.py:268
+#: views.py:270
msgid "Context record"
msgstr ""
-#: views.py:270
+#: views.py:272
msgid "Find"
msgstr ""
-#: views.py:272
+#: views.py:274
msgid "Treatment request"
msgstr ""
-#: views.py:273
+#: views.py:275
msgid "Treatment"
msgstr ""
-#: views.py:1428 views.py:1468
+#: views.py:1490 views.py:1530
msgid "Operation not permitted."
msgstr ""
-#: views.py:1430
+#: views.py:1492
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:1485 views.py:1542
+#: views.py:1547 views.py:1605
msgid "Archaeological files"
msgstr ""
-#: views.py:1490 views.py:1553
+#: views.py:1552 views.py:1616
msgid "Finds"
msgstr ""
-#: views.py:1492 views.py:1558
+#: views.py:1554 views.py:1621
msgid "Treatment requests"
msgstr ""
-#: views.py:1493 views.py:1564
+#: views.py:1555 views.py:1627
msgid "Treatments"
msgstr ""
-#: views.py:1785
+#: views.py:1828
+msgid "Link unmatched items"
+msgstr ""
+
+#: views.py:1849
msgid "Delete import"
msgstr ""
-#: views.py:1824
+#: views.py:1888
msgid "Merge persons"
msgstr ""
-#: views.py:1848
+#: views.py:1912
msgid "Select the main person"
msgstr ""
-#: views.py:1857
+#: views.py:1921
msgid "Merge organization"
msgstr ""
-#: views.py:1867
+#: views.py:1931
msgid "Select the main organization"
msgstr ""
-#: views.py:1907 views.py:1923
+#: views.py:1971 views.py:1987
msgid "Corporation manager"
msgstr ""
-#: widgets.py:389 widgets.py:495 widgets.py:610
+#: widgets.py:351 widgets.py:462 widgets.py:577
msgid "Search..."
msgstr ""
-#: widgets.py:802
+#: widgets.py:755
msgid "Remove"
msgstr ""
-#: wizards.py:385
+#: wizards.py:393
msgid "No"
msgstr ""
-#: wizards.py:1437
+#: wizards.py:1448
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr ""
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index 5c0a5161f..605b24cfd 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -20,34 +20,47 @@ msgstr "Benutzername"
msgid "email address"
msgstr "E-Mail-Adresse"
-#: __init__.py:10 templates/ishtar/sheet_source.html:8
+#: __init__.py:10 templates/ishtar/sheet_source.html:20
msgid "Related item"
msgstr ""
-#: admin.py:82
+#: admin.py:100
msgid "Export selected as CSV file"
msgstr ""
-#: admin.py:190 admin.py:209 models.py:774
+#: admin.py:212 admin.py:231 models.py:775
msgid "Parent"
msgstr ""
-#: admin.py:197
+#: admin.py:219
msgid "Center"
msgstr ""
-#: admin.py:199 models.py:2727
+#: admin.py:221 models.py:2888
msgid "Limit"
msgstr ""
-#: admin.py:202 models.py:2737
+#: admin.py:224 models.py:2898
msgid "Town children"
msgstr ""
-#: admin.py:210
+#: admin.py:232
msgid "Parents"
msgstr ""
+#: admin.py:482 models.py:1647
+msgid "Form"
+msgstr ""
+
+#: admin.py:484 models.py:1672 models_imports.py:117
+#: templates/ishtar/dashboards/dashboard_main.html:39
+msgid "Users"
+msgstr ""
+
+#: admin.py:504 models.py:1716
+msgid "Field"
+msgstr ""
+
#: apps.py:9 apps.py:10
msgid "Ishtar administration"
msgstr ""
@@ -199,45 +212,45 @@ msgstr ""
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
-#: forms.py:74
+#: forms.py:75
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr ""
-#: forms.py:90 forms_common.py:712
+#: forms.py:91 forms_common.py:722
msgid "Confirm"
msgstr ""
-#: forms.py:95
+#: forms.py:96
msgid "Are you sure you want to delete?"
msgstr ""
-#: forms.py:129
+#: forms.py:215
msgid "There are identical items."
msgstr ""
-#: forms.py:179 forms.py:180
+#: forms.py:290 forms.py:291
msgid "Closing date"
msgstr ""
-#: forms.py:193
+#: forms.py:303
msgid "You should select an item."
msgstr ""
-#: forms.py:194
+#: forms.py:304
msgid "Add a new item"
msgstr ""
-#: forms.py:308 models.py:1862
+#: forms.py:442 models.py:1956
msgid "Template"
msgstr ""
-#: forms_common.py:41 forms_common.py:59 forms_common.py:270
-#: forms_common.py:494 models.py:1993 models.py:2744
+#: forms_common.py:42 forms_common.py:60 forms_common.py:272
+#: forms_common.py:501 models.py:2087 models.py:2905
#: templates/blocks/JQueryAdvancedTown.html:19
msgid "Town"
msgstr ""
-#: forms_common.py:43
+#: forms_common.py:44
msgid ""
" Type name, department code of the town you would like to select. The "
"search is insensitive to case.
(last recorded: %s)"
msgstr ""
-#: forms.py:270
+#: forms.py:276
msgid "Another file with this numeric id exists."
msgstr ""
-#: forms.py:275
+#: forms.py:282
+msgid "Parcels"
+msgstr ""
+
+#: forms.py:283
+#| msgid "Archaeological file search"
+msgid "Archaeological file - 020 - Parcel"
+msgstr ""
+
+#: forms.py:288
msgid "Preventive informations"
msgstr ""
-#: forms.py:293 models.py:138
+#: forms.py:306 models.py:154
msgid "Responsible for planning service"
msgstr ""
-#: forms.py:310 models.py:174
+#: forms.py:323 models.py:190
msgid "Total developed surface (m2)"
msgstr ""
-#: forms.py:333 templates/ishtar/dashboards/dashboard_file.html:45
-#: templates/ishtar/sheet_file.html:89
+#: forms.py:346 templates/ishtar/dashboards/dashboard_file.html:53
+#: templates/ishtar/sheet_file.html:121
msgid "Research archaeology"
msgstr ""
-#: forms.py:340 models.py:183 templates/ishtar/sheet_file.html:51
-#: templates/ishtar/sheet_file.html:90
+#: forms.py:347
+#| msgid "Archaeological file search"
+msgid "Archaeological file - 045 - Research - General"
+msgstr ""
+
+#: forms.py:355 models.py:199
msgid "Departments"
msgstr ""
-#: forms.py:349 models.py:192
+#: forms.py:364 models.py:208
msgid "Scientist in charge"
msgstr ""
-#: forms.py:351 models.py:186 templates/ishtar/sheet_file.html:92
+#: forms.py:366 models.py:202
msgid "Requested operation type"
msgstr ""
-#: forms.py:353
+#: forms.py:368
msgid "Lead organization"
msgstr ""
-#: forms.py:369 models.py:196 templates/ishtar/sheet_file.html:97
+#: forms.py:384 models.py:212
msgid "Classified area"
msgstr ""
-#: forms.py:371 models.py:198 templates/ishtar/sheet_file.html:98
+#: forms.py:386 models.py:214
msgid "Protected area"
msgstr ""
-#: forms.py:385
+#: forms.py:400
msgid "Would you like to close this archaeological file?"
msgstr ""
-#: forms.py:390
+#: forms.py:405
msgid "Would you like to delete this archaeological file ?"
msgstr ""
-#: forms.py:395 forms.py:422 forms.py:545
+#: forms.py:411 forms.py:439 forms.py:563
msgid "Index"
msgstr ""
-#: forms.py:399 forms.py:426 forms.py:531
+#: forms.py:415 forms.py:443 forms.py:552
msgid "Act type"
msgstr ""
-#: forms.py:400
+#: forms.py:416
msgid "Object (full text search)"
msgstr ""
-#: forms.py:427
+#: forms.py:444
msgid "Indexed?"
msgstr ""
-#: forms.py:433
+#: forms.py:450
msgid "Object"
msgstr ""
-#: forms.py:437
+#: forms.py:454
msgid "Signature date after"
msgstr ""
-#: forms.py:439
+#: forms.py:456
msgid "Signature date before"
msgstr ""
-#: forms.py:459
+#: forms.py:476
msgid "File numeric reference"
msgstr ""
-#: forms.py:460
+#: forms.py:477
msgid "File year"
msgstr ""
-#: forms.py:462
+#: forms.py:479
msgid "File other reference"
msgstr ""
-#: forms.py:464
+#: forms.py:481
msgid "File in charge"
msgstr ""
-#: forms.py:472
+#: forms.py:489
msgid "File permit reference"
msgstr ""
-#: ishtar_menu.py:33 models.py:221 templates/ishtar/sheet_file.html:4
+#: forms.py:550
+#| msgid "Archaeological files linked to at least one operation:"
+msgid "Archaeological file - Administrative act - General"
+msgstr ""
+
+#: ishtar_menu.py:33 models.py:237 templates/ishtar/sheet_file.html:4
#: wizards.py:152 wizards.py:162
msgid "Archaeological file"
msgstr ""
@@ -291,7 +313,7 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:89 models.py:222
+#: ishtar_menu.py:89 models.py:238
#: templates/ishtar/dashboards/dashboard_file.html:7
msgid "Archaeological files"
msgstr ""
@@ -304,95 +326,95 @@ msgstr ""
msgid "Archaeological file types"
msgstr ""
-#: models.py:62
+#: models.py:64
msgid "Permit types"
msgstr ""
-#: models.py:69
+#: models.py:74
msgid "Delay (in days)"
msgstr ""
-#: models.py:112
+#: models.py:128
msgid "Internal reference"
msgstr ""
-#: models.py:114
+#: models.py:130
msgid "External ID"
msgstr ""
-#: models.py:117
+#: models.py:133
msgid "External ID is set automatically"
msgstr ""
-#: models.py:129
+#: models.py:145
msgid "General contractor (raw)"
msgstr ""
-#: models.py:133
+#: models.py:149
msgid "General contractor organization"
msgstr ""
-#: models.py:141
+#: models.py:157
msgid "Planning service (raw)"
msgstr ""
-#: models.py:147
+#: models.py:163
msgid "Planning service organization"
msgstr ""
-#: models.py:153 templates/ishtar/sheet_file.html:37
+#: models.py:169 templates/ishtar/sheet_file.html:55
msgid "Closing date"
msgstr ""
-#: models.py:154
+#: models.py:170
msgid "Main town"
msgstr ""
-#: models.py:156 templates/ishtar/sheet_file.html:50
+#: models.py:172
msgid "Towns"
msgstr ""
-#: models.py:169
+#: models.py:185
msgid "Instruction deadline"
msgstr ""
-#: models.py:175
+#: models.py:191
msgid "Locality"
msgstr ""
-#: models.py:178
+#: models.py:194
msgid "Main address - postal code"
msgstr ""
-#: models.py:188 templates/ishtar/sheet_file.html:93
+#: models.py:204
msgid "Organization"
msgstr ""
-#: models.py:193
+#: models.py:209
msgid "Research archaeology comment"
msgstr ""
-#: models.py:207
+#: models.py:223
msgid "Cached name"
msgstr ""
-#: models.py:209
+#: models.py:225
msgid "Imported line"
msgstr ""
-#: models.py:235
+#: models.py:251
msgid "FILE"
msgstr ""
-#: models.py:417
+#: models.py:433
msgid "Multi-town"
msgstr ""
-#: models.py:423
+#: models.py:439
msgid "No town"
msgstr ""
-#: models.py:569
+#: models.py:585
msgid "File"
msgstr ""
@@ -408,207 +430,200 @@ msgstr ""
msgid "Generate"
msgstr ""
-#: templates/ishtar/blocks/window_file_nav.html:9
+#: templates/ishtar/blocks/window_file_nav.html:5
msgid "Add an operation for this file"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:10
-msgid "Global informations"
+#: templates/ishtar/blocks/window_file_nav.html:6
+#| msgid "Creation"
+msgid "operation"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:12
-#: templates/ishtar/dashboards/dashboard_file.html:47
-#: templates/ishtar/dashboards/dashboard_file.html:102
-msgid "Total:"
+#: templates/ishtar/dashboards/dashboard_file.html:10
+msgid "Global informations"
msgstr ""
#: templates/ishtar/dashboards/dashboard_file.html:14
-msgid ":"
+#| msgid "Total:"
+msgid "Total"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:18
-#: templates/ishtar/dashboards/dashboard_file.html:49
-#: templates/ishtar/dashboards/dashboard_file.html:133
+#: templates/ishtar/dashboards/dashboard_file.html:26
+#: templates/ishtar/dashboards/dashboard_file.html:57
+#: templates/ishtar/dashboards/dashboard_file.html:141
msgid "by year"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:22
+#: templates/ishtar/dashboards/dashboard_file.html:30
msgid "no year"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:32
-#: templates/ishtar/dashboards/dashboard_file.html:61
-#: templates/ishtar/dashboards/dashboard_file.html:147
+#: templates/ishtar/dashboards/dashboard_file.html:40
+#: templates/ishtar/dashboards/dashboard_file.html:69
+#: templates/ishtar/dashboards/dashboard_file.html:155
msgid "by month"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:73
-#: templates/ishtar/dashboards/dashboard_file.html:178
+#: templates/ishtar/dashboards/dashboard_file.html:55
+#: templates/ishtar/dashboards/dashboard_file.html:110
+msgid "Total:"
+msgstr ""
+
+#: templates/ishtar/dashboards/dashboard_file.html:81
+#: templates/ishtar/dashboards/dashboard_file.html:186
msgid "by department"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:85
+#: templates/ishtar/dashboards/dashboard_file.html:93
msgid "main towns"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:100
+#: templates/ishtar/dashboards/dashboard_file.html:108
msgid "Rescue archaeology"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:105
+#: templates/ishtar/dashboards/dashboard_file.html:113
msgid "by saisine type"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:119
+#: templates/ishtar/dashboards/dashboard_file.html:127
msgid "by administrative act"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:160
+#: templates/ishtar/dashboards/dashboard_file.html:168
msgid "Archaeological files linked to at least one operation:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:161
+#: templates/ishtar/dashboards/dashboard_file.html:169
#, python-format
msgid "Archaeological files linked to at least one operation (%%):"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:164
+#: templates/ishtar/dashboards/dashboard_file.html:172
#, python-format
msgid "archaeological files linked to at least one operation (%%)"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:192
+#: templates/ishtar/dashboards/dashboard_file.html:200
msgid "surface by department (ha)"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:206
+#: templates/ishtar/dashboards/dashboard_file.html:214
msgid "main towns by number"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_file.html:220
+#: templates/ishtar/dashboards/dashboard_file.html:228
msgid "main towns by surface (ha)"
msgstr ""
-#: templates/ishtar/sheet_file.html:34
+#: templates/ishtar/sheet_file.html:48
msgid "State"
msgstr ""
-#: templates/ishtar/sheet_file.html:34
+#: templates/ishtar/sheet_file.html:50
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_file.html:35
+#: templates/ishtar/sheet_file.html:50
msgid "Closed file"
msgstr ""
-#: templates/ishtar/sheet_file.html:37
+#: templates/ishtar/sheet_file.html:57
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_file.html:49
+#: templates/ishtar/sheet_file.html:67
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_file.html:54
-msgid "Complement"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:55
-msgid "Postal code"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:57
+#: templates/ishtar/sheet_file.html:76
msgid "Surface"
msgstr ""
-#: templates/ishtar/sheet_file.html:62
+#: templates/ishtar/sheet_file.html:86
msgid "Preventive archaeological file"
msgstr ""
-#: templates/ishtar/sheet_file.html:64
-msgid "Developed surface"
-msgstr ""
-
#: templates/ishtar/sheet_file.html:91
-msgid "Head scientist"
+msgid "Developed surface"
msgstr ""
-#: templates/ishtar/sheet_file.html:105
+#: templates/ishtar/sheet_file.html:154
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_file.html:108
+#: templates/ishtar/sheet_file.html:157
msgid "Administrative acts"
msgstr ""
-#: templates/ishtar/sheet_file.html:111 wizards.py:123
+#: templates/ishtar/sheet_file.html:160 wizards.py:123
msgid "Associated operations"
msgstr ""
-#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:148
+#: templates/ishtar/sheet_file.html:163 templates/ishtar/sheet_file.html:191
msgid "Ref."
msgstr ""
-#: templates/ishtar/sheet_file.html:118 templates/ishtar/sheet_file.html:149
+#: templates/ishtar/sheet_file.html:165 templates/ishtar/sheet_file.html:192
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_file.html:120
+#: templates/ishtar/sheet_file.html:167
msgid "Start date"
msgstr ""
-#: templates/ishtar/sheet_file.html:121
+#: templates/ishtar/sheet_file.html:168
msgid "Excavation end date"
msgstr ""
-#: templates/ishtar/sheet_file.html:136
+#: templates/ishtar/sheet_file.html:183
msgid "No operation associated to this archaeological file"
msgstr ""
-#: templates/ishtar/sheet_file.html:142
+#: templates/ishtar/sheet_file.html:187
msgid "Admninistrative acts linked to associated operations"
msgstr ""
-#: templates/ishtar/sheet_file.html:150
+#: templates/ishtar/sheet_file.html:193
msgid "Date"
msgstr ""
-#: templates/ishtar/sheet_file.html:160
+#: templates/ishtar/sheet_file.html:203
msgid "No administrative act linked to operations"
msgstr ""
-#: views.py:106
+#: views.py:105
msgid "File search"
msgstr ""
-#: views.py:115
+#: views.py:114
msgid "New file"
msgstr ""
-#: views.py:134
+#: views.py:133
msgid "File modification"
msgstr ""
-#: views.py:157
+#: views.py:156
msgid "File closing"
msgstr ""
-#: views.py:162
+#: views.py:161
msgid "File deletion"
msgstr ""
-#: views.py:169
+#: views.py:168
msgid "File: search administrative act"
msgstr ""
-#: views.py:178
+#: views.py:177
msgid "File: new administrative act"
msgstr ""
-#: views.py:188
+#: views.py:187
msgid "File: administrative act modification"
msgstr ""
-#: views.py:212
+#: views.py:211
msgid "File: administrative act deletion"
msgstr ""
diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot
index 2df118c90..85b4f7f86 100644
--- a/archaeological_files_pdl/locale/django.pot
+++ b/archaeological_files_pdl/locale/django.pot
@@ -6,117 +6,145 @@
msgid ""
msgstr ""
-#: forms.py:38
+#: forms.py:40
msgid "General"
msgstr ""
-#: forms.py:40
+#: forms.py:41
+msgid "Archaeological file - 010 - General"
+msgstr ""
+
+#: forms.py:44
msgid "File type"
msgstr ""
-#: forms.py:41 forms.py:415
+#: forms.py:45 forms.py:434
msgid "Year"
msgstr ""
-#: forms.py:45
+#: forms.py:49
msgid "Creation date"
msgstr ""
-#: forms.py:48
+#: forms.py:52
msgid "Reception date"
msgstr ""
-#: forms.py:60
+#: forms.py:62
msgid "Reception date cannot be after today."
msgstr ""
#: forms.py:68
+msgid "Archaeological file - 013 - Preventive - Saisine"
+msgstr ""
+
+#: forms.py:72
msgid "Permit type"
msgstr ""
-#: forms.py:70
+#: forms.py:74
msgid "Saisine type"
msgstr ""
-#: forms.py:84
+#: forms.py:88
msgid "Planning"
msgstr ""
-#: forms.py:87
+#: forms.py:89
+msgid "Archaeological file - 017 - Preventive - Planning"
+msgstr ""
+
+#: forms.py:93
msgid "Planning name"
msgstr ""
-#: forms.py:90 forms.py:122
+#: forms.py:96 forms.py:130
#: templates/ishtar/wizard/wizard_preventiveplanning.html:31
msgid "Towns"
msgstr ""
-#: forms.py:92 forms.py:124
+#: forms.py:98 forms.py:132
#: templates/ishtar/wizard/wizard_preventiveplanning.html:41
msgid "Departments"
msgstr ""
-#: forms.py:93 forms.py:125
+#: forms.py:99 forms.py:133
msgid "Locality"
msgstr ""
-#: forms.py:96 forms.py:128
+#: forms.py:102 forms.py:136
msgid "Address (number/street)"
msgstr ""
-#: forms.py:97 forms.py:129
+#: forms.py:103 forms.py:137
msgid "Number/street"
msgstr ""
-#: forms.py:99 forms.py:131
+#: forms.py:105 forms.py:139
msgid "Postal code"
msgstr ""
-#: forms.py:104
+#: forms.py:110
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:109
+#: forms.py:115
msgid "Total developed surface (m2)"
msgstr ""
-#: forms.py:116
+#: forms.py:122
msgid "Address"
msgstr ""
-#: forms.py:119
+#: forms.py:123
+msgid "Archaeological file - 015 - Research - Address"
+msgstr ""
+
+#: forms.py:127
msgid "Project name"
msgstr ""
-#: forms.py:232 forms.py:236 forms.py:273 forms.py:276
+#: forms.py:240 forms.py:247 forms.py:284 forms.py:287
msgid "General contractor"
msgstr ""
-#: forms.py:254 forms.py:372
+#: forms.py:241
+msgid "Archaeological file - 030 - General contrator"
+msgstr ""
+
+#: forms.py:265 forms.py:389
msgid "In charge"
msgstr ""
-#: forms.py:348 forms.py:355
+#: forms.py:363 forms.py:372
msgid "Planning service"
msgstr ""
-#: forms.py:352
+#: forms.py:364
+msgid "Archaeological file - 040 - Planning service"
+msgstr ""
+
+#: forms.py:369
msgid "File reference"
msgstr ""
-#: forms.py:395
+#: forms.py:409
+msgid "Archaeological file - 050 - Instruction"
+msgstr ""
+
+#: forms.py:414
msgid "Person in charge"
msgstr ""
-#: forms.py:407
+#: forms.py:426
msgid "Related file"
msgstr ""
-#: forms.py:411
+#: forms.py:430
msgid "Comment"
msgstr ""
-#: forms.py:418
+#: forms.py:437
msgid "Numeric reference"
msgstr ""
@@ -138,14 +166,14 @@ msgstr ""
msgid "Natural person"
msgstr ""
-#: views.py:50
+#: views.py:49
msgid "New file"
msgstr ""
-#: views.py:77
+#: views.py:76
msgid "File modification"
msgstr ""
-#: views.py:93 views.py:97
+#: views.py:92 views.py:96
msgid "File followed by"
msgstr ""
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 3092278e6..d564d418b 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -20,507 +20,535 @@ msgstr ""
msgid "Polygon"
msgstr ""
-#: forms.py:96 forms.py:100 forms.py:390 models_finds.py:568
-#: models_finds.py:858 wizards.py:64
+#: forms.py:97 forms.py:103 forms.py:371 models_finds.py:568
+#: models_finds.py:859 wizards.py:64
msgid "Context record"
msgstr ""
-#: forms.py:129 ishtar_menu.py:32 models_finds.py:768 models_finds.py:1379
-#: models_finds.py:1400 models_treatments.py:298
+#: forms.py:98
+msgid "Find - 010 - Context record choice"
+msgstr ""
+
+#: forms.py:132 ishtar_menu.py:32 models_finds.py:769 models_finds.py:1381
+#: models_finds.py:1402 models_treatments.py:311
#: templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr ""
-#: forms.py:140 forms.py:372 forms.py:654 models_finds.py:197
-#: models_finds.py:666 templates/ishtar/sheet_find.html:16
+#: forms.py:133
+msgid "Find - 020 - General"
+msgstr ""
+
+#: forms.py:145 forms.py:353 forms.py:636 models_finds.py:197
+#: models_finds.py:666 templates/ishtar/sheet_find.html:18
msgid "Free ID"
msgstr ""
-#: forms.py:142 models_finds.py:715
+#: forms.py:147 models_finds.py:715
msgid "Previous ID"
msgstr ""
-#: forms.py:143 forms.py:412 forms_treatments.py:133 models_finds.py:201
-#: models_finds.py:667 models_treatments.py:102
+#: forms.py:148 forms.py:393 forms_treatments.py:138 models_finds.py:201
+#: models_finds.py:667 models_treatments.py:111
msgid "Description"
msgstr ""
-#: forms.py:146 models_finds.py:208
+#: forms.py:151 models_finds.py:208
msgid "Discovery date"
msgstr ""
-#: forms.py:148 forms.py:414 models_finds.py:210
+#: forms.py:153 forms.py:395 models_finds.py:210
msgid "Batch/object"
msgstr ""
-#: forms.py:150 models_finds.py:690
+#: forms.py:155 models_finds.py:690
msgid "Is complete?"
msgstr ""
-#: forms.py:153 forms.py:402 forms.py:658 models_finds.py:52
+#: forms.py:158 forms.py:383 forms.py:640 models_finds.py:52
msgid "Material type"
msgstr ""
-#: forms.py:156 models_finds.py:133 models_finds.py:589 models_finds.py:693
+#: forms.py:161 models_finds.py:133 models_finds.py:589 models_finds.py:693
msgid "Object types"
msgstr ""
-#: forms.py:159 forms.py:408 models_finds.py:697
+#: forms.py:164 forms.py:389 models_finds.py:697
msgid "Integrity / interest"
msgstr ""
-#: forms.py:162 forms.py:410 models_finds.py:700
+#: forms.py:167 forms.py:391 models_finds.py:700
msgid "Remarkability"
msgstr ""
-#: forms.py:165 models_finds.py:215
+#: forms.py:170 models_finds.py:215
msgid "Point of topographic reference"
msgstr ""
-#: forms.py:168 models_finds.py:217 templates/ishtar/sheet_find.html:217
+#: forms.py:173 models_finds.py:217 templates/ishtar/sheet_find.html:217
msgid "X"
msgstr ""
-#: forms.py:169 models_finds.py:218 templates/ishtar/sheet_find.html:218
+#: forms.py:174 models_finds.py:218 templates/ishtar/sheet_find.html:218
msgid "Y"
msgstr ""
-#: forms.py:170 models_finds.py:219 templates/ishtar/sheet_find.html:219
+#: forms.py:175 models_finds.py:219 templates/ishtar/sheet_find.html:219
msgid "Z"
msgstr ""
-#: forms.py:172 models_finds.py:227
+#: forms.py:177 models_finds.py:227
msgid "Spatial Reference System"
msgstr ""
-#: forms.py:175 models_finds.py:220
+#: forms.py:180 models_finds.py:220
msgid "Estimated error for X"
msgstr ""
-#: forms.py:177 models_finds.py:222
+#: forms.py:182 models_finds.py:222
msgid "Estimated error for Y"
msgstr ""
-#: forms.py:179 models_finds.py:224
+#: forms.py:184 models_finds.py:224
msgid "Estimated error for Z"
msgstr ""
-#: forms.py:180 models_finds.py:704
+#: forms.py:185 models_finds.py:704
msgid "Length (cm)"
msgstr ""
-#: forms.py:181 models_finds.py:705
+#: forms.py:186 models_finds.py:705
msgid "Width (cm)"
msgstr ""
-#: forms.py:182 models_finds.py:706
+#: forms.py:187 models_finds.py:706
msgid "Height (cm)"
msgstr ""
-#: forms.py:183 models_finds.py:707
+#: forms.py:188 models_finds.py:707
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:184 models_finds.py:708
+#: forms.py:189 models_finds.py:708
msgid "Thickness (cm)"
msgstr ""
-#: forms.py:185 forms.py:659 models_finds.py:672
+#: forms.py:190 forms.py:641 models_finds.py:672
msgid "Volume (l)"
msgstr ""
-#: forms.py:186 forms.py:660 models_finds.py:673
+#: forms.py:191 forms.py:642 models_finds.py:673
msgid "Weight (g)"
msgstr ""
-#: forms.py:188 models_finds.py:709
+#: forms.py:193 models_finds.py:709
msgid "Dimensions comment"
msgstr ""
-#: forms.py:189 forms.py:661 models_finds.py:676
+#: forms.py:194 forms.py:643 models_finds.py:676
msgid "Find number"
msgstr ""
-#: forms.py:191 models_finds.py:703
+#: forms.py:196 models_finds.py:703
msgid "Minimum number of individuals (MNI)"
msgstr ""
-#: forms.py:192 models_finds.py:711
+#: forms.py:197 models_finds.py:711
msgid "Mark"
msgstr ""
-#: forms.py:193 forms.py:415 models_finds.py:717
+#: forms.py:198 forms.py:396 models_finds.py:717
msgid "Check"
msgstr ""
-#: forms.py:195 models_finds.py:719
+#: forms.py:200 models_finds.py:719
msgid "Check date"
msgstr ""
-#: forms.py:196 forms_treatments.py:135 forms_treatments.py:486
-#: models_finds.py:202 models_finds.py:712 models_treatments.py:101
-#: models_treatments.py:510
+#: forms.py:201 forms_treatments.py:140 forms_treatments.py:488
+#: models_finds.py:202 models_finds.py:712 models_treatments.py:110
+#: models_treatments.py:530
msgid "Comment"
msgstr ""
-#: forms.py:199 models_finds.py:713
+#: forms.py:204 models_finds.py:713
msgid "Comment on dating"
msgstr ""
-#: forms.py:200 models_finds.py:721
+#: forms.py:205 models_finds.py:721
msgid "Estimated value"
msgstr ""
-#: forms.py:202 forms_treatments.py:150
+#: forms.py:207 forms_treatments.py:155
msgid "Image"
msgstr ""
-#: forms.py:203 forms_treatments.py:151
+#: forms.py:208 forms_treatments.py:156
#, python-format
msgid ""
"
Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms_common.py:913 forms_common.py:942 forms_common.py:977 models.py:2590
+#: forms_common.py:929 forms_common.py:958 forms_common.py:993 models.py:2701
#: templates/ishtar/wizard/wizard_person_deletion.html:139
msgid "Author"
msgstr ""
-#: forms_common.py:923
+#: forms_common.py:939
msgid "Additional informations"
msgstr ""
-#: forms_common.py:934
+#: forms_common.py:950
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:950 models.py:2577 models.py:2587 models_imports.py:600
+#: forms_common.py:966 models.py:2685 models.py:2697 models_imports.py:600
msgid "Author type"
msgstr ""
-#: forms_common.py:969
+#: forms_common.py:985
msgid "Author selection"
msgstr ""
-#: forms_common.py:984
+#: forms_common.py:1000
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:988 models.py:2591 models.py:2653
-#: templates/ishtar/blocks/window_tables/documents.html:9
-#: templates/sheet_ope.html:106
+#: forms_common.py:1004 forms_common.py:1005 models.py:2702 models.py:2770
+#: models.py:2840 templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
msgstr ""
-#: ishtar_menu.py:29
+#: ishtar_menu.py:29 templates/registration/activation_complete.html:10
+msgid "Home"
+msgstr ""
+
+#: ishtar_menu.py:30
msgid "Administration"
msgstr ""
-#: ishtar_menu.py:33
+#: ishtar_menu.py:34
msgid "Addition/modification"
msgstr ""
-#: ishtar_menu.py:36 ishtar_menu.py:70 ishtar_menu.py:101
+#: ishtar_menu.py:37 ishtar_menu.py:71 ishtar_menu.py:102
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:39 models.py:1640 views.py:1684
+#: ishtar_menu.py:40 models.py:1731 views.py:1748
msgid "Global variables"
msgstr ""
-#: ishtar_menu.py:44
+#: ishtar_menu.py:45
msgid "Directory"
msgstr ""
-#: ishtar_menu.py:50 ishtar_menu.py:78 templates/blocks/JQueryJqGrid.html:3
+#: ishtar_menu.py:51 ishtar_menu.py:79 templates/blocks/DataTables.html:6
+#: templates/blocks/JQueryJqGrid.html:6
msgid "Search"
msgstr ""
-#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15
+#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_list.html:19
msgid "Creation"
msgstr "Gründung"
-#: ishtar_menu.py:58 ishtar_menu.py:88
+#: ishtar_menu.py:59 ishtar_menu.py:89
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:62 ishtar_menu.py:93
+#: ishtar_menu.py:63 ishtar_menu.py:94
msgid "Automatic merge"
msgstr ""
-#: ishtar_menu.py:66 ishtar_menu.py:97
+#: ishtar_menu.py:67 ishtar_menu.py:98
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:109 models_imports.py:800
+#: ishtar_menu.py:110 models_imports.py:802
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:112 views.py:1692
+#: ishtar_menu.py:113 views.py:1756
msgid "New import"
msgstr ""
-#: ishtar_menu.py:116 views.py:1711
+#: ishtar_menu.py:117 views.py:1775
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:120 views.py:1750
+#: ishtar_menu.py:121 views.py:1814
msgid "Old imports"
msgstr ""
-#: models.py:227
+#: models.py:228
msgid "Not a valid item."
msgstr ""
-#: models.py:242
+#: models.py:243
msgid "A selected item is not a valid item."
msgstr ""
-#: models.py:253
+#: models.py:254
msgid "This item already exists."
msgstr ""
-#: models.py:428 models.py:1953 models.py:1969 models.py:2547
+#: models.py:429 models.py:2047 models.py:2063 models.py:2655
#: models_imports.py:339
msgid "Label"
msgstr ""
-#: models.py:430
+#: models.py:431
msgid "Textual ID"
msgstr ""
-#: models.py:433
+#: models.py:434
msgid ""
"The slug is the standardized version of the name. It contains only lowercase "
"letters, numbers and hyphens. Each slug must be unique."
msgstr ""
-#: models.py:437 models.py:1865 models.py:2550 models_imports.py:129
-#: models_imports.py:509
+#: models.py:438 models.py:1648 models.py:1959 models.py:2658
+#: models_imports.py:129 models_imports.py:509
msgid "Available"
msgstr ""
-#: models.py:789 models.py:933 models_imports.py:530
+#: models.py:790 models.py:935 models_imports.py:530
#: templates/ishtar/formset_import_match.html:21
msgid "Key"
msgstr ""
-#: models.py:795
+#: models.py:796
msgid "Specific key to an import"
msgstr ""
-#: models.py:918 models.py:939 models.py:1318 models.py:2574 models.py:2844
-#: models.py:2901
+#: models.py:920 models.py:941 models.py:1330 models.py:2682 models.py:3005
+#: models.py:3064
msgid "Order"
msgstr ""
-#: models.py:921
+#: models.py:923
msgid "Json data - Menu"
msgstr ""
-#: models.py:922
+#: models.py:924
msgid "Json data - Menus"
msgstr ""
-#: models.py:934
+#: models.py:936
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
"explain it. For instance for the key 'my_subkey' with data such as {'my_key':"
" {'my_subkey': 'value'}}, its value will be reached with my_key__my_subkey."
msgstr ""
-#: models.py:938
+#: models.py:940
msgid "Display"
msgstr ""
-#: models.py:943
+#: models.py:945
msgid "Json data - Field"
msgstr ""
-#: models.py:944
+#: models.py:946
msgid "Json data - Fields"
msgstr ""
-#: models.py:955
+#: models.py:957
msgid "Content types of the field and of the menu do not match"
msgstr ""
-#: models.py:1015
+#: models.py:1017
msgid "Search vector"
msgstr ""
-#: models.py:1016
+#: models.py:1018
msgid "Auto filled at save"
msgstr ""
-#: models.py:1142
+#: models.py:1151
msgid "Last editor"
msgstr ""
-#: models.py:1145
+#: models.py:1154
msgid "Creator"
msgstr ""
-#: models.py:1319
+#: models.py:1331
msgid "Symmetrical"
msgstr ""
-#: models.py:1320
+#: models.py:1332
msgid "Tiny label"
msgstr ""
-#: models.py:1323
+#: models.py:1335
msgid "Inverse relation"
msgstr ""
-#: models.py:1333
+#: models.py:1345
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:1450
+#: models.py:1463
msgid "Euro"
msgstr ""
-#: models.py:1451
+#: models.py:1464
msgid "US dollar"
msgstr ""
-#: models.py:1452 views.py:1486 views.py:1546
+#: models.py:1465 views.py:1548 views.py:1609
msgid "Operations"
msgstr ""
-#: models.py:1453 views.py:1488 views.py:1550
+#: models.py:1466 views.py:1550 views.py:1613
msgid "Context records"
msgstr ""
-#: models.py:1459 models.py:1859 models_imports.py:114
+#: models.py:1472 models.py:1953 models_imports.py:114
msgid "Slug"
msgstr ""
-#: models.py:1462
+#: models.py:1475
msgid "CSS color code for base module"
msgstr ""
-#: models.py:1464
+#: models.py:1477
msgid "Files module"
msgstr ""
-#: models.py:1466
+#: models.py:1479
msgid "CSS color code for files module"
msgstr ""
-#: models.py:1468
+#: models.py:1481
msgid "Context records module"
msgstr ""
-#: models.py:1471
+#: models.py:1484
msgid "CSS color code for context record module"
msgstr ""
-#: models.py:1473
+#: models.py:1486
msgid "Finds module"
msgstr ""
-#: models.py:1474
+#: models.py:1487
msgid "Need context records module"
msgstr ""
-#: models.py:1476
+#: models.py:1489
msgid "Find index is based on"
msgstr ""
-#: models.py:1478
+#: models.py:1491
msgid ""
"To prevent irrelevant indexes, change this parameter only if there is no "
"find in the database"
msgstr ""
-#: models.py:1481
+#: models.py:1494
msgid "CSS color code for find module"
msgstr ""
-#: models.py:1484
+#: models.py:1497
msgid "Warehouses module"
msgstr ""
-#: models.py:1485
+#: models.py:1498
msgid "Need finds module"
msgstr ""
-#: models.py:1487
+#: models.py:1500
msgid "CSS code for warehouse module"
msgstr ""
-#: models.py:1489
+#: models.py:1502
msgid "Preservation module"
msgstr ""
-#: models.py:1491
+#: models.py:1504
msgid "Mapping module"
msgstr ""
-#: models.py:1493
+#: models.py:1506
msgid "CSS code for mapping module"
msgstr ""
-#: models.py:1496
+#: models.py:1509
msgid "Home page"
msgstr ""
-#: models.py:1497
+#: models.py:1510
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax. {random_image} can be used to display a random image."
msgstr ""
-#: models.py:1501
+#: models.py:1514
msgid "File external id"
msgstr ""
-#: models.py:1503
+#: models.py:1516
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1508
+#: models.py:1521
msgid "Parcel external id"
msgstr ""
-#: models.py:1511
+#: models.py:1524
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1516
+#: models.py:1529
msgid "Context record external id"
msgstr ""
-#: models.py:1518
+#: models.py:1531
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1523
+#: models.py:1536
msgid "Base find external id"
msgstr ""
-#: models.py:1525
+#: models.py:1538
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1530
+#: models.py:1543
msgid "Find external id"
msgstr ""
-#: models.py:1532
+#: models.py:1545
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1537
+#: models.py:1550
msgid "Container external id"
msgstr ""
-#: models.py:1539
+#: models.py:1552
msgid ""
"Formula to manage container external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1544
+#: models.py:1557
msgid "Warehouse external id"
msgstr ""
-#: models.py:1546
+#: models.py:1559
msgid ""
"Formula to manage warehouse external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1551
+#: models.py:1564
msgid "Raw name for person"
msgstr ""
-#: models.py:1553
+#: models.py:1566
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1557
+#: models.py:1570
msgid "Current active"
msgstr ""
-#: models.py:1558
+#: models.py:1571
msgid "Currency"
msgstr ""
-#: models.py:1562
+#: models.py:1575
msgid "Ishtar site profile"
msgstr ""
-#: models.py:1563
+#: models.py:1576
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:1633
+#: models.py:1650
+msgid "Enable this form"
+msgstr ""
+
+#: models.py:1651
+msgid ""
+"Disable with caution: disabling a form with mandatory fields may lead to "
+"database errors."
+msgstr ""
+
+#: models.py:1654
+msgid "Apply to all"
+msgstr ""
+
+#: models.py:1655
+msgid ""
+"Apply this form to all users. If set to True, selecting user and user type "
+"is useless."
+msgstr ""
+
+#: models.py:1661
+msgid "Custom form"
+msgstr ""
+
+#: models.py:1662
+msgid "Custom forms"
+msgstr ""
+
+#: models.py:1678
+msgid "User types"
+msgstr ""
+
+#: models.py:1719
+msgid "Excluded field"
+msgstr ""
+
+#: models.py:1720
+msgid "Excluded fields"
+msgstr ""
+
+#: models.py:1724
msgid "Variable name"
msgstr ""
-#: models.py:1634
+#: models.py:1725
msgid "Description of the variable"
msgstr ""
-#: models.py:1636 models_imports.py:531
+#: models.py:1727 models_imports.py:531
#: templates/ishtar/formset_import_match.html:22
msgid "Value"
msgstr ""
-#: models.py:1639
+#: models.py:1730
msgid "Global variable"
msgstr ""
-#: models.py:1763 models.py:1793
+#: models.py:1857 models.py:1887
msgid "Total"
msgstr ""
-#: models.py:1770 models.py:1954 models.py:1970
-#: templates/ishtar/dashboards/dashboard_main_detail.html:140
-#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
-#: templates/ishtar/sheet_person.html:24
+#: models.py:1864 models.py:2048 models.py:2064
+#: templates/ishtar/dashboards/dashboard_main_detail.html:211
+#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
+#: templates/ishtar/sheet_person.html:27
msgid "Number"
msgstr ""
-#: models.py:1857
+#: models.py:1951
msgid "Administrative Act"
msgstr ""
-#: models.py:1864
+#: models.py:1958
msgid "Associated object"
msgstr ""
-#: models.py:1869
+#: models.py:1963
msgid "Document template"
msgstr ""
-#: models.py:1870
+#: models.py:1964
msgid "Document templates"
msgstr ""
-#: models.py:1958 models.py:1971 models.py:2939 models_imports.py:786
+#: models.py:2052 models.py:2065 models.py:3102 models_imports.py:788
msgid "State"
msgstr ""
-#: models.py:1976 models.py:2731 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:2070 models.py:2892 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:1977
+#: models.py:2071
msgid "Departments"
msgstr ""
-#: models.py:2017
+#: models.py:2111
msgid "Raw phone"
msgstr ""
-#: models.py:2023
+#: models.py:2117
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:2062
+#: models.py:2156
msgid "Tel: "
msgstr ""
-#: models.py:2066
+#: models.py:2160
msgid "Mobile: "
msgstr ""
-#: models.py:2070
+#: models.py:2164
msgid "Email: "
msgstr "E-Mail-Adresse:"
-#: models.py:2075
+#: models.py:2169
msgid "Merge key"
msgstr ""
-#: models.py:2147
+#: models.py:2241
msgid "Organization types"
msgstr ""
-#: models.py:2174
+#: models.py:2271
msgid "Organizations"
msgstr ""
-#: models.py:2215
+#: models.py:2312
msgid "Groups"
msgstr ""
-#: models.py:2220
+#: models.py:2317
msgid "Person types"
msgstr ""
-#: models.py:2231 models_imports.py:632
+#: models.py:2330 models_imports.py:632
msgid "Title type"
msgstr ""
-#: models.py:2232
+#: models.py:2331
msgid "Title types"
msgstr ""
-#: models.py:2241
+#: models.py:2342
msgid "Mr"
msgstr ""
-#: models.py:2242
+#: models.py:2343
msgid "Miss"
msgstr ""
-#: models.py:2243
+#: models.py:2344
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2244
+#: models.py:2345
msgid "Mrs"
msgstr ""
-#: models.py:2245
+#: models.py:2346
msgid "Doctor"
msgstr ""
-#: models.py:2278
+#: models.py:2382
msgid "Contact type"
msgstr ""
-#: models.py:2281 models.py:2345
+#: models.py:2385 models.py:2449
msgid "Types"
msgstr ""
-#: models.py:2284
+#: models.py:2388
msgid "Is attached to"
msgstr ""
-#: models.py:2289
+#: models.py:2393
msgid "Persons"
msgstr ""
-#: models.py:2486
+#: models.py:2594
msgid "Advanced shortcut menu"
msgstr ""
-#: models.py:2489
+#: models.py:2597
msgid "Ishtar user"
msgstr ""
-#: models.py:2490
+#: models.py:2598
msgid "Ishtar users"
msgstr ""
-#: models.py:2578
+#: models.py:2686
msgid "Author types"
msgstr ""
-#: models.py:2619
+#: models.py:2730
msgid "Source types"
msgstr ""
-#: models.py:2627 models_imports.py:631
+#: models.py:2740 models_imports.py:631
msgid "Support type"
msgstr ""
-#: models.py:2628
+#: models.py:2741
msgid "Support types"
msgstr ""
-#: models.py:2635
+#: models.py:2750
msgid "Format type"
msgstr ""
-#: models.py:2636
+#: models.py:2751
msgid "Format types"
msgstr ""
-#: models.py:2644
+#: models.py:2761
msgid "External ID"
msgstr ""
-#: models.py:2647
+#: models.py:2764
msgid "Support"
msgstr ""
-#: models.py:2649 models_imports.py:601
+#: models.py:2766 models_imports.py:601
msgid "Format"
msgstr ""
-#: models.py:2651
+#: models.py:2768
msgid "Scale"
msgstr ""
-#: models.py:2665
+#: models.py:2782
msgid "Item number"
msgstr ""
-#: models.py:2666
+#: models.py:2783 models.py:2849
msgid "Ref."
msgstr ""
-#: models.py:2669
+#: models.py:2786 models.py:2852
msgid "Internal ref."
msgstr ""
-#: models.py:2724
+#: models.py:2823
+msgid "License type"
+msgstr ""
+
+#: models.py:2824
+msgid "License types"
+msgstr ""
+
+#: models.py:2830
+msgid "Image type"
+msgstr ""
+
+#: models.py:2831
+msgid "Image types"
+msgstr ""
+
+#: models.py:2838
+msgid "License"
+msgstr ""
+
+#: models.py:2842
+msgid "Authors (raw)"
+msgstr ""
+
+#: models.py:2856
+msgid "Images"
+msgstr ""
+
+#: models.py:2885
msgid "Surface (m2)"
msgstr ""
-#: models.py:2725 templates/sheet_ope.html:46 templates/sheet_ope.html:107
+#: models.py:2886
msgid "Localisation"
msgstr "Lokalisierung"
-#: models.py:2733
+#: models.py:2894
msgid "Year of creation"
msgstr ""
-#: models.py:2734
+#: models.py:2895
msgid ""
"Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
-#: models.py:2739
+#: models.py:2900
msgid "Cached name"
msgstr ""
-#: models.py:2845
+#: models.py:3006
msgid "Is preventive"
msgstr ""
-#: models.py:2848 models_imports.py:602
+#: models.py:3009 models_imports.py:602
msgid "Operation type"
msgstr ""
-#: models.py:2849
+#: models.py:3010
msgid "Operation types"
msgstr ""
-#: models.py:2879
+#: models.py:3040
msgid "Preventive"
msgstr ""
-#: models.py:2880
+#: models.py:3041
msgid "Research"
msgstr ""
-#: models.py:2903
+#: models.py:3066
msgid "Authority name"
msgstr ""
-#: models.py:2904
+#: models.py:3067
msgid "Authority SRID"
msgstr ""
-#: models.py:2907 models_imports.py:630
+#: models.py:3070 models_imports.py:630
msgid "Spatial reference system"
msgstr ""
-#: models.py:2908
+#: models.py:3071
msgid "Spatial reference systems"
msgstr ""
-#: models.py:2915
+#: models.py:3078
msgid "Filename"
msgstr ""
-#: models.py:2920
+#: models.py:3083
msgid "Administration script"
msgstr ""
-#: models.py:2921
+#: models.py:3084
msgid "Administration scripts"
msgstr ""
-#: models.py:2928
+#: models.py:3091
msgid "Scheduled"
msgstr ""
-#: models.py:2929
+#: models.py:3092
msgid "In progress"
msgstr ""
-#: models.py:2930 models_imports.py:747
+#: models.py:3093 models_imports.py:748
msgid "Finished with errors"
msgstr ""
-#: models.py:2931 models_imports.py:748
+#: models.py:3094 models_imports.py:749
msgid "Finished"
msgstr ""
-#: models.py:2944
+#: models.py:3107
msgid "Result"
msgstr ""
-#: models.py:2947
+#: models.py:3110
msgid "Administration task"
msgstr ""
-#: models.py:2948
+#: models.py:3111
msgid "Administration tasks"
msgstr ""
-#: models.py:2952
+#: models.py:3115
msgid "Unknown"
msgstr ""
-#: models.py:2967
+#: models.py:3130
msgid ""
"ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
"administrator."
msgstr ""
-#: models.py:2976
+#: models.py:3139
msgid ""
"Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
"relative paths, it can be a security issue and this is not allowed. Only put "
"a full path."
msgstr ""
-#: models.py:2987
+#: models.py:3150
msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
msgstr ""
-#: models.py:3003
+#: models.py:3166
msgid ""
"Script \"{}\" is not available in your script directory. Check your "
"configuration."
@@ -1300,10 +1388,6 @@ msgstr ""
msgid "Importer - Models"
msgstr ""
-#: models_imports.py:117 templates/ishtar/dashboards/dashboard_main.html:33
-msgid "Users"
-msgstr ""
-
#: models_imports.py:120
msgid "Associated model"
msgstr ""
@@ -1418,11 +1502,11 @@ msgstr ""
msgid "Importer - Targets"
msgstr ""
-#: models_imports.py:492 views.py:581
+#: models_imports.py:492 views.py:604
msgid "True"
msgstr ""
-#: models_imports.py:493 views.py:583
+#: models_imports.py:493 views.py:606
msgid "False"
msgstr ""
@@ -1542,13 +1626,12 @@ msgstr ""
msgid "String"
msgstr ""
-#: models_imports.py:641 templates/sheet_ope.html:86
+#: models_imports.py:641
msgid "Date"
msgstr ""
#: models_imports.py:643
-#: templates/ishtar/dashboards/dashboard_main_detail.html:125
-#: templates/sheet_ope.html:61 templates/sheet_ope.html:83
+#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
msgstr ""
@@ -1593,112 +1676,112 @@ msgstr ""
msgid "Importer - Formater types"
msgstr ""
-#: models_imports.py:742
-#: templates/ishtar/dashboards/dashboard_main_detail.html:62
+#: models_imports.py:743
+#: templates/ishtar/dashboards/dashboard_main_detail.html:132
msgid "Created"
msgstr ""
-#: models_imports.py:743
+#: models_imports.py:744
msgid "Analyse in progress"
msgstr ""
-#: models_imports.py:744
+#: models_imports.py:745
msgid "Analysed"
msgstr ""
-#: models_imports.py:745
+#: models_imports.py:746
msgid "Import pending"
msgstr ""
-#: models_imports.py:746
+#: models_imports.py:747
msgid "Import in progress"
msgstr ""
-#: models_imports.py:749
+#: models_imports.py:750
msgid "Archived"
msgstr ""
-#: models_imports.py:763
+#: models_imports.py:765
msgid "Imported file"
msgstr ""
-#: models_imports.py:765
+#: models_imports.py:767
msgid "Associated images (zip file)"
msgstr ""
-#: models_imports.py:769
+#: models_imports.py:771
msgid "If a group is selected, target key saved in this group will be used."
msgstr ""
-#: models_imports.py:772
+#: models_imports.py:774
msgid "Encoding"
msgstr ""
-#: models_imports.py:775
+#: models_imports.py:777
msgid "Skip lines"
msgstr ""
-#: models_imports.py:776
+#: models_imports.py:778
msgid "Number of header lines in your file (can be 0)."
msgstr ""
-#: models_imports.py:777 templates/ishtar/import_list.html:50
+#: models_imports.py:779
msgid "Error file"
msgstr ""
-#: models_imports.py:780
+#: models_imports.py:782
msgid "Result file"
msgstr ""
-#: models_imports.py:783 templates/ishtar/import_list.html:56
+#: models_imports.py:785
msgid "Match file"
msgstr ""
-#: models_imports.py:789
+#: models_imports.py:791
msgid "Conservative import"
msgstr ""
-#: models_imports.py:790
+#: models_imports.py:792
msgid "If set to true, do not overload existing values."
msgstr ""
-#: models_imports.py:793
+#: models_imports.py:795
msgid "End date"
msgstr ""
-#: models_imports.py:796
+#: models_imports.py:798
msgid "Remaining seconds"
msgstr ""
-#: models_imports.py:799
+#: models_imports.py:801
msgid "Import"
msgstr ""
-#: models_imports.py:828
+#: models_imports.py:830
msgid "Analyse"
msgstr ""
-#: models_imports.py:830 models_imports.py:833
+#: models_imports.py:832 models_imports.py:835
msgid "Re-analyse"
msgstr ""
-#: models_imports.py:831
+#: models_imports.py:833
msgid "Launch import"
msgstr ""
-#: models_imports.py:834
+#: models_imports.py:836
msgid "Re-import"
msgstr ""
-#: models_imports.py:835
+#: models_imports.py:837
msgid "Archive"
msgstr ""
-#: models_imports.py:837
+#: models_imports.py:839
msgid "Unarchive"
msgstr ""
-#: models_imports.py:838 templates/ishtar/form_delete.html:11 widgets.py:256
+#: models_imports.py:840 templates/ishtar/form_delete.html:11 widgets.py:258
msgid "Delete"
msgstr ""
@@ -1736,110 +1819,152 @@ msgstr ""
msgid "The %(app_name)s team"
msgstr ""
-#: templates/base.html:41
+#: templates/base.html:39
msgid "Searches in the shortcut menu deal with all items."
msgstr ""
-#: templates/base.html:42
+#: templates/base.html:40
msgid "Searches in the shortcut menu deal with only your items."
msgstr ""
-#: templates/base.html:49
-msgid "Logged in"
-msgstr ""
-
-#: templates/base.html:50
-msgid "Log out"
-msgstr ""
-
-#: templates/base.html:51
-msgid "Change password"
+#: templates/base.html:41
+msgid "yes"
msgstr ""
-#: templates/base.html:53 templates/registration/activate.html:10
-#: templates/registration/login.html:8 templates/registration/login.html:10
-#: templates/registration/password_reset_complete.html:8
-msgid "Log in"
+#: templates/base.html:42
+msgid "no"
msgstr ""
-#: templates/base.html:82
+#: templates/base.html:68
msgid "Current items"
msgstr ""
-#: templates/base.html:84 templates/ishtar/manage_basket.html:4
-#: templates/welcome.html:7 templates/welcome.html:8 templates/welcome.html:9
-#: templates/welcome.html:10
+#: templates/base.html:70 templates/blocks/bs_form_snippet.html:55
+#: templates/ishtar/manage_basket.html:4 templates/welcome.html:13
+#: templates/welcome.html:14 templates/welcome.html:15
+#: templates/welcome.html:16
msgid ":"
msgstr ""
-#: templates/base.html:128
+#: templates/base.html:107
msgid "Processing..."
msgstr ""
-#: templates/base.html:129
+#: templates/base.html:109
msgid "This can be long."
msgstr ""
-#: templates/base.html:130
+#: templates/base.html:111
msgid "Time to take a coffee?"
msgstr ""
-#: templates/base.html:131
+#: templates/base.html:113
msgid "Time to take another coffee?"
msgstr ""
-#: templates/blocks/JQueryAdvancedTown.html:3
-msgctxt "Region"
-msgid "State"
+#: templates/blocks/DataTables.html:14 templates/blocks/JQueryJqGrid.html:16
+msgid "Pinned search:"
msgstr ""
-#: templates/blocks/JQueryAdvancedTown.html:29
-msgid "Choose a state first"
+#: templates/blocks/DataTables.html:52
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:39
+msgid "Expand table"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:9
-msgid "Search and select an item"
+#: templates/blocks/DataTables.html:58 templates/blocks/JQueryJqGrid.html:26
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:45
+msgid "Export"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:13
-msgid "Pinned search:"
+#: templates/blocks/DataTables.html:61 templates/blocks/DataTables.html:64
+#: templates/blocks/JQueryJqGrid.html:29 templates/blocks/JQueryJqGrid.html:32
+msgid "Export as CSV - "
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:23 templates/blocks/JQueryJqGrid.html:29
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12
-msgid "Export as CSV"
+#: templates/blocks/DataTables.html:61 templates/blocks/JQueryJqGrid.html:29
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:6
+msgid "simple"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:23 templates/blocks/JQueryJqGrid.html:29
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-msgid "CSV"
+#: templates/blocks/DataTables.html:61
+msgid "Simple CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:24
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+#: templates/blocks/DataTables.html:62 templates/blocks/JQueryJqGrid.html:30
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:48
msgid "Export as CSV - full"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:24
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+#: templates/blocks/DataTables.html:62 templates/blocks/JQueryJqGrid.html:30
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:48
msgid "CSV full"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:26
-msgid "Export as CSV - "
+#: templates/blocks/DataTables.html:67 templates/blocks/JQueryJqGrid.html:35
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:47
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:50
+msgid "Export as CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:34 templates/ishtar/manage_basket.html:12
-#: templates/window.html:40
+#: templates/blocks/DataTables.html:67 templates/blocks/JQueryJqGrid.html:29
+#: templates/blocks/JQueryJqGrid.html:35
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:47
+msgid "CSV"
+msgstr ""
+
+#: templates/blocks/DataTables.html:74 templates/blocks/JQueryJqGrid.html:42
+#: templates/ishtar/manage_basket.html:13 templates/window.html:39
msgid "Add"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:108
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
+#: templates/blocks/DataTables.html:157
+msgid "Select all items"
+msgstr ""
+
+#: templates/blocks/DataTables.html:158
+msgid "Select none"
+msgstr ""
+
+#: templates/blocks/JQueryAdvancedTown.html:3
+msgctxt "Region"
+msgid "State"
+msgstr ""
+
+#: templates/blocks/JQueryAdvancedTown.html:29
+msgid "Choose a state first"
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:12
+msgid "Search and select an item"
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:116
msgid "An error as occured during search. Check your query fields."
msgstr ""
+#: templates/blocks/bs_form_snippet.html:31
+msgid "help"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:41
+#: templates/blocks/bs_form_snippet.html:65
+msgid "Advanced search"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:81
+msgid "Reset"
+msgstr ""
+
+#: templates/blocks/bs_form_snippet.html:83 templates/ishtar/form.html:26
+#: templates/ishtar/formset.html:8
+#: templates/ishtar/formset_import_match.html:51
+#: templates/ishtar/import_list.html:79 templates/ishtar/merge.html:30
+#: templates/ishtar/simple_form.html:7 templates/ishtar/wizard/search.html:21
+#: templates/ishtar/wizard/validation_bar.html:6
+msgid "Validate"
+msgstr ""
+
#: templates/blocks/comma_list.html:1
msgid "and"
msgstr ""
@@ -1857,61 +1982,56 @@ msgid "Show / hide advanced search"
msgstr ""
#: templates/blocks/form_flex_snippet.html:18
-#: templates/blocks/form_snippet.html:9
+#: templates/blocks/table_form_snippet.html:9
msgid "Help"
msgstr ""
-#: templates/ishtar/basket_list.html:6
-msgid "remove"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:14
-#: templates/ishtar/blocks/shortcut_menu.html:14
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:6
+#: templates/ishtar/blocks/shortcut_menu.html:11
msgid ""
"Simple menu limited to your own items. Be careful only the last 100 items "
"are displayed."
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:14
-#: templates/ishtar/blocks/shortcut_menu.html:14
-msgid "simple"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
-#: templates/ishtar/blocks/shortcut_menu.html:15
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
+#: templates/ishtar/blocks/shortcut_menu.html:7
msgid "Advanced menu"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
-#: templates/ishtar/blocks/shortcut_menu.html:15
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:7
+#: templates/ishtar/blocks/shortcut_menu.html:7
msgid "advanced"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:18
-#: templates/ishtar/blocks/shortcut_menu.html:18
-msgid ""
-"Pin an item in order to constrain default searches with this item. By "
-"default only your items are displayed. New created and modified items are "
-"auto-pin."
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:20
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:11
msgid "Search within my items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:21
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:16
msgid "Search within all items"
msgstr ""
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:24
-msgid "Refresh menu"
-msgstr ""
-
-#: templates/ishtar/blocks/advanced_shortcut_menu.html:35
+#: templates/ishtar/blocks/advanced_shortcut_menu.html:42
#: templates/ishtar/blocks/shortcut_menu.html:30
msgid "Unpin"
msgstr ""
+#: templates/ishtar/blocks/base_shortcut_menu.html:18
+msgid "No default selection"
+msgstr ""
+
+#: templates/ishtar/blocks/base_shortcut_menu.html:26
+msgid ""
+"Pin an item in order to constrain default searches with this item. By "
+"default only your items are displayed. New created and modified items are "
+"auto-pin."
+msgstr ""
+
+#: templates/ishtar/blocks/base_shortcut_menu.html:30
+msgid "Default selection"
+msgstr ""
+
#: templates/ishtar/blocks/footer.html:2
#, python-format
msgid ""
@@ -1927,12 +2047,12 @@ msgstr ""
msgid "Modify"
msgstr ""
-#: templates/ishtar/blocks/sheet_creation_section.html:3
+#: templates/ishtar/blocks/sheet_creation_section.html:4
msgctxt "Sheet"
msgid "Creation"
msgstr ""
-#: templates/ishtar/blocks/sheet_creation_section.html:12
+#: templates/ishtar/blocks/sheet_creation_section.html:14
msgctxt "Sheet"
msgid "Modification"
msgstr ""
@@ -1942,44 +2062,40 @@ msgid "Internal ID"
msgstr ""
#: templates/ishtar/blocks/window_nav.html:5
-msgid "Previous version"
+msgid "History"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:16
-msgid "Restore this version"
-msgstr ""
-
-#: templates/ishtar/blocks/window_nav.html:16
+#: templates/ishtar/blocks/window_nav.html:17
msgid ""
"Are you sure to restore to this version? All changes made since this version "
"will be lost."
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:21
-msgid "Restore"
+#: templates/ishtar/blocks/window_nav.html:18
+msgid "Restore this version"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:23
-msgid "Next version"
+#: templates/ishtar/blocks/window_nav.html:34
+msgid "Actions"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:45
+#: templates/ishtar/blocks/window_nav.html:44
msgid "Item pined in your shortcut menu."
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:45
+#: templates/ishtar/blocks/window_nav.html:44
msgid "Pin"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:51
+#: templates/ishtar/blocks/window_nav.html:49
msgid "Export as OpenOffice.org file"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:51
+#: templates/ishtar/blocks/window_nav.html:52
msgid "Export as PDF file"
msgstr ""
-#: templates/ishtar/blocks/window_nav.html:55
+#: templates/ishtar/blocks/window_nav.html:60
msgid "Relation between items are not historized."
msgstr ""
@@ -1992,95 +2108,89 @@ msgstr ""
msgid "Link"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:4
+#: templates/ishtar/dashboards/dashboard_main_detail.html:3
msgid "Numbers"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:11
+#: templates/ishtar/dashboards/dashboard_main_detail.html:12
msgid "Change"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:15
+#: templates/ishtar/dashboards/dashboard_main_detail.html:17
msgid "Total:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:18
+#: templates/ishtar/dashboards/dashboard_main_detail.html:22
msgid "Draw rectangle on the graph to zoom. Double-click to reinitialize."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:20
+#: templates/ishtar/dashboards/dashboard_main_detail.html:28
msgid "Display as an image"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:23
+#: templates/ishtar/dashboards/dashboard_main_detail.html:37
msgid "Right-click on this image to save it."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:40
+#: templates/ishtar/dashboards/dashboard_main_detail.html:55
msgid "By years"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:42
-#: templates/ishtar/dashboards/dashboard_main_detail.html:52
+#: templates/ishtar/dashboards/dashboard_main_detail.html:58
+#: templates/ishtar/dashboards/dashboard_main_detail.html:96
msgid "Average:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:43
-#: templates/ishtar/dashboards/dashboard_main_detail.html:53
+#: templates/ishtar/dashboards/dashboard_main_detail.html:65
+#: templates/ishtar/dashboards/dashboard_main_detail.html:103
msgid "Variance:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:44
-#: templates/ishtar/dashboards/dashboard_main_detail.html:54
+#: templates/ishtar/dashboards/dashboard_main_detail.html:72
+#: templates/ishtar/dashboards/dashboard_main_detail.html:110
msgid "Standard deviation:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:45
-#: templates/ishtar/dashboards/dashboard_main_detail.html:55
+#: templates/ishtar/dashboards/dashboard_main_detail.html:78
+#: templates/ishtar/dashboards/dashboard_main_detail.html:116
msgid "Median:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:46
-#: templates/ishtar/dashboards/dashboard_main_detail.html:56
+#: templates/ishtar/dashboards/dashboard_main_detail.html:84
+#: templates/ishtar/dashboards/dashboard_main_detail.html:122
msgid "Mode:"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:50
+#: templates/ishtar/dashboards/dashboard_main_detail.html:93
msgid "By operations"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:60
+#: templates/ishtar/dashboards/dashboard_main_detail.html:130
msgid "Created last"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:73
+#: templates/ishtar/dashboards/dashboard_main_detail.html:142
msgid "Recent changes"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:75
+#: templates/ishtar/dashboards/dashboard_main_detail.html:144
msgid "Modified"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:113
+#: templates/ishtar/dashboards/dashboard_main_detail.html:182
msgid "No data for these criteria."
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail.html:131
+#: templates/ishtar/dashboards/dashboard_main_detail.html:202
msgid "Month"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
+#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
msgid "User type"
msgstr ""
-#: templates/ishtar/form.html:14 templates/ishtar/formset.html:8
-#: templates/ishtar/formset_import_match.html:51
-#: templates/ishtar/import_list.html:61 templates/ishtar/merge.html:30
-#: templates/ishtar/simple_form.html:7
-#: templates/ishtar/wizard/default_wizard.html:30
-#: templates/ishtar/wizard/search.html:13
-#: templates/ishtar/wizard/validation_bar.html:3
-msgid "Validate"
+#: templates/ishtar/form.html:20 templates/ishtar/wizard/default_wizard.html:43
+msgid "Search and select an item in the table"
msgstr ""
#: templates/ishtar/formset_import_match.html:5
@@ -2104,7 +2214,7 @@ msgstr ""
msgid "Are you sure?"
msgstr ""
-#: templates/ishtar/import_delete.html:20 wizards.py:383
+#: templates/ishtar/import_delete.html:20 wizards.py:391
msgid "Yes"
msgstr ""
@@ -2112,44 +2222,58 @@ msgstr ""
msgid "Back"
msgstr ""
-#: templates/ishtar/import_list.html:7
+#: templates/ishtar/import_list.html:12
msgid "No pending imports."
msgstr ""
-#: templates/ishtar/import_list.html:14
+#: templates/ishtar/import_list.html:18
msgctxt "file"
msgid "File"
msgstr ""
-#: templates/ishtar/import_list.html:16
+#: templates/ishtar/import_list.html:20
msgid "Status"
msgstr ""
-#: templates/ishtar/import_list.html:17
+#: templates/ishtar/import_list.html:21
msgid "Action"
msgstr ""
-#: templates/ishtar/import_list.html:28
-msgid "Source file"
+#: templates/ishtar/import_list.html:22
+msgid "Unmatched items"
msgstr ""
-#: templates/ishtar/import_list.html:46 views.py:1764
-msgid "Link unmatched items"
+#: templates/ishtar/import_list.html:23
+msgid "Error"
+msgstr ""
+
+#: templates/ishtar/import_list.html:24
+msgid "Control"
+msgstr ""
+
+#: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54
+msgid "Match"
msgstr ""
-#: templates/ishtar/import_list.html:53
-msgid "Control file"
+#: templates/ishtar/import_list.html:36
+msgid "Source file"
msgstr ""
-#: templates/ishtar/manage_basket.html:9
+#: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61
+#: templates/ishtar/import_list.html:64
+msgctxt "not a directory"
+msgid "File"
+msgstr ""
+
+#: templates/ishtar/manage_basket.html:8
msgid "Checking \"Select all\" only selects the current page."
msgstr ""
-#: templates/ishtar/manage_basket.html:13
+#: templates/ishtar/manage_basket.html:16
msgid "Basket content"
msgstr ""
-#: templates/ishtar/manage_basket.html:21 templates/ishtar/sheet.html:28
+#: templates/ishtar/manage_basket.html:24 templates/ishtar/sheet.html:38
msgid "Close"
msgstr ""
@@ -2200,7 +2324,7 @@ msgstr ""
#: templates/ishtar/organization_form.html:40
#: templates/ishtar/organization_person_form.html:35
#: templates/ishtar/person_form.html:46
-#: templates/ishtar/wizard/validation_bar.html:7
+#: templates/ishtar/wizard/validation_bar.html:20
msgid "Cancel"
msgstr ""
@@ -2213,123 +2337,115 @@ msgstr ""
msgid "Contact informations"
msgstr ""
-#: templates/ishtar/sheet.html:34
-msgid "Close all windows"
-msgstr ""
-
-#: templates/ishtar/sheet_organization.html:9
-msgid "Created by:"
-msgstr ""
-
-#: templates/ishtar/sheet_organization.html:16
+#: templates/ishtar/sheet_organization.html:19
msgid "Person in the organization"
msgstr ""
-#: templates/ishtar/sheet_organization.html:31
+#: templates/ishtar/sheet_organization.html:36
msgid "No person in this organization"
msgstr ""
-#: templates/ishtar/sheet_organization.html:35
+#: templates/ishtar/sheet_organization.html:40
msgid "General contractor organization of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_organization.html:40
+#: templates/ishtar/sheet_organization.html:45
msgid "Planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:23
-#: templates/ishtar/wizard/wizard_person.html:19
+#: templates/ishtar/sheet_person.html:26
+#: templates/ishtar/wizard/wizard_person.html:38
msgid "Phone type"
msgstr ""
-#: templates/ishtar/sheet_person.html:46
-#: templates/ishtar/wizard/wizard_person.html:42
+#: templates/ishtar/sheet_person.html:49
+#: templates/ishtar/wizard/wizard_person.html:64
msgid "Business address"
msgstr ""
-#: templates/ishtar/sheet_person.html:55
-#: templates/ishtar/wizard/wizard_person.html:51
+#: templates/ishtar/sheet_person.html:58
+#: templates/ishtar/wizard/wizard_person.html:77
msgid "Other address"
msgstr ""
-#: templates/ishtar/sheet_person.html:64
+#: templates/ishtar/sheet_person.html:67
msgid "Associated organization"
msgstr ""
-#: templates/ishtar/sheet_person.html:76
+#: templates/ishtar/sheet_person.html:79
msgid "Associated operations as scientist"
msgstr ""
-#: templates/ishtar/sheet_person.html:80
+#: templates/ishtar/sheet_person.html:83
msgid "Associated operations as responsible"
msgstr ""
-#: templates/ishtar/sheet_person.html:85
+#: templates/ishtar/sheet_person.html:88
#: templates/ishtar/wizard/wizard_person_deletion.html:6
msgid "In charge of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:90
+#: templates/ishtar/sheet_person.html:93
#: templates/ishtar/wizard/wizard_person_deletion.html:15
msgid "General contractor of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:95
+#: templates/ishtar/sheet_person.html:98
#: templates/ishtar/wizard/wizard_person_deletion.html:24
msgid "Responsible for planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:101
+#: templates/ishtar/sheet_person.html:104
msgid "Documents associated to operations"
msgstr ""
-#: templates/ishtar/sheet_person.html:106
+#: templates/ishtar/sheet_person.html:109
msgid "Documents associated to context records"
msgstr ""
-#: templates/ishtar/sheet_person.html:111
+#: templates/ishtar/sheet_person.html:114
msgid "Documents associated to finds"
msgstr ""
-#: templates/ishtar/sheet_source.html:22
+#: templates/ishtar/sheet_source.html:28
msgid "Web link"
msgstr ""
-#: templates/ishtar/wizard/confirm_wizard.html:17
+#: templates/ishtar/wizard/confirm_wizard.html:12
#: templates/ishtar/wizard/wizard_done_summary.html:6
msgid "You have entered the following informations:"
msgstr ""
-#: templates/ishtar/wizard/confirm_wizard.html:44
+#: templates/ishtar/wizard/confirm_wizard.html:50
msgid "Would you like to save them?"
msgstr ""
-#: templates/ishtar/wizard/default_wizard.html:36
-#: templates/ishtar/wizard/parcels_wizard.html:24
+#: templates/ishtar/wizard/default_wizard.html:31
+#: templates/ishtar/wizard/parcels_wizard.html:33
#: templates/ishtar/wizard/relations_wizard.html:23
-#: templates/ishtar/wizard/search.html:20
+#: templates/ishtar/wizard/search.html:28
#: templates/ishtar/wizard/towns_wizard.html:19
msgid "Add/Modify"
msgstr ""
-#: templates/ishtar/wizard/default_wizard.html:63
+#: templates/ishtar/wizard/default_wizard.html:59
msgid ""
"The form has changed. If you don't validate it, all your changes will be "
"lost."
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:12
+#: templates/ishtar/wizard/parcels_wizard.html:14
msgid ""
"Existing parcels from the operation will be automatically added to the "
"archaeological file."
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:20
+#: templates/ishtar/wizard/parcels_wizard.html:26
#: templates/ishtar/wizard/relations_wizard.html:20
msgid "all"
msgstr ""
-#: templates/ishtar/wizard/parcels_wizard.html:23
+#: templates/ishtar/wizard/parcels_wizard.html:29
msgid "Add all parcels from the archaeological file"
msgstr ""
@@ -2337,7 +2453,7 @@ msgstr ""
msgid "No town set in the associated file."
msgstr ""
-#: templates/ishtar/wizard/validation_bar.html:5
+#: templates/ishtar/wizard/validation_bar.html:13
msgid "Validate and end"
msgstr ""
@@ -2349,7 +2465,7 @@ msgstr ""
msgid "Item successfully deleted"
msgstr ""
-#: templates/ishtar/wizard/wizard_done.html:4
+#: templates/ishtar/wizard/wizard_done.html:6
msgid "Item successfully saved"
msgstr ""
@@ -2374,7 +2490,7 @@ msgstr ""
msgid "Adminact: operator of archaeological operations"
msgstr ""
-#: templates/ishtar/wizard/wizard_person.html:20
+#: templates/ishtar/wizard/wizard_person.html:39
msgctxt "phone number"
msgid "Number"
msgstr ""
@@ -2431,6 +2547,24 @@ msgstr ""
msgid "Owns parcels"
msgstr ""
+#: templates/navbar.html:12
+msgid "Toggle navigation"
+msgstr ""
+
+#: templates/navbar.html:28
+msgid "Log out"
+msgstr ""
+
+#: templates/navbar.html:31
+msgid "Change password"
+msgstr ""
+
+#: templates/navbar.html:37 templates/registration/activate.html:10
+#: templates/registration/login.html:7 templates/registration/login.html:34
+#: templates/registration/password_reset_complete.html:8
+msgid "Log in"
+msgstr ""
+
#: templates/registration/activate.html:8
msgid "Account successfully activated"
msgstr ""
@@ -2447,10 +2581,6 @@ msgstr ""
msgid "Login now"
msgstr ""
-#: templates/registration/activation_complete.html:10
-msgid "Home"
-msgstr ""
-
#: templates/registration/activation_email.txt:2
msgid "Activate account at"
msgstr ""
@@ -2464,19 +2594,19 @@ msgstr ""
msgid "Account activation on"
msgstr ""
-#: templates/registration/login.html:16
+#: templates/registration/login.html:43
msgid "Forgot password?"
msgstr ""
-#: templates/registration/login.html:16
+#: templates/registration/login.html:43
msgid "Reset it"
msgstr ""
-#: templates/registration/login.html:17
+#: templates/registration/login.html:44
msgid "Not member?"
msgstr ""
-#: templates/registration/login.html:17
+#: templates/registration/login.html:44
#: templates/registration/registration_form.html:8
msgid "Register"
msgstr ""
@@ -2521,291 +2651,75 @@ msgstr ""
msgid "You are now registered. Activation email sent."
msgstr ""
-#: templates/sheet_ope.html:4
-msgid "Export as:"
-msgstr ""
-
-#: templates/sheet_ope.html:4
-msgid "OpenOffice.org file"
-msgstr ""
-
-#: templates/sheet_ope.html:4
-msgid "PDF file"
-msgstr ""
-
-#: templates/sheet_ope.html:5
-msgid "General"
-msgstr ""
-
-#: templates/sheet_ope.html:6
-msgid "Year:"
-msgstr ""
-
-#: templates/sheet_ope.html:7
-msgid "Numerical reference:"
-msgstr ""
-
-#: templates/sheet_ope.html:9
-msgid "Patriarche OA code:"
-msgstr ""
-
-#: templates/sheet_ope.html:10
-msgid "Patriarche OA code not yet recorded !"
-msgstr ""
-
-#: templates/sheet_ope.html:12
-msgid "Operation's name:"
-msgstr ""
-
-#: templates/sheet_ope.html:14
-msgid "Edition date:"
-msgstr ""
-
-#: templates/sheet_ope.html:16
-msgid "Begining date:"
-msgstr ""
-
-#: templates/sheet_ope.html:17
-msgid "Field work end date:"
-msgstr ""
-
-#: templates/sheet_ope.html:19
-msgid "Head scientist:"
-msgstr ""
-
-#: templates/sheet_ope.html:20
-msgid "State:"
-msgstr ""
-
-#: templates/sheet_ope.html:20
-msgid "Active file"
-msgstr ""
-
-#: templates/sheet_ope.html:21
-msgid "Closed operation"
-msgstr ""
-
-#: templates/sheet_ope.html:22
-msgid "Closing date:"
-msgstr ""
-
-#: templates/sheet_ope.html:22
-msgid "by"
-msgstr ""
-
-#: templates/sheet_ope.html:24
-msgid "Type:"
-msgstr ""
-
-#: templates/sheet_ope.html:25
-msgid "Surface:"
-msgstr ""
-
-#: templates/sheet_ope.html:26
-msgid "Cost:"
-msgstr ""
-
-#: templates/sheet_ope.html:27
-msgid "Duration:"
-msgstr ""
-
-#: templates/sheet_ope.html:27
-msgid "Day"
-msgstr ""
-
-#: templates/sheet_ope.html:29
-msgid "Remains:"
-msgstr ""
-
-#: templates/sheet_ope.html:30
-msgid "Periods:"
-msgstr ""
-
-#: templates/sheet_ope.html:33
-msgid "Related file:"
-msgstr ""
-
-#: templates/sheet_ope.html:35
-msgid "Operator's reference code:"
-msgstr ""
-
-#: templates/sheet_ope.html:36
-msgid "Planning service:"
-msgstr ""
-
-#: templates/sheet_ope.html:37
-msgid "Permit type:"
-msgstr ""
-
-#: templates/sheet_ope.html:38
-msgid "Permit reference:"
-msgstr ""
-
-#: templates/sheet_ope.html:39
-msgid "General contractor organisation:"
-msgstr ""
-
-#: templates/sheet_ope.html:40
-msgid "General contractor:"
-msgstr ""
-
-#: templates/sheet_ope.html:44
-msgid "Comment:"
-msgstr ""
-
-#: templates/sheet_ope.html:47
-msgid "Towns:"
-msgstr ""
-
-#: templates/sheet_ope.html:49
-msgid "Main address:"
-msgstr ""
-
-#: templates/sheet_ope.html:50
-msgid "Complement:"
-msgstr ""
-
-#: templates/sheet_ope.html:51
-msgid "Postal code:"
-msgstr "Postleitzahl:"
-
-#: templates/sheet_ope.html:53
-msgid "Lambert X:"
-msgstr ""
-
-#: templates/sheet_ope.html:54
-msgid "Lambert Y:"
-msgstr ""
-
-#: templates/sheet_ope.html:55
-msgid "Altitude (m NGF):"
-msgstr ""
-
-#: templates/sheet_ope.html:58
-msgid "Associated parcels"
-msgstr ""
-
-#: templates/sheet_ope.html:60
-msgid "Commune"
-msgstr ""
-
-#: templates/sheet_ope.html:62
-msgid "Section"
-msgstr ""
-
-#: templates/sheet_ope.html:63 templates/sheet_ope.html:129
-msgid "Parcel"
-msgstr ""
-
-#: templates/sheet_ope.html:64
-msgid "Owner"
-msgstr ""
-
-#: templates/sheet_ope.html:75
-msgid "No parcel associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:79 templates/sheet_ope.html:81
-msgid "Admninistrative acts"
-msgstr ""
-
-#: templates/sheet_ope.html:96
-msgid "No administrative act associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:100
-msgid "Documentation"
-msgstr ""
-
-#: templates/sheet_ope.html:102
-msgid "Documents"
-msgstr ""
-
-#: templates/sheet_ope.html:117
-msgid "No document associated to this operation"
-msgstr ""
-
-#: templates/sheet_ope.html:121 templates/sheet_ope.html:123
-msgid "Context Records"
-msgstr ""
-
-#: templates/sheet_ope.html:125
-msgid "ID"
-msgstr ""
-
-#: templates/sheet_ope.html:127
-msgid "Chronology"
-msgstr ""
-
-#: templates/sheet_ope.html:139
-msgid "Details"
-msgstr ""
-
-#: templates/sheet_ope.html:142
-msgid "No context record associated to this operation"
-msgstr ""
-
#: templates/welcome.html:3
msgid ""
"Welcome in Ishtar, open source software for management and inventory of "
"archaeological data"
msgstr ""
-#: templates/welcome.html:5
+#: templates/welcome.html:11
msgid "Some useful links:"
msgstr ""
-#: templates/welcome.html:7
+#: templates/welcome.html:13
msgid "Presentation site and blog"
msgstr ""
-#: templates/welcome.html:7
+#: templates/welcome.html:13
msgid "stay tuned with Ishtar news!"
msgstr ""
-#: templates/welcome.html:8
+#: templates/welcome.html:14
msgid "Admin interface"
msgstr ""
-#: templates/welcome.html:8
+#: templates/welcome.html:14
msgid "for admin only."
msgstr ""
-#: templates/welcome.html:9
+#: templates/welcome.html:15
msgid "Forum"
msgstr ""
-#: templates/welcome.html:9
+#: templates/welcome.html:15
msgid ""
"need help? find a new bug? a fantastic feature to propose? Here is the place "
"to go."
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "Source code"
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "tickets"
msgstr ""
-#: templates/welcome.html:10
+#: templates/welcome.html:16
msgid "where the magic happens."
msgstr ""
-#: templatetags/window_tables.py:96 widgets.py:800
+#: templates/widgets/image_input.html:13
+msgid "delete"
+msgstr ""
+
+#: templatetags/window_tables.py:97 widgets.py:753
msgid "No results"
msgstr ""
-#: templatetags/window_tables.py:97 widgets.py:801
+#: templatetags/window_tables.py:98 widgets.py:754
msgid "Loading..."
msgstr ""
-#: utils.py:124
+#: utils.py:145
msgid " (...)"
msgstr ""
-#: utils.py:172
+#: utils.py:204
+msgid "Information"
+msgstr ""
+
+#: utils.py:205
msgid "Load another random image?"
msgstr ""
@@ -2853,92 +2767,96 @@ msgstr ""
msgid "Account deletion"
msgstr ""
-#: views.py:265
+#: views.py:267
msgid "Archaeological file"
msgstr ""
-#: views.py:266
+#: views.py:268
msgid "Operation"
msgstr ""
-#: views.py:268
+#: views.py:270
msgid "Context record"
msgstr ""
-#: views.py:270
+#: views.py:272
msgid "Find"
msgstr ""
-#: views.py:272
+#: views.py:274
msgid "Treatment request"
msgstr ""
-#: views.py:273
+#: views.py:275
msgid "Treatment"
msgstr ""
-#: views.py:1428 views.py:1468
+#: views.py:1490 views.py:1530
msgid "Operation not permitted."
msgstr ""
-#: views.py:1430
+#: views.py:1492
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:1485 views.py:1542
+#: views.py:1547 views.py:1605
msgid "Archaeological files"
msgstr ""
-#: views.py:1490 views.py:1553
+#: views.py:1552 views.py:1616
msgid "Finds"
msgstr ""
-#: views.py:1492 views.py:1558
+#: views.py:1554 views.py:1621
msgid "Treatment requests"
msgstr ""
-#: views.py:1493 views.py:1564
+#: views.py:1555 views.py:1627
msgid "Treatments"
msgstr ""
-#: views.py:1785
+#: views.py:1828
+msgid "Link unmatched items"
+msgstr ""
+
+#: views.py:1849
msgid "Delete import"
msgstr ""
-#: views.py:1824
+#: views.py:1888
msgid "Merge persons"
msgstr ""
-#: views.py:1848
+#: views.py:1912
msgid "Select the main person"
msgstr ""
-#: views.py:1857
+#: views.py:1921
msgid "Merge organization"
msgstr ""
-#: views.py:1867
+#: views.py:1931
msgid "Select the main organization"
msgstr ""
-#: views.py:1907 views.py:1923
+#: views.py:1971 views.py:1987
msgid "Corporation manager"
msgstr ""
-#: widgets.py:389 widgets.py:495 widgets.py:610
+#: widgets.py:351 widgets.py:462 widgets.py:577
msgid "Search..."
msgstr ""
-#: widgets.py:802
+#: widgets.py:755
msgid "Remove"
msgstr ""
-#: wizards.py:385
+#: wizards.py:393
msgid "No"
msgstr ""
-#: wizards.py:1437
+#: wizards.py:1448
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr ""
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index fea9502cd..8cea4306d 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.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: 2018-01-18 07:32-0500\n"
-"Last-Translator: Étienne Loks Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -163,108 +171,116 @@ msgstr ""
msgid "This ID already exists for this operation."
msgstr "Cet identifiant existe déjà pour cette opération."
-#: forms.py:255 forms.py:282 models.py:70
+#: forms.py:255 forms.py:276 models.py:74
msgid "Dating"
msgstr "Datation"
-#: forms.py:261 models.py:60
+#: forms.py:261 models.py:64
msgid "Start date"
msgstr "Date de début"
-#: forms.py:262 models.py:61
+#: forms.py:262 models.py:65
msgid "End date"
msgstr "Date de fin"
-#: forms.py:263 models.py:64
+#: forms.py:263 models.py:68
msgid "Quality"
msgstr "Qualité"
-#: forms.py:264 models.py:42 models.py:62
+#: forms.py:264 models.py:42 models.py:66
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:291 ishtar_menu.py:29 models.py:84 models.py:688
+#: forms.py:277
+msgid "Context record - 030 - Dating"
+msgstr "Unité d'enregistrement - 030 - Datation"
+
+#: forms.py:287 ishtar_menu.py:29 models.py:88 models.py:704
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:306
+#: forms.py:303
msgid "Relations"
msgstr "Relations"
-#: forms.py:310 forms.py:318 models.py:276
-#: templates/ishtar/sheet_contextrecord.html:49
+#: forms.py:304
+msgid "Context record - 050 - Relations"
+msgstr "Unité d'enregistrement - 050 - Relations"
+
+#: forms.py:309 forms.py:320 models.py:291
+#: templates/ishtar/sheet_contextrecord.html:59
msgid "Interpretation"
msgstr "Interprétation"
-#: forms.py:314
+#: forms.py:316
msgid "Comments on dating"
msgstr "Commentaires sur la datation"
-#: forms.py:316 models.py:275
+#: forms.py:318 models.py:290
msgid "Filling"
msgstr "Remplissage"
-#: forms.py:320 models.py:296
+#: forms.py:322 models.py:311
msgid "Activity"
msgstr "Activité"
-#: forms.py:322 models.py:294
+#: forms.py:324 models.py:309
msgid "Identification"
msgstr "Identification"
-#: forms.py:324 models.py:279
+#: forms.py:326 models.py:294
msgid "TAQ"
msgstr "TAQ"
-#: forms.py:325 models.py:283
+#: forms.py:327 models.py:298
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: forms.py:327 models.py:286
+#: forms.py:329 models.py:301
msgid "TPQ"
msgstr "TPQ"
-#: forms.py:328 models.py:290
+#: forms.py:330 models.py:305
msgid "Estimated TPQ"
msgstr "TPQ estimé"
-#: forms.py:343
+#: forms.py:340
msgid "Operation search"
msgstr "Rechercher une opération"
-#: forms.py:345
+#: forms.py:342
msgid "You should select an operation."
msgstr "Vous devez sélectionner une Opération."
-#: forms.py:350
+#: forms.py:347
msgid "Would you like to delete this context record?"
msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?"
-#: forms.py:359
+#: forms.py:357
msgid "You should select a context record."
msgstr "Vous devez sélectionner une Unité d'Enregistrement."
-#: forms.py:364
+#: forms.py:362
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:366
+#: forms.py:364
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:373
+#: forms.py:371
msgid "Town of the operation"
msgstr "Commune de l'opération"
-#: forms.py:375
+#: forms.py:373
msgid "Period of the context record"
msgstr "Période de l'Unité d'Enregistrement"
-#: forms.py:390
+#: forms.py:388
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:392
+#: forms.py:390
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
@@ -288,115 +304,115 @@ msgstr "Suppression"
msgid "Dating types"
msgstr "Types de datation"
-#: models.py:51
+#: models.py:53
msgid "Dating quality type"
msgstr "Type de qualité de datation"
-#: models.py:52
+#: models.py:54
msgid "Dating quality types"
msgstr "Types de qualité de datation"
-#: models.py:66
+#: models.py:70
msgid "Precise dating"
msgstr "Datation précise"
-#: models.py:71
+#: models.py:75
msgid "Datings"
msgstr "Datations"
-#: models.py:91
+#: models.py:95
msgid "Find"
msgstr "Mobilier"
-#: models.py:110 models.py:127 models.py:141
+#: models.py:114 models.py:133 models.py:149
msgid "Order"
msgstr "Ordre"
-#: models.py:112
+#: models.py:116
msgid "Parent context record type"
msgstr "Type d'UE parent"
-#: models.py:116
+#: models.py:120
msgid "Context record Type"
msgstr "Type d'Unité d'Enregistrement"
-#: models.py:117
+#: models.py:121
msgid "Context record Types"
msgstr "Types d'Unité d'Enregistrement"
-#: models.py:130
+#: models.py:136
msgid "Activity Type"
msgstr "Type d'activité"
-#: models.py:131
+#: models.py:137
msgid "Activity Types"
msgstr "Types d'activité"
-#: models.py:144
+#: models.py:152
msgid "Identification Type"
msgstr "Type d'identification"
-#: models.py:145
+#: models.py:153
msgid "Identification Types"
msgstr "Types d'identification"
-#: models.py:156
+#: models.py:166
msgid "Excavation technique type"
msgstr "Type de méthode de fouille"
-#: models.py:157
+#: models.py:167
msgid "Excavation technique types"
msgstr "Types de méthode de fouille"
-#: models.py:165
+#: models.py:177
msgid "Documentation type"
msgstr "Type de documentation"
-#: models.py:166
+#: models.py:178
msgid "Documentation types"
msgstr "Types de documentation"
-#: models.py:205 models.py:615
+#: models.py:219 models.py:630
msgid "Periods"
msgstr "Périodes"
-#: models.py:206
+#: models.py:220
msgid "Datings (period)"
msgstr "Datations (période)"
-#: models.py:207
+#: models.py:221
msgid "Related context records"
msgstr "Unités d'Enregistrement liées"
-#: models.py:210
+#: models.py:224
msgid "Parcel (external ID)"
msgstr "Parcelle (identifiant externe)"
-#: models.py:211 models.py:212
+#: models.py:225 models.py:226
msgid "Parcel (town)"
msgstr "Parcelle (commune)"
-#: models.py:213
+#: models.py:227
msgid "Parcel (year)"
msgstr "Parcelle (année)"
-#: models.py:244
+#: models.py:259
msgid "External ID"
msgstr "ID externe"
-#: models.py:246
+#: models.py:261
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models.py:267
+#: models.py:282
msgid "A short description of the location of the context record"
msgstr "Une courte description de la localisation de l'Unité d'Enregistrement"
-#: models.py:271
+#: models.py:286
msgid "Comment on datings"
msgstr "Commentaire sur les datations"
-#: models.py:280
+#: models.py:295
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -404,11 +420,11 @@ msgstr ""
"« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée "
"après cette date."
-#: models.py:284
+#: models.py:299
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »."
-#: models.py:287
+#: models.py:302
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -416,164 +432,152 @@ msgstr ""
"« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée "
"avant cette date."
-#: models.py:291
+#: models.py:306
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »."
-#: models.py:302
+#: models.py:317
msgid "Point (2D)"
msgstr "Point (2D)"
-#: models.py:303
+#: models.py:318
msgid "Point (3D)"
msgstr "Point (3D)"
-#: models.py:305
+#: models.py:320
+msgid "Images"
+msgstr "Images"
+
+#: models.py:322
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:316 models.py:317 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:333 models.py:334 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:333
+#: models.py:350
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: models.py:542 models.py:565 models.py:610
+#: models.py:557 models.py:580 models.py:625
msgid "Relation type"
msgstr "Type de relation"
-#: models.py:543
+#: models.py:558
msgid "Relation types"
msgstr "Types de relation"
-#: models.py:560
+#: models.py:575
msgid "ID (left)"
msgstr "ID (gauche)"
-#: models.py:561
+#: models.py:576
msgid "Context record type (left)"
msgstr "Type d'UE (gauche)"
-#: models.py:562
+#: models.py:577
msgid "Parcel (left)"
msgstr "Parcelle (gauche)"
-#: models.py:563
+#: models.py:578
msgid "Description (left)"
msgstr "Description (gauche)"
-#: models.py:564
+#: models.py:579
msgid "Periods (left)"
msgstr "Périodes (gauche)"
-#: models.py:566
+#: models.py:581
msgid "ID (right)"
msgstr "ID (droit)"
-#: models.py:567
+#: models.py:582
msgid "Context record type (right)"
msgstr "Type d'UE (droite)"
-#: models.py:568
+#: models.py:583
msgid "Parcel (right)"
msgstr "Parcelle (droite)"
-#: models.py:569
+#: models.py:584
msgid "Description (right)"
msgstr "Description (droite)"
-#: models.py:570
+#: models.py:585
msgid "Periods (right)"
msgstr "Périodes (droite)"
-#: models.py:579
+#: models.py:594
msgid "Record relation"
msgstr "Relation entre Unités d'Enregistrement"
-#: models.py:580
+#: models.py:595
msgid "Record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: models.py:673
+#: models.py:689
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: models.py:674
+#: models.py:690
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Complete ID"
-msgstr "ID complet"
-
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Temporary ID"
-msgstr "ID temporaire"
-
-#: templates/ishtar/sheet_contextrecord.html:61
+#: templates/ishtar/sheet_contextrecord.html:70
msgid "Datations"
msgstr "Datations"
-#: templates/ishtar/sheet_contextrecord.html:70
+#: templates/ishtar/sheet_contextrecord.html:79
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:77
+#: templates/ishtar/sheet_contextrecord.html:86
msgid "Operation summary"
msgstr "Résumé de l'opération"
-#: templates/ishtar/sheet_contextrecord.html:79
+#: templates/ishtar/sheet_contextrecord.html:89
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
-#: templates/ishtar/sheet_contextrecord.html:83
+#: templates/ishtar/sheet_contextrecord.html:94
msgid "Numerical reference"
msgstr "Référence numérique"
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:100
msgid "State"
msgstr "État"
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:101
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_contextrecord.html:87
+#: templates/ishtar/sheet_contextrecord.html:101
msgid "Closed operation"
msgstr "Opération close"
-#: templates/ishtar/sheet_contextrecord.html:89
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_contextrecord.html:97
+#: templates/ishtar/sheet_contextrecord.html:118
msgid "Localisation"
msgstr "Lieu"
-#: templates/ishtar/sheet_contextrecord.html:98
-msgid "Towns"
-msgstr "Communes"
-
-#: templates/ishtar/sheet_contextrecord.html:99
-msgid "Related operation"
-msgstr "Opération associée"
-
-#: templates/ishtar/sheet_contextrecord.html:101
-msgid "No operation linked to this context unit!"
-msgstr "Pas d'opération rattachée à cette UE !"
+#: templates/ishtar/sheet_contextrecord.html:127
+msgid "No operation linked to this context record!"
+msgstr "Pas d'opération liée à cette unité d'enregistrement !"
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:130
msgid "Document from this context record"
msgstr "Document associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:109
+#: templates/ishtar/sheet_contextrecord.html:135
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_contextrecord.html:114
+#: templates/ishtar/sheet_contextrecord.html:140
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po
index 6f4903ac1..32a8069bd 100644
--- a/translations/fr/archaeological_files.po
+++ b/translations/fr/archaeological_files.po
@@ -11,255 +11,273 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-01-18 07:33-0500\n"
-"Last-Translator: Étienne Loks Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -193,328 +201,341 @@ msgstr ""
" Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé). Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -401,19 +413,19 @@ msgstr ""
" Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé). Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -129,47 +145,51 @@ msgstr ""
" Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé). Type name, department code of the town you would like to select. The "
"search is insensitive to case. Par exemple tapez « saint denis 93 » pour obtenir la "
"commune Saint-Denis dans le département français de Seine-Saint-Denis. Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -591,115 +608,119 @@ msgstr ""
" Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).
(last recorded: %s)"
msgstr "
(dernier enregistrement : %s)"
-#: forms.py:270
+#: forms.py:276
msgid "Another file with this numeric id exists."
msgstr "Un autre dossier avec cet identifiant numérique existe."
-#: forms.py:275
+#: forms.py:282
+msgid "Parcels"
+msgstr "Parcelles"
+
+#: forms.py:283
+msgid "Archaeological file - 020 - Parcel"
+msgstr "Dossier archéologique - 020 - Parcelles"
+
+#: forms.py:288
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: forms.py:293 models.py:138
+#: forms.py:306 models.py:154
msgid "Responsible for planning service"
msgstr "Responsable pour le service instructeur"
-#: forms.py:310 models.py:174
+#: forms.py:323 models.py:190
msgid "Total developed surface (m2)"
msgstr "Surface totale aménagée (m2)"
-#: forms.py:333 templates/ishtar/dashboards/dashboard_file.html:45
-#: templates/ishtar/sheet_file.html:89
+#: forms.py:346 templates/ishtar/dashboards/dashboard_file.html:53
+#: templates/ishtar/sheet_file.html:121
msgid "Research archaeology"
msgstr "Archéologie programmée"
-#: forms.py:340 models.py:183 templates/ishtar/sheet_file.html:51
-#: templates/ishtar/sheet_file.html:90
+#: forms.py:347
+msgid "Archaeological file - 045 - Research - General"
+msgstr "Dossier archéologique - 045 - Recherche - Général"
+
+#: forms.py:355 models.py:199
msgid "Departments"
msgstr "Départements"
-#: forms.py:349 models.py:192
+#: forms.py:364 models.py:208
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:351 models.py:186 templates/ishtar/sheet_file.html:92
+#: forms.py:366 models.py:202
msgid "Requested operation type"
msgstr "Type d'opération demandée"
-#: forms.py:353
+#: forms.py:368
msgid "Lead organization"
msgstr "Organisation porteuse du projet"
-#: forms.py:369 models.py:196 templates/ishtar/sheet_file.html:97
+#: forms.py:384 models.py:212
msgid "Classified area"
msgstr "Au sein d'un site classé"
-#: forms.py:371 models.py:198 templates/ishtar/sheet_file.html:98
+#: forms.py:386 models.py:214
msgid "Protected area"
msgstr "Au sein d'un secteur sauvegardé"
-#: forms.py:385
+#: forms.py:400
msgid "Would you like to close this archaeological file?"
msgstr "Voulez-vous clore ce dossier archéologique ?"
-#: forms.py:390
+#: forms.py:405
msgid "Would you like to delete this archaeological file ?"
msgstr "Voulez-vous supprimer ce dossier archéologique ?"
-#: forms.py:395 forms.py:422 forms.py:545
+#: forms.py:411 forms.py:439 forms.py:563
msgid "Index"
msgstr "Index"
-#: forms.py:399 forms.py:426 forms.py:531
+#: forms.py:415 forms.py:443 forms.py:552
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:400
+#: forms.py:416
msgid "Object (full text search)"
-msgstr "Objet (recherche texte intégral)"
+msgstr "Objet (recherche en texte intégral)"
-#: forms.py:427
+#: forms.py:444
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:433
+#: forms.py:450
msgid "Object"
msgstr "Objet"
-#: forms.py:437
+#: forms.py:454
msgid "Signature date after"
msgstr "Date de signature après"
-#: forms.py:439
+#: forms.py:456
msgid "Signature date before"
msgstr "Date de signature avant"
-#: forms.py:459
+#: forms.py:476
msgid "File numeric reference"
msgstr "Dossier : réf. numérique"
-#: forms.py:460
+#: forms.py:477
msgid "File year"
msgstr "Dossier : année"
-#: forms.py:462
+#: forms.py:479
msgid "File other reference"
msgstr "Dossier : autre référence"
-#: forms.py:464
+#: forms.py:481
msgid "File in charge"
msgstr "Dossier : responsable"
-#: forms.py:472
+#: forms.py:489
msgid "File permit reference"
msgstr "Dossier : réf. du permis"
-#: ishtar_menu.py:33 models.py:221 templates/ishtar/sheet_file.html:4
+#: forms.py:550
+msgid "Archaeological file - Administrative act - General"
+msgstr "Dossier archéologique - Acte administratif - Général"
+
+#: ishtar_menu.py:33 models.py:237 templates/ishtar/sheet_file.html:4
#: wizards.py:152 wizards.py:162
msgid "Archaeological file"
msgstr "Dossier"
@@ -300,7 +318,7 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:89 models.py:222
+#: ishtar_menu.py:89 models.py:238
#: templates/ishtar/dashboards/dashboard_file.html:7
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
@@ -313,95 +331,95 @@ msgstr "Type de dossier archéologique"
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: models.py:62
+#: models.py:64
msgid "Permit types"
msgstr "Types de permis"
-#: models.py:69
+#: models.py:74
msgid "Delay (in days)"
msgstr "Délai (en jours)"
-#: models.py:112
+#: models.py:128
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:114
+#: models.py:130
msgid "External ID"
msgstr "ID externe"
-#: models.py:117
+#: models.py:133
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models.py:129
+#: models.py:145
msgid "General contractor (raw)"
msgstr "Aménageur (brut)"
-#: models.py:133
+#: models.py:149
msgid "General contractor organization"
msgstr "Organisation de l'aménageur"
-#: models.py:141
+#: models.py:157
msgid "Planning service (raw)"
msgstr "Service instructeur (brut)"
-#: models.py:147
+#: models.py:163
msgid "Planning service organization"
msgstr "Service instructeur"
-#: models.py:153 templates/ishtar/sheet_file.html:37
+#: models.py:169 templates/ishtar/sheet_file.html:55
msgid "Closing date"
msgstr "Date de clôture"
-#: models.py:154
+#: models.py:170
msgid "Main town"
msgstr "Commune principale"
-#: models.py:156 templates/ishtar/sheet_file.html:50
+#: models.py:172
msgid "Towns"
msgstr "Communes"
-#: models.py:169
+#: models.py:185
msgid "Instruction deadline"
msgstr "Date limite d'instruction"
-#: models.py:175
+#: models.py:191
msgid "Locality"
msgstr "Lieu-dit"
-#: models.py:178
+#: models.py:194
msgid "Main address - postal code"
msgstr "Adresse des terrains - code postal"
-#: models.py:188 templates/ishtar/sheet_file.html:93
+#: models.py:204
msgid "Organization"
msgstr "Organisation"
-#: models.py:193
+#: models.py:209
msgid "Research archaeology comment"
msgstr "Commentaire archéologie programmée"
-#: models.py:207
+#: models.py:223
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:209
+#: models.py:225
msgid "Imported line"
msgstr "Ligne importée"
-#: models.py:235
+#: models.py:251
msgid "FILE"
msgstr "DOSSIER"
-#: models.py:417
+#: models.py:433
msgid "Multi-town"
msgstr "Intercommunal"
-#: models.py:423
+#: models.py:439
msgid "No town"
msgstr "Pas de commune"
-#: models.py:569
+#: models.py:585
msgid "File"
msgstr "Dossier"
@@ -417,207 +435,198 @@ msgstr "Choisir le type de document"
msgid "Generate"
msgstr "Générer"
-#: templates/ishtar/blocks/window_file_nav.html:9
+#: templates/ishtar/blocks/window_file_nav.html:5
msgid "Add an operation for this file"
msgstr "Ajouter une opération pour ce dossier"
+#: templates/ishtar/blocks/window_file_nav.html:6
+msgid "operation"
+msgstr "opération"
+
#: templates/ishtar/dashboards/dashboard_file.html:10
msgid "Global informations"
msgstr "Informations générales"
-#: templates/ishtar/dashboards/dashboard_file.html:12
-#: templates/ishtar/dashboards/dashboard_file.html:47
-#: templates/ishtar/dashboards/dashboard_file.html:102
-msgid "Total:"
-msgstr "Total :"
-
#: templates/ishtar/dashboards/dashboard_file.html:14
-msgid ":"
-msgstr " :"
+msgid "Total"
+msgstr "Total"
-#: templates/ishtar/dashboards/dashboard_file.html:18
-#: templates/ishtar/dashboards/dashboard_file.html:49
-#: templates/ishtar/dashboards/dashboard_file.html:133
+#: templates/ishtar/dashboards/dashboard_file.html:26
+#: templates/ishtar/dashboards/dashboard_file.html:57
+#: templates/ishtar/dashboards/dashboard_file.html:141
msgid "by year"
msgstr "par année"
-#: templates/ishtar/dashboards/dashboard_file.html:22
+#: templates/ishtar/dashboards/dashboard_file.html:30
msgid "no year"
msgstr "pas d'année"
-#: templates/ishtar/dashboards/dashboard_file.html:32
-#: templates/ishtar/dashboards/dashboard_file.html:61
-#: templates/ishtar/dashboards/dashboard_file.html:147
+#: templates/ishtar/dashboards/dashboard_file.html:40
+#: templates/ishtar/dashboards/dashboard_file.html:69
+#: templates/ishtar/dashboards/dashboard_file.html:155
msgid "by month"
msgstr "par mois"
-#: templates/ishtar/dashboards/dashboard_file.html:73
-#: templates/ishtar/dashboards/dashboard_file.html:178
+#: templates/ishtar/dashboards/dashboard_file.html:55
+#: templates/ishtar/dashboards/dashboard_file.html:110
+msgid "Total:"
+msgstr "Total :"
+
+#: templates/ishtar/dashboards/dashboard_file.html:81
+#: templates/ishtar/dashboards/dashboard_file.html:186
msgid "by department"
msgstr "par département"
-#: templates/ishtar/dashboards/dashboard_file.html:85
+#: templates/ishtar/dashboards/dashboard_file.html:93
msgid "main towns"
msgstr "communes principales"
-#: templates/ishtar/dashboards/dashboard_file.html:100
+#: templates/ishtar/dashboards/dashboard_file.html:108
msgid "Rescue archaeology"
msgstr "Archéologie préventive"
-#: templates/ishtar/dashboards/dashboard_file.html:105
+#: templates/ishtar/dashboards/dashboard_file.html:113
msgid "by saisine type"
msgstr "par type de saisine"
-#: templates/ishtar/dashboards/dashboard_file.html:119
+#: templates/ishtar/dashboards/dashboard_file.html:127
msgid "by administrative act"
msgstr "par acte administratif"
-#: templates/ishtar/dashboards/dashboard_file.html:160
+#: templates/ishtar/dashboards/dashboard_file.html:168
msgid "Archaeological files linked to at least one operation:"
msgstr "Dossiers associés à au moins une opération :"
-#: templates/ishtar/dashboards/dashboard_file.html:161
+#: templates/ishtar/dashboards/dashboard_file.html:169
#, python-format
msgid "Archaeological files linked to at least one operation (%%):"
msgstr "Dossiers associés à au moins une opération (%%) :"
-#: templates/ishtar/dashboards/dashboard_file.html:164
+#: templates/ishtar/dashboards/dashboard_file.html:172
#, python-format
msgid "archaeological files linked to at least one operation (%%)"
msgstr "dossiers associés à au moins une opérations (%%)"
-#: templates/ishtar/dashboards/dashboard_file.html:192
+#: templates/ishtar/dashboards/dashboard_file.html:200
msgid "surface by department (ha)"
msgstr "surface par département (ha)"
-#: templates/ishtar/dashboards/dashboard_file.html:206
+#: templates/ishtar/dashboards/dashboard_file.html:214
msgid "main towns by number"
msgstr "communes principales en nombre"
-#: templates/ishtar/dashboards/dashboard_file.html:220
+#: templates/ishtar/dashboards/dashboard_file.html:228
msgid "main towns by surface (ha)"
msgstr "communes principales en surface (ha)"
-#: templates/ishtar/sheet_file.html:34
+#: templates/ishtar/sheet_file.html:48
msgid "State"
msgstr "État"
-#: templates/ishtar/sheet_file.html:34
+#: templates/ishtar/sheet_file.html:50
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_file.html:35
+#: templates/ishtar/sheet_file.html:50
msgid "Closed file"
msgstr "Dossier clos"
-#: templates/ishtar/sheet_file.html:37
+#: templates/ishtar/sheet_file.html:57
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_file.html:49
+#: templates/ishtar/sheet_file.html:67
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_file.html:54
-msgid "Complement"
-msgstr "Complément"
-
-#: templates/ishtar/sheet_file.html:55
-msgid "Postal code"
-msgstr "Code postal"
-
-#: templates/ishtar/sheet_file.html:57
+#: templates/ishtar/sheet_file.html:76
msgid "Surface"
msgstr "Surface"
-#: templates/ishtar/sheet_file.html:62
+#: templates/ishtar/sheet_file.html:86
msgid "Preventive archaeological file"
msgstr "Dossier d'archéologie préventive"
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:91
msgid "Developed surface"
msgstr "Surface aménagée"
-#: templates/ishtar/sheet_file.html:91
-msgid "Head scientist"
-msgstr "Responsable scientifique"
-
-#: templates/ishtar/sheet_file.html:105
+#: templates/ishtar/sheet_file.html:154
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_file.html:108
+#: templates/ishtar/sheet_file.html:157
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: templates/ishtar/sheet_file.html:111 wizards.py:123
+#: templates/ishtar/sheet_file.html:160 wizards.py:123
msgid "Associated operations"
msgstr "Opérations associées"
-#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:148
+#: templates/ishtar/sheet_file.html:163 templates/ishtar/sheet_file.html:191
msgid "Ref."
msgstr "Réf."
-#: templates/ishtar/sheet_file.html:118 templates/ishtar/sheet_file.html:149
+#: templates/ishtar/sheet_file.html:165 templates/ishtar/sheet_file.html:192
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_file.html:120
+#: templates/ishtar/sheet_file.html:167
msgid "Start date"
msgstr "Date de début"
-#: templates/ishtar/sheet_file.html:121
+#: templates/ishtar/sheet_file.html:168
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: templates/ishtar/sheet_file.html:136
+#: templates/ishtar/sheet_file.html:183
msgid "No operation associated to this archaeological file"
msgstr "Pas d'opération associée à ce dossier archéologique"
-#: templates/ishtar/sheet_file.html:142
+#: templates/ishtar/sheet_file.html:187
msgid "Admninistrative acts linked to associated operations"
msgstr "Actes administratifs associés à ces opérations"
-#: templates/ishtar/sheet_file.html:150
+#: templates/ishtar/sheet_file.html:193
msgid "Date"
msgstr "Date"
-#: templates/ishtar/sheet_file.html:160
+#: templates/ishtar/sheet_file.html:203
msgid "No administrative act linked to operations"
msgstr "Pas d'acte administratif associé à ces opérations"
-#: views.py:106
+#: views.py:105
msgid "File search"
msgstr "Rechercher un dossier archéologique"
-#: views.py:115
+#: views.py:114
msgid "New file"
msgstr "Ajouter un dossier"
-#: views.py:134
+#: views.py:133
msgid "File modification"
msgstr "Modifier un dossier archéologique"
-#: views.py:157
+#: views.py:156
msgid "File closing"
msgstr "Clôture de dossier archéologique"
-#: views.py:162
+#: views.py:161
msgid "File deletion"
msgstr "Supprimer un dossier"
-#: views.py:169
+#: views.py:168
msgid "File: search administrative act"
msgstr "Dossier : rechercher un acte administratif"
-#: views.py:178
+#: views.py:177
msgid "File: new administrative act"
msgstr "Dossier : ajouter un acte administratif"
-#: views.py:188
+#: views.py:187
msgid "File: administrative act modification"
msgstr "Dossier : modifier un acte administratif"
-#: views.py:212
+#: views.py:211
msgid "File: administrative act deletion"
msgstr "Dossier : supprimer un acte administratif"
diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po
index e72f163fc..3a5814035 100644
--- a/translations/fr/archaeological_files_pdl.po
+++ b/translations/fr/archaeological_files_pdl.po
@@ -3,129 +3,158 @@
# This file is distributed under the same license as the Ishtar package.
# Étienne Loks