diff options
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 135 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 135 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 141 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 135 |
4 files changed, 288 insertions, 258 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 860bc8a10..3ec09460e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-12 10:42+0100\n" +"POT-Creation-Date: 2021-02-12 11:36+0100\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -448,9 +448,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:201 #: archaeological_finds/models_treatments.py:663 #: archaeological_finds/templates/ishtar/sheet_find.html:223 -#: archaeological_finds/templates/ishtar/sheet_find.html:291 -#: archaeological_finds/templates/ishtar/sheet_find.html:329 -#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:404 #: archaeological_operations/forms.py:841 #: archaeological_operations/models.py:66 #: archaeological_operations/models.py:1045 @@ -463,10 +463,10 @@ msgstr "" #: archaeological_finds/forms.py:919 archaeological_finds/models_finds.py:2804 #: archaeological_finds/models_treatments.py:664 #: archaeological_finds/templates/ishtar/sheet_find.html:224 -#: archaeological_finds/templates/ishtar/sheet_find.html:292 -#: archaeological_finds/templates/ishtar/sheet_find.html:330 -#: archaeological_finds/templates/ishtar/sheet_find.html:368 -#: archaeological_finds/templates/ishtar/sheet_find.html:406 +#: archaeological_finds/templates/ishtar/sheet_find.html:329 +#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:443 #: archaeological_operations/models.py:67 #: archaeological_operations/models.py:2669 ishtar_common/models_imports.py:975 msgid "End date" @@ -1335,9 +1335,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:145 #: archaeological_finds/models_treatments.py:95 #: archaeological_finds/models_treatments.py:175 -#: archaeological_finds/templates/ishtar/sheet_find.html:287 -#: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:324 +#: archaeological_finds/templates/ishtar/sheet_find.html:362 +#: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1604,7 +1604,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1013 -#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:442 msgid "Reception date" msgstr "" @@ -1642,7 +1642,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:266 #: archaeological_finds/models_treatments.py:999 -#: archaeological_finds/templates/ishtar/sheet_find.html:402 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_warehouse/forms.py:169 archaeological_warehouse/models.py:321 msgid "Person in charge" msgstr "" @@ -1651,7 +1651,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/forms_treatments.py:767 #: archaeological_finds/models_treatments.py:994 -#: archaeological_finds/templates/ishtar/sheet_find.html:401 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1235 #: archaeological_operations/forms.py:1390 @@ -2344,10 +2344,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:778 #: archaeological_finds/models_treatments.py:94 -#: archaeological_finds/templates/ishtar/sheet_find.html:286 -#: archaeological_finds/templates/ishtar/sheet_find.html:324 -#: archaeological_finds/templates/ishtar/sheet_find.html:362 -#: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: archaeological_finds/templates/ishtar/sheet_find.html:323 +#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:452 #: archaeological_operations/templates/ishtar/sheet_operation.html:516 @@ -3245,22 +3245,25 @@ msgstr "" msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:887 -#: ishtar_common/forms_common.py:1305 -msgid "Current container" +#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:888 +#: archaeological_finds/models_finds.py:1600 +#: archaeological_finds/templates/ishtar/sheet_find.html:272 +#: ishtar_common/forms_common.py:1311 +msgid "Reference container" msgstr "" #: archaeological_finds/forms.py:1283 -msgid "Current container - Warehouse (location)" +msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1299 archaeological_finds/models_finds.py:888 -#: archaeological_finds/models_finds.py:1600 ishtar_common/forms_common.py:1311 -msgid "Reference container" +#: archaeological_finds/forms.py:1301 archaeological_finds/models_finds.py:887 +#: archaeological_finds/templates/ishtar/sheet_find.html:293 +#: ishtar_common/forms_common.py:1305 +msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1305 -msgid "Reference container - Warehouse (location)" +#: archaeological_finds/forms.py:1307 +msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1326 archaeological_finds/forms.py:1342 @@ -3304,9 +3307,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:175 #: archaeological_finds/models_treatments.py:162 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:285 -#: archaeological_finds/templates/ishtar/sheet_find.html:323 -#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:322 +#: archaeological_finds/templates/ishtar/sheet_find.html:360 +#: archaeological_finds/templates/ishtar/sheet_find.html:398 #: ishtar_common/forms_common.py:1251 ishtar_common/models.py:666 #: ishtar_common/models.py:1230 ishtar_common/models.py:2600 #: ishtar_common/models_common.py:143 ishtar_common/models_common.py:173 @@ -3505,9 +3508,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2784 #: archaeological_finds/models_treatments.py:204 #: archaeological_finds/models_treatments.py:666 -#: archaeological_finds/templates/ishtar/sheet_find.html:290 -#: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:327 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:403 #: archaeological_warehouse/forms.py:261 archaeological_warehouse/models.py:607 #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1512 @@ -3599,7 +3602,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/forms_treatments.py:786 #: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/templates/ishtar/sheet_find.html:403 +#: archaeological_finds/templates/ishtar/sheet_find.html:440 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -3607,7 +3610,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:703 #: archaeological_finds/forms_treatments.py:792 #: archaeological_finds/models_treatments.py:1007 -#: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: archaeological_finds/templates/ishtar/sheet_find.html:441 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4450,7 +4453,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1903 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1103 archaeological_warehouse/forms.py:561 -#: archaeological_warehouse/views.py:160 ishtar_common/models.py:3183 +#: archaeological_warehouse/views.py:182 ishtar_common/models.py:3183 #: ishtar_common/models.py:3461 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 #: ishtar_common/views.py:2447 @@ -4466,12 +4469,12 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:1586 -#: archaeological_finds/templates/ishtar/sheet_find.html:318 +#: archaeological_finds/templates/ishtar/sheet_find.html:355 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1589 -#: archaeological_finds/templates/ishtar/sheet_find.html:356 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 msgid "Downstream treatment" msgstr "" @@ -4625,9 +4628,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:667 -#: archaeological_finds/templates/ishtar/sheet_find.html:289 -#: archaeological_finds/templates/ishtar/sheet_find.html:327 -#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:326 +#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:402 msgid "Doer" msgstr "" @@ -4676,7 +4679,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1041 -#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 #: ishtar_common/views.py:875 ishtar_common/views.py:942 msgid "Treatment requests" msgstr "" @@ -4775,24 +4778,28 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:280 +#: archaeological_finds/templates/ishtar/sheet_find.html:294 +msgid "Reference container / current container" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:317 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:284 -#: archaeological_finds/templates/ishtar/sheet_find.html:322 -#: archaeological_finds/templates/ishtar/sheet_find.html:360 -#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:359 +#: archaeological_finds/templates/ishtar/sheet_find.html:397 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:288 -#: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:325 +#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:401 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4801,8 +4808,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4810,7 +4817,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -6622,7 +6629,7 @@ msgid "Warehouse type" msgstr "" #: archaeological_warehouse/forms.py:119 archaeological_warehouse/forms.py:131 -#: archaeological_warehouse/views.py:165 +#: archaeological_warehouse/views.py:187 msgid "Warehouse search" msgstr "" @@ -6778,7 +6785,7 @@ msgid "Preservation type" msgstr "" #: archaeological_warehouse/forms.py:510 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:227 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:249 msgid "Container search" msgstr "" @@ -7143,35 +7150,35 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:177 +#: archaeological_warehouse/views.py:199 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:186 +#: archaeological_warehouse/views.py:208 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:205 +#: archaeological_warehouse/views.py:227 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:237 +#: archaeological_warehouse/views.py:259 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:245 +#: archaeological_warehouse/views.py:267 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:264 +#: archaeological_warehouse/views.py:286 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:303 +#: archaeological_warehouse/views.py:325 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:312 +#: archaeological_warehouse/views.py:334 msgid "Select the main container" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 8aa271f7d..87952bf8f 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-12 10:42+0100\n" +"POT-Creation-Date: 2021-02-12 11:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -447,9 +447,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:201 #: archaeological_finds/models_treatments.py:663 #: archaeological_finds/templates/ishtar/sheet_find.html:223 -#: archaeological_finds/templates/ishtar/sheet_find.html:291 -#: archaeological_finds/templates/ishtar/sheet_find.html:329 -#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:404 #: archaeological_operations/forms.py:841 #: archaeological_operations/models.py:66 #: archaeological_operations/models.py:1045 @@ -462,10 +462,10 @@ msgstr "" #: archaeological_finds/forms.py:919 archaeological_finds/models_finds.py:2804 #: archaeological_finds/models_treatments.py:664 #: archaeological_finds/templates/ishtar/sheet_find.html:224 -#: archaeological_finds/templates/ishtar/sheet_find.html:292 -#: archaeological_finds/templates/ishtar/sheet_find.html:330 -#: archaeological_finds/templates/ishtar/sheet_find.html:368 -#: archaeological_finds/templates/ishtar/sheet_find.html:406 +#: archaeological_finds/templates/ishtar/sheet_find.html:329 +#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:443 #: archaeological_operations/models.py:67 #: archaeological_operations/models.py:2669 ishtar_common/models_imports.py:975 msgid "End date" @@ -1334,9 +1334,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:145 #: archaeological_finds/models_treatments.py:95 #: archaeological_finds/models_treatments.py:175 -#: archaeological_finds/templates/ishtar/sheet_find.html:287 -#: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:324 +#: archaeological_finds/templates/ishtar/sheet_find.html:362 +#: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1601,7 +1601,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1013 -#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:442 msgid "Reception date" msgstr "" @@ -1639,7 +1639,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:266 #: archaeological_finds/models_treatments.py:999 -#: archaeological_finds/templates/ishtar/sheet_find.html:402 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_warehouse/forms.py:169 archaeological_warehouse/models.py:321 msgid "Person in charge" msgstr "" @@ -1648,7 +1648,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/forms_treatments.py:767 #: archaeological_finds/models_treatments.py:994 -#: archaeological_finds/templates/ishtar/sheet_find.html:401 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1235 #: archaeological_operations/forms.py:1390 @@ -2341,10 +2341,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:778 #: archaeological_finds/models_treatments.py:94 -#: archaeological_finds/templates/ishtar/sheet_find.html:286 -#: archaeological_finds/templates/ishtar/sheet_find.html:324 -#: archaeological_finds/templates/ishtar/sheet_find.html:362 -#: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: archaeological_finds/templates/ishtar/sheet_find.html:323 +#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:452 #: archaeological_operations/templates/ishtar/sheet_operation.html:516 @@ -3242,22 +3242,25 @@ msgstr "" msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:887 -#: ishtar_common/forms_common.py:1305 -msgid "Current container" +#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:888 +#: archaeological_finds/models_finds.py:1600 +#: archaeological_finds/templates/ishtar/sheet_find.html:272 +#: ishtar_common/forms_common.py:1311 +msgid "Reference container" msgstr "" #: archaeological_finds/forms.py:1283 -msgid "Current container - Warehouse (location)" +msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1299 archaeological_finds/models_finds.py:888 -#: archaeological_finds/models_finds.py:1600 ishtar_common/forms_common.py:1311 -msgid "Reference container" +#: archaeological_finds/forms.py:1301 archaeological_finds/models_finds.py:887 +#: archaeological_finds/templates/ishtar/sheet_find.html:293 +#: ishtar_common/forms_common.py:1305 +msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1305 -msgid "Reference container - Warehouse (location)" +#: archaeological_finds/forms.py:1307 +msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1326 archaeological_finds/forms.py:1342 @@ -3301,9 +3304,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:175 #: archaeological_finds/models_treatments.py:162 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:285 -#: archaeological_finds/templates/ishtar/sheet_find.html:323 -#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:322 +#: archaeological_finds/templates/ishtar/sheet_find.html:360 +#: archaeological_finds/templates/ishtar/sheet_find.html:398 #: ishtar_common/forms_common.py:1251 ishtar_common/models.py:666 #: ishtar_common/models.py:1230 ishtar_common/models.py:2600 #: ishtar_common/models_common.py:143 ishtar_common/models_common.py:173 @@ -3502,9 +3505,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2784 #: archaeological_finds/models_treatments.py:204 #: archaeological_finds/models_treatments.py:666 -#: archaeological_finds/templates/ishtar/sheet_find.html:290 -#: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:327 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:403 #: archaeological_warehouse/forms.py:261 archaeological_warehouse/models.py:607 #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1512 @@ -3596,7 +3599,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/forms_treatments.py:786 #: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/templates/ishtar/sheet_find.html:403 +#: archaeological_finds/templates/ishtar/sheet_find.html:440 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -3604,7 +3607,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:703 #: archaeological_finds/forms_treatments.py:792 #: archaeological_finds/models_treatments.py:1007 -#: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: archaeological_finds/templates/ishtar/sheet_find.html:441 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4447,7 +4450,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1903 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1103 archaeological_warehouse/forms.py:561 -#: archaeological_warehouse/views.py:160 ishtar_common/models.py:3183 +#: archaeological_warehouse/views.py:182 ishtar_common/models.py:3183 #: ishtar_common/models.py:3461 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 #: ishtar_common/views.py:2447 @@ -4463,12 +4466,12 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:1586 -#: archaeological_finds/templates/ishtar/sheet_find.html:318 +#: archaeological_finds/templates/ishtar/sheet_find.html:355 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1589 -#: archaeological_finds/templates/ishtar/sheet_find.html:356 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 msgid "Downstream treatment" msgstr "" @@ -4622,9 +4625,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:667 -#: archaeological_finds/templates/ishtar/sheet_find.html:289 -#: archaeological_finds/templates/ishtar/sheet_find.html:327 -#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:326 +#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:402 msgid "Doer" msgstr "" @@ -4673,7 +4676,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1041 -#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 #: ishtar_common/views.py:875 ishtar_common/views.py:942 msgid "Treatment requests" msgstr "" @@ -4772,24 +4775,28 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:280 +#: archaeological_finds/templates/ishtar/sheet_find.html:294 +msgid "Reference container / current container" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:317 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:284 -#: archaeological_finds/templates/ishtar/sheet_find.html:322 -#: archaeological_finds/templates/ishtar/sheet_find.html:360 -#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:359 +#: archaeological_finds/templates/ishtar/sheet_find.html:397 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:288 -#: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:325 +#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:401 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4798,8 +4805,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4807,7 +4814,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -6619,7 +6626,7 @@ msgid "Warehouse type" msgstr "" #: archaeological_warehouse/forms.py:119 archaeological_warehouse/forms.py:131 -#: archaeological_warehouse/views.py:165 +#: archaeological_warehouse/views.py:187 msgid "Warehouse search" msgstr "" @@ -6775,7 +6782,7 @@ msgid "Preservation type" msgstr "" #: archaeological_warehouse/forms.py:510 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:227 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:249 msgid "Container search" msgstr "" @@ -7138,35 +7145,35 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:177 +#: archaeological_warehouse/views.py:199 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:186 +#: archaeological_warehouse/views.py:208 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:205 +#: archaeological_warehouse/views.py:227 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:237 +#: archaeological_warehouse/views.py:259 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:245 +#: archaeological_warehouse/views.py:267 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:264 +#: archaeological_warehouse/views.py:286 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:303 +#: archaeological_warehouse/views.py:325 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:312 +#: archaeological_warehouse/views.py:334 msgid "Select the main container" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index daa8fc249..c500e848e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-12 10:42+0100\n" +"POT-Creation-Date: 2021-02-12 11:36+0100\n" "PO-Revision-Date: 2021-02-09 18:30+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: French <https://translate.iggdrasil.net/projects/ishtar/wip-" @@ -448,9 +448,9 @@ msgstr "Période" #: archaeological_finds/models_treatments.py:201 #: archaeological_finds/models_treatments.py:663 #: archaeological_finds/templates/ishtar/sheet_find.html:223 -#: archaeological_finds/templates/ishtar/sheet_find.html:291 -#: archaeological_finds/templates/ishtar/sheet_find.html:329 -#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:404 #: archaeological_operations/forms.py:841 #: archaeological_operations/models.py:66 #: archaeological_operations/models.py:1045 @@ -463,10 +463,10 @@ msgstr "Date de début" #: archaeological_finds/forms.py:919 archaeological_finds/models_finds.py:2804 #: archaeological_finds/models_treatments.py:664 #: archaeological_finds/templates/ishtar/sheet_find.html:224 -#: archaeological_finds/templates/ishtar/sheet_find.html:292 -#: archaeological_finds/templates/ishtar/sheet_find.html:330 -#: archaeological_finds/templates/ishtar/sheet_find.html:368 -#: archaeological_finds/templates/ishtar/sheet_find.html:406 +#: archaeological_finds/templates/ishtar/sheet_find.html:329 +#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:443 #: archaeological_operations/models.py:67 #: archaeological_operations/models.py:2669 ishtar_common/models_imports.py:975 msgid "End date" @@ -1341,9 +1341,9 @@ msgstr "Référence numérique" #: archaeological_finds/forms_treatments.py:145 #: archaeological_finds/models_treatments.py:95 #: archaeological_finds/models_treatments.py:175 -#: archaeological_finds/templates/ishtar/sheet_find.html:287 -#: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:324 +#: archaeological_finds/templates/ishtar/sheet_find.html:362 +#: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1608,7 +1608,7 @@ msgstr "Date de création" #: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1013 -#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:442 msgid "Reception date" msgstr "Date de réception" @@ -1646,7 +1646,7 @@ msgstr "Date avant" #: archaeological_files/forms.py:218 archaeological_files/models.py:266 #: archaeological_finds/models_treatments.py:999 -#: archaeological_finds/templates/ishtar/sheet_find.html:402 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_warehouse/forms.py:169 archaeological_warehouse/models.py:321 msgid "Person in charge" msgstr "Personne responsable" @@ -1655,7 +1655,7 @@ msgstr "Personne responsable" #: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/forms_treatments.py:767 #: archaeological_finds/models_treatments.py:994 -#: archaeological_finds/templates/ishtar/sheet_find.html:401 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1235 #: archaeological_operations/forms.py:1390 @@ -2348,10 +2348,10 @@ msgstr "Réf." #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:778 #: archaeological_finds/models_treatments.py:94 -#: archaeological_finds/templates/ishtar/sheet_find.html:286 -#: archaeological_finds/templates/ishtar/sheet_find.html:324 -#: archaeological_finds/templates/ishtar/sheet_find.html:362 -#: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: archaeological_finds/templates/ishtar/sheet_find.html:323 +#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:452 #: archaeological_operations/templates/ishtar/sheet_operation.html:516 @@ -3263,24 +3263,27 @@ msgstr "Dossier de traitement - date de clotûre avant" msgid "Treatment end date before" msgstr "Traitement - date de clôture avant" -#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:887 +#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:888 +#: archaeological_finds/models_finds.py:1600 +#: archaeological_finds/templates/ishtar/sheet_find.html:272 +#: ishtar_common/forms_common.py:1311 +msgid "Reference container" +msgstr "Contenant de référence" + +#: archaeological_finds/forms.py:1283 +msgid "Reference container - Warehouse (location)" +msgstr "Lieu de conservation du contenant de référence" + +#: archaeological_finds/forms.py:1301 archaeological_finds/models_finds.py:887 +#: archaeological_finds/templates/ishtar/sheet_find.html:293 #: ishtar_common/forms_common.py:1305 msgid "Current container" msgstr "Contenant actuel" -#: archaeological_finds/forms.py:1283 +#: archaeological_finds/forms.py:1307 msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" -#: archaeological_finds/forms.py:1299 archaeological_finds/models_finds.py:888 -#: archaeological_finds/models_finds.py:1600 ishtar_common/forms_common.py:1311 -msgid "Reference container" -msgstr "Contenant de référence" - -#: archaeological_finds/forms.py:1305 -msgid "Reference container - Warehouse (location)" -msgstr "Lieu de conservation du contenant de référence" - #: archaeological_finds/forms.py:1326 archaeological_finds/forms.py:1342 #: archaeological_finds/forms.py:1384 archaeological_finds/views.py:333 msgid "Find search" @@ -3322,9 +3325,9 @@ msgstr "Panier de mobilier" #: archaeological_finds/forms_treatments.py:175 #: archaeological_finds/models_treatments.py:162 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:285 -#: archaeological_finds/templates/ishtar/sheet_find.html:323 -#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:322 +#: archaeological_finds/templates/ishtar/sheet_find.html:360 +#: archaeological_finds/templates/ishtar/sheet_find.html:398 #: ishtar_common/forms_common.py:1251 ishtar_common/models.py:666 #: ishtar_common/models.py:1230 ishtar_common/models.py:2600 #: ishtar_common/models_common.py:143 ishtar_common/models_common.py:173 @@ -3532,9 +3535,9 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/models_finds.py:2784 #: archaeological_finds/models_treatments.py:204 #: archaeological_finds/models_treatments.py:666 -#: archaeological_finds/templates/ishtar/sheet_find.html:290 -#: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:327 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:403 #: archaeological_warehouse/forms.py:261 archaeological_warehouse/models.py:607 #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1512 @@ -3626,7 +3629,7 @@ msgstr "Réf. interne" #: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/forms_treatments.py:786 #: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/templates/ishtar/sheet_find.html:403 +#: archaeological_finds/templates/ishtar/sheet_find.html:440 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "Demandeur" @@ -3634,7 +3637,7 @@ msgstr "Demandeur" #: archaeological_finds/forms_treatments.py:703 #: archaeological_finds/forms_treatments.py:792 #: archaeological_finds/models_treatments.py:1007 -#: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: archaeological_finds/templates/ishtar/sheet_find.html:441 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -4485,7 +4488,7 @@ msgstr "Modification par lot" #: archaeological_finds/models_finds.py:1903 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1103 archaeological_warehouse/forms.py:561 -#: archaeological_warehouse/views.py:160 ishtar_common/models.py:3183 +#: archaeological_warehouse/views.py:182 ishtar_common/models.py:3183 #: ishtar_common/models.py:3461 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 #: ishtar_common/views.py:2447 @@ -4501,12 +4504,12 @@ msgid "Weight unit" msgstr "Unité de poids" #: archaeological_finds/models_finds.py:1586 -#: archaeological_finds/templates/ishtar/sheet_find.html:318 +#: archaeological_finds/templates/ishtar/sheet_find.html:355 msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:1589 -#: archaeological_finds/templates/ishtar/sheet_find.html:356 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 msgid "Downstream treatment" msgstr "Traitement aval" @@ -4665,9 +4668,9 @@ msgid "Downstream finds" msgstr "Mobilier aval" #: archaeological_finds/models_treatments.py:667 -#: archaeological_finds/templates/ishtar/sheet_find.html:289 -#: archaeological_finds/templates/ishtar/sheet_find.html:327 -#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:326 +#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:402 msgid "Doer" msgstr "Opérateur" @@ -4716,7 +4719,7 @@ msgid "exhibition-end-after" msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1041 -#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 #: ishtar_common/views.py:875 ishtar_common/views.py:942 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -4823,24 +4826,30 @@ msgstr "Vérifié" msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" -#: archaeological_finds/templates/ishtar/sheet_find.html:280 +#: archaeological_finds/templates/ishtar/sheet_find.html:294 +#, fuzzy +#| msgid "reference and current containers" +msgid "Reference container / current container" +msgstr "le contenant de référence et le contenant actuel" + +#: archaeological_finds/templates/ishtar/sheet_find.html:317 msgid "Simple treatments" msgstr "Traitements simples" -#: archaeological_finds/templates/ishtar/sheet_find.html:284 -#: archaeological_finds/templates/ishtar/sheet_find.html:322 -#: archaeological_finds/templates/ishtar/sheet_find.html:360 -#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:359 +#: archaeological_finds/templates/ishtar/sheet_find.html:397 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 msgid "Year - index" msgstr "Année - index" -#: archaeological_finds/templates/ishtar/sheet_find.html:288 -#: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:325 +#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:401 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4849,8 +4858,8 @@ msgstr "Mobilier associé (max. 15 affichés)" msgid "Export as CSV" msgstr "Export en CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4858,7 +4867,7 @@ msgstr "Export en CSV" msgid "CSV" msgstr "CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -6697,7 +6706,7 @@ msgid "Warehouse type" msgstr "Type de lieu de conservation" #: archaeological_warehouse/forms.py:119 archaeological_warehouse/forms.py:131 -#: archaeological_warehouse/views.py:165 +#: archaeological_warehouse/views.py:187 msgid "Warehouse search" msgstr "Rechercher un lieu de conservation" @@ -6859,7 +6868,7 @@ msgid "Preservation type" msgstr "Type de conservation" #: archaeological_warehouse/forms.py:510 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:227 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:249 msgid "Container search" msgstr "Rechercher un contenant" @@ -7242,35 +7251,35 @@ msgstr "" "Division par défaut pour ce lieu de conservation. Ces divisions sont " "uniquement utilisées pour faciliter les imports." -#: archaeological_warehouse/views.py:177 +#: archaeological_warehouse/views.py:199 msgid "Warehouse creation" msgstr "Ajouter un lieu de conservation" -#: archaeological_warehouse/views.py:186 +#: archaeological_warehouse/views.py:208 msgid "Warehouse modification" msgstr "Modifier un lieu de conservation" -#: archaeological_warehouse/views.py:205 +#: archaeological_warehouse/views.py:227 msgid "Warehouse deletion" msgstr "Supprimer un lieu de conservation" -#: archaeological_warehouse/views.py:237 +#: archaeological_warehouse/views.py:259 msgid "Container creation" msgstr "Ajouter un contenant" -#: archaeological_warehouse/views.py:245 +#: archaeological_warehouse/views.py:267 msgid "Container modification" msgstr "Modifier un contenant" -#: archaeological_warehouse/views.py:264 +#: archaeological_warehouse/views.py:286 msgid "Container deletion" msgstr "Supprimer un contenant" -#: archaeological_warehouse/views.py:303 +#: archaeological_warehouse/views.py:325 msgid "Merge containers" msgstr "Fusionner les contenants" -#: archaeological_warehouse/views.py:312 +#: archaeological_warehouse/views.py:334 msgid "Select the main container" msgstr "Sélectionner le contenant principal" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 8aa271f7d..87952bf8f 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-12 10:42+0100\n" +"POT-Creation-Date: 2021-02-12 11:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -447,9 +447,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:201 #: archaeological_finds/models_treatments.py:663 #: archaeological_finds/templates/ishtar/sheet_find.html:223 -#: archaeological_finds/templates/ishtar/sheet_find.html:291 -#: archaeological_finds/templates/ishtar/sheet_find.html:329 -#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:404 #: archaeological_operations/forms.py:841 #: archaeological_operations/models.py:66 #: archaeological_operations/models.py:1045 @@ -462,10 +462,10 @@ msgstr "" #: archaeological_finds/forms.py:919 archaeological_finds/models_finds.py:2804 #: archaeological_finds/models_treatments.py:664 #: archaeological_finds/templates/ishtar/sheet_find.html:224 -#: archaeological_finds/templates/ishtar/sheet_find.html:292 -#: archaeological_finds/templates/ishtar/sheet_find.html:330 -#: archaeological_finds/templates/ishtar/sheet_find.html:368 -#: archaeological_finds/templates/ishtar/sheet_find.html:406 +#: archaeological_finds/templates/ishtar/sheet_find.html:329 +#: archaeological_finds/templates/ishtar/sheet_find.html:367 +#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:443 #: archaeological_operations/models.py:67 #: archaeological_operations/models.py:2669 ishtar_common/models_imports.py:975 msgid "End date" @@ -1334,9 +1334,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:145 #: archaeological_finds/models_treatments.py:95 #: archaeological_finds/models_treatments.py:175 -#: archaeological_finds/templates/ishtar/sheet_find.html:287 -#: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:324 +#: archaeological_finds/templates/ishtar/sheet_find.html:362 +#: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1601,7 +1601,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1013 -#: archaeological_finds/templates/ishtar/sheet_find.html:405 +#: archaeological_finds/templates/ishtar/sheet_find.html:442 msgid "Reception date" msgstr "" @@ -1639,7 +1639,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:266 #: archaeological_finds/models_treatments.py:999 -#: archaeological_finds/templates/ishtar/sheet_find.html:402 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_warehouse/forms.py:169 archaeological_warehouse/models.py:321 msgid "Person in charge" msgstr "" @@ -1648,7 +1648,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/forms_treatments.py:767 #: archaeological_finds/models_treatments.py:994 -#: archaeological_finds/templates/ishtar/sheet_find.html:401 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1235 #: archaeological_operations/forms.py:1390 @@ -2341,10 +2341,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:778 #: archaeological_finds/models_treatments.py:94 -#: archaeological_finds/templates/ishtar/sheet_find.html:286 -#: archaeological_finds/templates/ishtar/sheet_find.html:324 -#: archaeological_finds/templates/ishtar/sheet_find.html:362 -#: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: archaeological_finds/templates/ishtar/sheet_find.html:323 +#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:452 #: archaeological_operations/templates/ishtar/sheet_operation.html:516 @@ -3242,22 +3242,25 @@ msgstr "" msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:887 -#: ishtar_common/forms_common.py:1305 -msgid "Current container" +#: archaeological_finds/forms.py:1277 archaeological_finds/models_finds.py:888 +#: archaeological_finds/models_finds.py:1600 +#: archaeological_finds/templates/ishtar/sheet_find.html:272 +#: ishtar_common/forms_common.py:1311 +msgid "Reference container" msgstr "" #: archaeological_finds/forms.py:1283 -msgid "Current container - Warehouse (location)" +msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1299 archaeological_finds/models_finds.py:888 -#: archaeological_finds/models_finds.py:1600 ishtar_common/forms_common.py:1311 -msgid "Reference container" +#: archaeological_finds/forms.py:1301 archaeological_finds/models_finds.py:887 +#: archaeological_finds/templates/ishtar/sheet_find.html:293 +#: ishtar_common/forms_common.py:1305 +msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1305 -msgid "Reference container - Warehouse (location)" +#: archaeological_finds/forms.py:1307 +msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1326 archaeological_finds/forms.py:1342 @@ -3301,9 +3304,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:175 #: archaeological_finds/models_treatments.py:162 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:285 -#: archaeological_finds/templates/ishtar/sheet_find.html:323 -#: archaeological_finds/templates/ishtar/sheet_find.html:361 +#: archaeological_finds/templates/ishtar/sheet_find.html:322 +#: archaeological_finds/templates/ishtar/sheet_find.html:360 +#: archaeological_finds/templates/ishtar/sheet_find.html:398 #: ishtar_common/forms_common.py:1251 ishtar_common/models.py:666 #: ishtar_common/models.py:1230 ishtar_common/models.py:2600 #: ishtar_common/models_common.py:143 ishtar_common/models_common.py:173 @@ -3502,9 +3505,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2784 #: archaeological_finds/models_treatments.py:204 #: archaeological_finds/models_treatments.py:666 -#: archaeological_finds/templates/ishtar/sheet_find.html:290 -#: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_finds/templates/ishtar/sheet_find.html:327 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:403 #: archaeological_warehouse/forms.py:261 archaeological_warehouse/models.py:607 #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1512 @@ -3596,7 +3599,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/forms_treatments.py:786 #: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/templates/ishtar/sheet_find.html:403 +#: archaeological_finds/templates/ishtar/sheet_find.html:440 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -3604,7 +3607,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:703 #: archaeological_finds/forms_treatments.py:792 #: archaeological_finds/models_treatments.py:1007 -#: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: archaeological_finds/templates/ishtar/sheet_find.html:441 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4447,7 +4450,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1903 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1103 archaeological_warehouse/forms.py:561 -#: archaeological_warehouse/views.py:160 ishtar_common/models.py:3183 +#: archaeological_warehouse/views.py:182 ishtar_common/models.py:3183 #: ishtar_common/models.py:3461 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 #: ishtar_common/views.py:2447 @@ -4463,12 +4466,12 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:1586 -#: archaeological_finds/templates/ishtar/sheet_find.html:318 +#: archaeological_finds/templates/ishtar/sheet_find.html:355 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1589 -#: archaeological_finds/templates/ishtar/sheet_find.html:356 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 msgid "Downstream treatment" msgstr "" @@ -4622,9 +4625,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:667 -#: archaeological_finds/templates/ishtar/sheet_find.html:289 -#: archaeological_finds/templates/ishtar/sheet_find.html:327 -#: archaeological_finds/templates/ishtar/sheet_find.html:365 +#: archaeological_finds/templates/ishtar/sheet_find.html:326 +#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:402 msgid "Doer" msgstr "" @@ -4673,7 +4676,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1041 -#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 #: ishtar_common/views.py:875 ishtar_common/views.py:942 msgid "Treatment requests" msgstr "" @@ -4772,24 +4775,28 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:280 +#: archaeological_finds/templates/ishtar/sheet_find.html:294 +msgid "Reference container / current container" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:317 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:284 -#: archaeological_finds/templates/ishtar/sheet_find.html:322 -#: archaeological_finds/templates/ishtar/sheet_find.html:360 -#: archaeological_finds/templates/ishtar/sheet_find.html:399 +#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:359 +#: archaeological_finds/templates/ishtar/sheet_find.html:397 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:288 -#: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:325 +#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:401 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4798,8 +4805,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:352 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -4807,7 +4814,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -6619,7 +6626,7 @@ msgid "Warehouse type" msgstr "" #: archaeological_warehouse/forms.py:119 archaeological_warehouse/forms.py:131 -#: archaeological_warehouse/views.py:165 +#: archaeological_warehouse/views.py:187 msgid "Warehouse search" msgstr "" @@ -6775,7 +6782,7 @@ msgid "Preservation type" msgstr "" #: archaeological_warehouse/forms.py:510 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:227 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/views.py:249 msgid "Container search" msgstr "" @@ -7138,35 +7145,35 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:177 +#: archaeological_warehouse/views.py:199 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:186 +#: archaeological_warehouse/views.py:208 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:205 +#: archaeological_warehouse/views.py:227 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:237 +#: archaeological_warehouse/views.py:259 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:245 +#: archaeological_warehouse/views.py:267 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:264 +#: archaeological_warehouse/views.py:286 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:303 +#: archaeological_warehouse/views.py:325 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:312 +#: archaeological_warehouse/views.py:334 msgid "Select the main container" msgstr "" |