summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-08 15:50:02 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-08 15:50:02 +0100
commit791c7c025fc591d443587e6f7eaf6e08d9ea69fc (patch)
tree294a693ce46477469ecc5459163bb827d4bc4468
parent404cd732555f84cd46afcc56d09ba78ef8fd53aa (diff)
downloadIshtar-791c7c025fc591d443587e6f7eaf6e08d9ea69fc.tar.bz2
Ishtar-791c7c025fc591d443587e6f7eaf6e08d9ea69fc.zip
Update translations
-rw-r--r--CHANGES.md8
-rw-r--r--archaeological_finds/locale/django.pot1
-rw-r--r--ishtar_common/locale/django.pot375
-rw-r--r--translations/de/ishtar_common.po366
-rw-r--r--translations/fr/archaeological_finds.po5
-rw-r--r--translations/fr/ishtar_common.po376
6 files changed, 615 insertions, 516 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d3bb86e20..8560da311 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,14 @@
Ishtar changelog
================
+v2.1.0 - dev
+------------
+
+### Features ###
+- manage delayed imports with a background task manager
+- parcel is no more mandatory for context records
+
+
v2.0.0 (2017-03-01)
-------------------
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index e77af32ae..96644e2f1 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -49,7 +49,6 @@ msgid "Free ID"
msgstr ""
#: forms.py:150 models_finds.py:681 templates/ishtar/sheet_find.html:18
-#| msgid "Decoration"
msgid "Denomination"
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index e00f8718a..a37c8ff51 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -76,7 +76,7 @@ msgstr ""
msgid "Form"
msgstr ""
-#: admin.py:571 models.py:1727 models_imports.py:117
+#: admin.py:571 models.py:1727 models_imports.py:123
#: templates/ishtar/dashboards/dashboard_main.html:39
msgid "Users"
msgstr ""
@@ -337,16 +337,15 @@ msgstr ""
#: forms_common.py:263 forms_common.py:301 forms_common.py:415
#: forms_common.py:471 forms_common.py:543 models.py:960 models.py:973
#: models.py:1530 models.py:1701 models.py:2007 models.py:2319 models.py:2433
-#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:88
-#: models_imports.py:113 models_imports.py:421 models_imports.py:513
-#: models_imports.py:774 templates/ishtar/import_list.html:16
-#: templates/ishtar/import_table.html:9
+#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:94
+#: models_imports.py:119 models_imports.py:427 models_imports.py:519
+#: models_imports.py:793 templates/ishtar/import_table.html:27
#: templates/ishtar/sheet_organization.html:23
msgid "Name"
msgstr ""
-#: forms_common.py:264 models.py:2295 models_imports.py:606
-#: models_imports.py:607
+#: forms_common.py:264 models.py:2295 models_imports.py:612
+#: models_imports.py:613
msgid "Organization type"
msgstr ""
@@ -390,9 +389,9 @@ msgid "Full text search"
msgstr ""
#: forms_common.py:302 forms_common.py:418 forms_common.py:546 models.py:2321
-#: models.py:2818 models.py:2900 models_imports.py:652
+#: models.py:2818 models.py:2900 models_imports.py:658
#: templates/ishtar/blocks/window_tables/documents.html:8
-#: templates/ishtar/import_list.html:17 templates/ishtar/import_table.html:10
+#: templates/ishtar/import_table.html:28
#: templates/ishtar/sheet_organization.html:25
msgid "Type"
msgstr ""
@@ -431,7 +430,7 @@ msgid "Identity"
msgstr ""
#: forms_common.py:466 forms_common.py:892 forms_common.py:937 models.py:2425
-#: models.py:2427 models.py:2815 models_imports.py:608
+#: models.py:2427 models.py:2815 models_imports.py:614
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr ""
@@ -559,7 +558,7 @@ msgstr ""
msgid "Source - General"
msgstr ""
-#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:609
+#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:615
msgid "Source type"
msgstr ""
@@ -579,7 +578,7 @@ msgstr ""
msgid "Receipt date"
msgstr ""
-#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:806
+#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:825
msgid "Creation date"
msgstr ""
@@ -588,13 +587,13 @@ msgid "Receipt date in documentation"
msgstr ""
#: forms_common.py:910 forms_common.py:942 models.py:448 models.py:2439
-#: models.py:2711 models.py:2843 models_imports.py:459
+#: models.py:2711 models.py:2843 models_imports.py:465
msgid "Comment"
msgstr ""
#: forms_common.py:912 forms_common.py:941 models.py:1532 models.py:2842
-#: models.py:2892 models_imports.py:115 models_imports.py:352
-#: models_imports.py:422
+#: models.py:2892 models_imports.py:121 models_imports.py:358
+#: models_imports.py:428
msgid "Description"
msgstr ""
@@ -623,7 +622,7 @@ msgstr ""
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:610
+#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:616
msgid "Author type"
msgstr ""
@@ -669,8 +668,7 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_list.html:19
-#: templates/ishtar/import_table.html:12
+#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_table.html:30
msgid "Creation"
msgstr ""
@@ -686,7 +684,7 @@ msgstr ""
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:110 models_imports.py:814
+#: ishtar_menu.py:110 models_imports.py:833
msgid "Imports"
msgstr ""
@@ -698,7 +696,7 @@ msgstr ""
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:121 views.py:1825
+#: ishtar_menu.py:121 views.py:1853
msgid "Old imports"
msgstr ""
@@ -715,7 +713,7 @@ msgid "This item already exists."
msgstr ""
#: models.py:440 models.py:2102 models.py:2118 models.py:2710
-#: models_imports.py:348
+#: models_imports.py:354
msgid "Label"
msgstr ""
@@ -730,11 +728,11 @@ msgid ""
msgstr ""
#: models.py:449 models.py:1703 models.py:2014 models.py:2713
-#: models_imports.py:129 models_imports.py:518
+#: models_imports.py:135 models_imports.py:524
msgid "Available"
msgstr ""
-#: models.py:824 models.py:976 models_imports.py:539
+#: models.py:824 models.py:976 models_imports.py:545
#: templates/ishtar/formset_import_match.html:21
msgid "Key"
msgstr ""
@@ -833,7 +831,6 @@ msgid "Site"
msgstr ""
#: models.py:1512
-#| msgid "Archaeological site"
msgid "Archaeological entity"
msgstr ""
@@ -850,18 +847,21 @@ msgid "Site modification"
msgstr ""
#: models.py:1521
-msgid "Archaeological site search"
+#| msgid "Archaeological site search"
+msgid "Archaeological entity search"
msgstr ""
#: models.py:1522
-msgid "New archaeological site"
+#| msgid "New archaeological site"
+msgid "New archaeological entity"
msgstr ""
#: models.py:1523
-msgid "Archaeological site modification"
+#| msgid "Archaeological site modification"
+msgid "Archaeological entity modification"
msgstr ""
-#: models.py:1531 models.py:2008 models_imports.py:114
+#: models.py:1531 models.py:2008 models_imports.py:120
msgid "Slug"
msgstr ""
@@ -920,7 +920,6 @@ msgid "Underwater module"
msgstr ""
#: models.py:1558
-#| msgid "Documents associated to context records"
msgid "Parcel are mandatory for context records"
msgstr ""
@@ -1087,7 +1086,7 @@ msgstr ""
msgid "Description of the variable"
msgstr ""
-#: models.py:1782 models_imports.py:540
+#: models.py:1782 models_imports.py:546
#: templates/ishtar/formset_import_match.html:22
msgid "Value"
msgstr ""
@@ -1123,7 +1122,7 @@ msgstr ""
msgid "Document templates"
msgstr ""
-#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:800
+#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:819
msgid "State"
msgstr ""
@@ -1175,7 +1174,7 @@ msgstr ""
msgid "Person types"
msgstr ""
-#: models.py:2385 models_imports.py:642
+#: models.py:2385 models_imports.py:648
msgid "Title type"
msgstr ""
@@ -1239,7 +1238,7 @@ msgstr ""
msgid "Source types"
msgstr ""
-#: models.py:2795 models_imports.py:641
+#: models.py:2795 models_imports.py:647
msgid "Support type"
msgstr ""
@@ -1263,7 +1262,7 @@ msgstr ""
msgid "Support"
msgstr ""
-#: models.py:2821 models_imports.py:611
+#: models.py:2821 models_imports.py:617
msgid "Format"
msgstr ""
@@ -1335,7 +1334,7 @@ msgstr ""
msgid "Is preventive"
msgstr ""
-#: models.py:3064 models_imports.py:612
+#: models.py:3064 models_imports.py:618
msgid "Operation type"
msgstr ""
@@ -1359,7 +1358,7 @@ msgstr ""
msgid "Authority SRID"
msgstr ""
-#: models.py:3129 models_imports.py:640
+#: models.py:3129 models_imports.py:646
msgid "Spatial reference system"
msgstr ""
@@ -1387,11 +1386,11 @@ msgstr ""
msgid "In progress"
msgstr ""
-#: models.py:3152 models_imports.py:760
+#: models.py:3152 models_imports.py:767
msgid "Finished with errors"
msgstr ""
-#: models.py:3153 models_imports.py:761
+#: models.py:3153 models_imports.py:768
msgid "Finished"
msgstr ""
@@ -1434,419 +1433,443 @@ msgid ""
"configuration."
msgstr ""
-#: models_imports.py:89
+#: models_imports.py:95
msgid "Class name"
msgstr ""
-#: models_imports.py:93
+#: models_imports.py:99
msgid "Importer - Model"
msgstr ""
-#: models_imports.py:94
+#: models_imports.py:100
msgid "Importer - Models"
msgstr ""
-#: models_imports.py:120
+#: models_imports.py:126
msgid "Associated model"
msgstr ""
-#: models_imports.py:123
+#: models_imports.py:129
msgid "Models that can accept new items"
msgstr ""
-#: models_imports.py:124
+#: models_imports.py:130
msgid "Leave blank for no restrictions"
msgstr ""
-#: models_imports.py:126
+#: models_imports.py:132
msgid "Is template"
msgstr ""
-#: models_imports.py:127
+#: models_imports.py:133
msgid "Unicity keys (separator \";\")"
msgstr ""
-#: models_imports.py:133
+#: models_imports.py:139
msgid "Importer - Type"
msgstr ""
-#: models_imports.py:134
+#: models_imports.py:140
msgid "Importer - Types"
msgstr ""
-#: models_imports.py:255
+#: models_imports.py:261
msgid "Importer - Default"
msgstr ""
-#: models_imports.py:256
+#: models_imports.py:262
msgid "Importer - Defaults"
msgstr ""
-#: models_imports.py:301
+#: models_imports.py:307
msgid "Importer - Default value"
msgstr ""
-#: models_imports.py:302
+#: models_imports.py:308
msgid "Importer - Default values"
msgstr ""
-#: models_imports.py:351
+#: models_imports.py:357
msgid "Column number"
msgstr ""
-#: models_imports.py:354
+#: models_imports.py:360
msgid "Required"
msgstr ""
-#: models_imports.py:356
+#: models_imports.py:362
msgid "Export field name"
msgstr ""
-#: models_imports.py:357
+#: models_imports.py:363
msgid ""
"Fill this field if the field name is ambiguous for export. For instance: "
"concatenated fields."
msgstr ""
-#: models_imports.py:363
+#: models_imports.py:369
msgid "Importer - Column"
msgstr ""
-#: models_imports.py:364
+#: models_imports.py:370
msgid "Importer - Columns"
msgstr ""
-#: models_imports.py:394
+#: models_imports.py:400
msgid "Field name"
msgstr ""
-#: models_imports.py:396 models_imports.py:453
+#: models_imports.py:402 models_imports.py:459
msgid "Force creation of new items"
msgstr ""
-#: models_imports.py:398 models_imports.py:455
+#: models_imports.py:404 models_imports.py:461
msgid "Concatenate with existing"
msgstr ""
-#: models_imports.py:400 models_imports.py:457
+#: models_imports.py:406 models_imports.py:463
msgid "Concatenate character"
msgstr ""
-#: models_imports.py:405
+#: models_imports.py:411
msgid "Importer - Duplicate field"
msgstr ""
-#: models_imports.py:406
+#: models_imports.py:412
msgid "Importer - Duplicate fields"
msgstr ""
-#: models_imports.py:424
+#: models_imports.py:430
msgid "Regular expression"
msgstr ""
-#: models_imports.py:428
+#: models_imports.py:434
msgid "Importer - Regular expression"
msgstr ""
-#: models_imports.py:429
+#: models_imports.py:435
msgid "Importer - Regular expressions"
msgstr ""
-#: models_imports.py:463
+#: models_imports.py:469
msgid "Importer - Target"
msgstr ""
-#: models_imports.py:464
+#: models_imports.py:470
msgid "Importer - Targets"
msgstr ""
-#: models_imports.py:501 views.py:604
+#: models_imports.py:507 views.py:604
msgid "True"
msgstr ""
-#: models_imports.py:502 views.py:606
+#: models_imports.py:508 views.py:606
msgid "False"
msgstr ""
-#: models_imports.py:514
+#: models_imports.py:520
msgid "All users can use it"
msgstr ""
-#: models_imports.py:516
+#: models_imports.py:522
msgid "All users can modify it"
msgstr ""
-#: models_imports.py:521
+#: models_imports.py:527
msgid "Importer - Target key group"
msgstr ""
-#: models_imports.py:522
+#: models_imports.py:528
msgid "Importer - Target key groups"
msgstr ""
-#: models_imports.py:541
+#: models_imports.py:547
msgid "Is set"
msgstr ""
-#: models_imports.py:549
+#: models_imports.py:555
msgid "Importer - Target key"
msgstr ""
-#: models_imports.py:550
+#: models_imports.py:556
msgid "Importer - Targets keys"
msgstr ""
-#: models_imports.py:613
+#: models_imports.py:619
msgid "Period"
msgstr ""
-#: models_imports.py:614
+#: models_imports.py:620
msgid "Report state"
msgstr ""
-#: models_imports.py:615
+#: models_imports.py:621
msgid "Remain type"
msgstr ""
-#: models_imports.py:616
+#: models_imports.py:622
msgid "Unit"
msgstr ""
-#: models_imports.py:618
+#: models_imports.py:624
msgid "Activity type"
msgstr ""
-#: models_imports.py:620
+#: models_imports.py:626
msgid "Documentation type"
msgstr ""
-#: models_imports.py:621
+#: models_imports.py:627
msgid "Material"
msgstr ""
-#: models_imports.py:623
+#: models_imports.py:629
msgid "Conservatory state"
msgstr ""
-#: models_imports.py:624
+#: models_imports.py:630
msgid "Container type"
msgstr ""
-#: models_imports.py:625
+#: models_imports.py:631
msgid "Treatment type"
msgstr ""
-#: models_imports.py:627
+#: models_imports.py:633
msgid "Treatment emergency type"
msgstr ""
-#: models_imports.py:628
+#: models_imports.py:634
msgid "Object type"
msgstr ""
-#: models_imports.py:629
+#: models_imports.py:635
msgid "Integrity type"
msgstr ""
-#: models_imports.py:631
+#: models_imports.py:637
msgid "Remarkability type"
msgstr ""
-#: models_imports.py:632
+#: models_imports.py:638
msgid "Alteration type"
msgstr ""
-#: models_imports.py:634
+#: models_imports.py:640
msgid "Alteration cause type"
msgstr ""
-#: models_imports.py:635
+#: models_imports.py:641
msgid "Batch type"
msgstr ""
-#: models_imports.py:637
+#: models_imports.py:643
msgid "Identification type"
msgstr ""
-#: models_imports.py:639
+#: models_imports.py:645
msgid "Context record relation type"
msgstr ""
-#: models_imports.py:648
+#: models_imports.py:654
msgid "Integer"
msgstr ""
-#: models_imports.py:649
+#: models_imports.py:655
msgid "Float"
msgstr ""
-#: models_imports.py:650
+#: models_imports.py:656
msgid "String"
msgstr ""
-#: models_imports.py:651
+#: models_imports.py:657
msgid "Date"
msgstr ""
-#: models_imports.py:653
+#: models_imports.py:659
#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
msgstr ""
-#: models_imports.py:654
+#: models_imports.py:660
msgid "INSEE code"
msgstr ""
-#: models_imports.py:655
+#: models_imports.py:661
msgid "String to boolean"
msgstr ""
-#: models_imports.py:656
+#: models_imports.py:662
msgctxt "filesystem"
msgid "File"
msgstr ""
-#: models_imports.py:657
+#: models_imports.py:663
msgid "Unknow type"
msgstr ""
-#: models_imports.py:674
+#: models_imports.py:680
msgid "4 digit year. e.g.: \"2015\""
msgstr ""
-#: models_imports.py:675
+#: models_imports.py:681
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr ""
-#: models_imports.py:676
+#: models_imports.py:682
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr ""
-#: models_imports.py:692
+#: models_imports.py:698
msgid "Options"
msgstr ""
-#: models_imports.py:694
+#: models_imports.py:700
msgid "Split character(s)"
msgstr ""
-#: models_imports.py:699
+#: models_imports.py:705
msgid "Importer - Formater type"
msgstr ""
-#: models_imports.py:700
+#: models_imports.py:706
msgid "Importer - Formater types"
msgstr ""
-#: models_imports.py:755
+#: models_imports.py:761
#: templates/ishtar/dashboards/dashboard_main_detail.html:132
msgid "Created"
msgstr ""
-#: models_imports.py:756
+#: models_imports.py:762
msgid "Analyse in progress"
msgstr ""
-#: models_imports.py:757
+#: models_imports.py:763
msgid "Analysed"
msgstr ""
-#: models_imports.py:758
+#: models_imports.py:764
msgid "Import pending"
msgstr ""
-#: models_imports.py:759
+#: models_imports.py:765
+#| msgid "Import in progress"
+msgid "Import in queue"
+msgstr ""
+
+#: models_imports.py:766
msgid "Import in progress"
msgstr ""
-#: models_imports.py:762
+#: models_imports.py:769
msgid "Archived"
msgstr ""
-#: models_imports.py:777
+#: models_imports.py:796
msgid "Imported file"
msgstr ""
-#: models_imports.py:779
+#: models_imports.py:798
msgid "Associated images (zip file)"
msgstr ""
-#: models_imports.py:783
+#: models_imports.py:802
msgid "If a group is selected, target key saved in this group will be used."
msgstr ""
-#: models_imports.py:786
+#: models_imports.py:805
msgid "Encoding"
msgstr ""
-#: models_imports.py:789
+#: models_imports.py:808
msgid "Skip lines"
msgstr ""
-#: models_imports.py:790
+#: models_imports.py:809
msgid "Number of header lines in your file (can be 0)."
msgstr ""
-#: models_imports.py:791
+#: models_imports.py:810
msgid "Error file"
msgstr ""
-#: models_imports.py:794
+#: models_imports.py:813
msgid "Result file"
msgstr ""
-#: models_imports.py:797
+#: models_imports.py:816
msgid "Match file"
msgstr ""
-#: models_imports.py:803
+#: models_imports.py:822
msgid "Conservative import"
msgstr ""
-#: models_imports.py:804
+#: models_imports.py:823
msgid "If set to true, do not overload existing values."
msgstr ""
-#: models_imports.py:807
+#: models_imports.py:826
msgid "End date"
msgstr ""
-#: models_imports.py:810
+#: models_imports.py:829
msgid "Remaining seconds"
msgstr ""
-#: models_imports.py:813
+#: models_imports.py:832
msgid "Import"
msgstr ""
-#: models_imports.py:842
+#: models_imports.py:861
msgid "Analyse"
msgstr ""
-#: models_imports.py:844 models_imports.py:847
+#: models_imports.py:863 models_imports.py:866
msgid "Re-analyse"
msgstr ""
-#: models_imports.py:845
+#: models_imports.py:864
msgid "Launch import"
msgstr ""
-#: models_imports.py:848
+#: models_imports.py:867
msgid "Re-import"
msgstr ""
-#: models_imports.py:849
+#: models_imports.py:868
msgid "Archive"
msgstr ""
-#: models_imports.py:851
+#: models_imports.py:870
msgid "Unarchive"
msgstr ""
-#: models_imports.py:852 templates/ishtar/form_delete.html:11 widgets.py:258
+#: models_imports.py:871 templates/ishtar/form_delete.html:11 widgets.py:258
msgid "Delete"
msgstr ""
+#: models_imports.py:939
+msgid "Import {} added to the queue"
+msgstr ""
+
+#: models_imports.py:957
+#| msgid "Imported file"
+msgid "Error on imported file: {}"
+msgstr ""
+
+#: models_imports.py:983
+#| msgid "Finished with errors"
+msgid "Import {} finished with errors"
+msgstr ""
+
+#: models_imports.py:989
+#| msgid "Finished with errors"
+msgid "Import {} finished with no errors"
+msgstr ""
+
#: templates/404.html:14
msgid "Page not found"
msgstr ""
@@ -1906,34 +1929,42 @@ msgstr ""
msgid "no"
msgstr ""
-#: templates/base.html:65
+#: templates/base.html:43
+msgid "Autorefresh start. The form is disabled."
+msgstr ""
+
+#: templates/base.html:44
+msgid "Autorefresh end. The form is re-enabled."
+msgstr ""
+
+#: templates/base.html:67
msgid "Current items"
msgstr ""
-#: templates/base.html:67 templates/blocks/bs_form_snippet.html:55
+#: templates/base.html:69 templates/blocks/bs_form_snippet.html:55
#: templates/ishtar/manage_basket.html:4 templates/welcome.html:11
#: templates/welcome.html:12 templates/welcome.html:13
#: templates/welcome.html:14
msgid ":"
msgstr ""
-#: templates/base.html:83
+#: templates/base.html:82
msgid "Sheets"
msgstr ""
-#: templates/base.html:121
+#: templates/base.html:132
msgid "Processing..."
msgstr ""
-#: templates/base.html:123
+#: templates/base.html:134
msgid "This can be long."
msgstr ""
-#: templates/base.html:125
+#: templates/base.html:136
msgid "Time to take a coffee?"
msgstr ""
-#: templates/base.html:127
+#: templates/base.html:138
msgid "Time to take another coffee?"
msgstr ""
@@ -2034,7 +2065,7 @@ msgstr ""
#: templates/blocks/bs_form_snippet.html:85 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/import_list.html:30 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"
@@ -2297,47 +2328,49 @@ msgstr ""
msgid "Back"
msgstr ""
-#: templates/ishtar/import_list.html:12 templates/ishtar/import_table.html:5
+#: templates/ishtar/import_list.html:10
+msgid "Autorefresh the table (useful when waiting for an import result)"
+msgstr ""
+
+#: templates/ishtar/import_table.html:23
msgid "No pending imports."
msgstr ""
-#: templates/ishtar/import_list.html:18 templates/ishtar/import_table.html:11
+#: templates/ishtar/import_table.html:29
msgctxt "file"
msgid "File"
msgstr ""
-#: templates/ishtar/import_list.html:20 templates/ishtar/import_table.html:13
+#: templates/ishtar/import_table.html:31
msgid "Status"
msgstr ""
-#: templates/ishtar/import_list.html:21 templates/ishtar/import_table.html:14
+#: templates/ishtar/import_table.html:32
msgid "Action"
msgstr ""
-#: templates/ishtar/import_list.html:22 templates/ishtar/import_table.html:15
+#: templates/ishtar/import_table.html:33
msgid "Unmatched items"
msgstr ""
-#: templates/ishtar/import_list.html:23 templates/ishtar/import_table.html:16
+#: templates/ishtar/import_table.html:34
msgid "Error"
msgstr ""
-#: templates/ishtar/import_list.html:24 templates/ishtar/import_table.html:17
+#: templates/ishtar/import_table.html:35
msgid "Control"
msgstr ""
-#: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54
-#: templates/ishtar/import_table.html:18 templates/ishtar/import_table.html:47
+#: templates/ishtar/import_table.html:36 templates/ishtar/import_table.html:65
msgid "Match"
msgstr ""
-#: templates/ishtar/import_list.html:36 templates/ishtar/import_table.html:29
+#: templates/ishtar/import_table.html:47
msgid "Source file"
msgstr ""
-#: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61
-#: templates/ishtar/import_list.html:64 templates/ishtar/import_table.html:51
-#: templates/ishtar/import_table.html:54 templates/ishtar/import_table.html:57
+#: templates/ishtar/import_table.html:69 templates/ishtar/import_table.html:72
+#: templates/ishtar/import_table.html:75
msgctxt "not a directory"
msgid "File"
msgstr ""
@@ -2788,15 +2821,15 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: utils.py:145
+#: utils.py:146
msgid " (...)"
msgstr ""
-#: utils.py:207
+#: utils.py:208
msgid "Information"
msgstr ""
-#: utils.py:208
+#: utils.py:209
msgid "Load another random image?"
msgstr ""
@@ -2893,31 +2926,31 @@ msgstr ""
msgid "Treatments"
msgstr ""
-#: views.py:1839
+#: views.py:1867
msgid "Link unmatched items"
msgstr ""
-#: views.py:1860
+#: views.py:1888
msgid "Delete import"
msgstr ""
-#: views.py:1899
+#: views.py:1927
msgid "Merge persons"
msgstr ""
-#: views.py:1923
+#: views.py:1951
msgid "Select the main person"
msgstr ""
-#: views.py:1932
+#: views.py:1960
msgid "Merge organization"
msgstr ""
-#: views.py:1942
+#: views.py:1970
msgid "Select the main organization"
msgstr ""
-#: views.py:1982 views.py:1998
+#: views.py:2010 views.py:2026
msgid "Corporation manager"
msgstr ""
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index ac99d0ee8..645d7b599 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -78,7 +78,7 @@ msgstr ""
msgid "Form"
msgstr ""
-#: admin.py:571 models.py:1727 models_imports.py:117
+#: admin.py:571 models.py:1727 models_imports.py:123
#: templates/ishtar/dashboards/dashboard_main.html:39
msgid "Users"
msgstr ""
@@ -339,16 +339,15 @@ msgstr ""
#: forms_common.py:263 forms_common.py:301 forms_common.py:415
#: forms_common.py:471 forms_common.py:543 models.py:960 models.py:973
#: models.py:1530 models.py:1701 models.py:2007 models.py:2319 models.py:2433
-#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:88
-#: models_imports.py:113 models_imports.py:421 models_imports.py:513
-#: models_imports.py:774 templates/ishtar/import_list.html:16
-#: templates/ishtar/import_table.html:9
+#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:94
+#: models_imports.py:119 models_imports.py:427 models_imports.py:519
+#: models_imports.py:793 templates/ishtar/import_table.html:27
#: templates/ishtar/sheet_organization.html:23
msgid "Name"
msgstr "Name"
-#: forms_common.py:264 models.py:2295 models_imports.py:606
-#: models_imports.py:607
+#: forms_common.py:264 models.py:2295 models_imports.py:612
+#: models_imports.py:613
msgid "Organization type"
msgstr ""
@@ -392,9 +391,9 @@ msgid "Full text search"
msgstr ""
#: forms_common.py:302 forms_common.py:418 forms_common.py:546 models.py:2321
-#: models.py:2818 models.py:2900 models_imports.py:652
+#: models.py:2818 models.py:2900 models_imports.py:658
#: templates/ishtar/blocks/window_tables/documents.html:8
-#: templates/ishtar/import_list.html:17 templates/ishtar/import_table.html:10
+#: templates/ishtar/import_table.html:28
#: templates/ishtar/sheet_organization.html:25
msgid "Type"
msgstr ""
@@ -433,7 +432,7 @@ msgid "Identity"
msgstr ""
#: forms_common.py:466 forms_common.py:892 forms_common.py:937 models.py:2425
-#: models.py:2427 models.py:2815 models_imports.py:608
+#: models.py:2427 models.py:2815 models_imports.py:614
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr ""
@@ -561,7 +560,7 @@ msgstr ""
msgid "Source - General"
msgstr ""
-#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:609
+#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:615
msgid "Source type"
msgstr ""
@@ -581,7 +580,7 @@ msgstr ""
msgid "Receipt date"
msgstr ""
-#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:806
+#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:825
msgid "Creation date"
msgstr "Gründungsdatum"
@@ -590,13 +589,13 @@ msgid "Receipt date in documentation"
msgstr ""
#: forms_common.py:910 forms_common.py:942 models.py:448 models.py:2439
-#: models.py:2711 models.py:2843 models_imports.py:459
+#: models.py:2711 models.py:2843 models_imports.py:465
msgid "Comment"
msgstr ""
#: forms_common.py:912 forms_common.py:941 models.py:1532 models.py:2842
-#: models.py:2892 models_imports.py:115 models_imports.py:352
-#: models_imports.py:422
+#: models.py:2892 models_imports.py:121 models_imports.py:358
+#: models_imports.py:428
msgid "Description"
msgstr "Beschreibung"
@@ -625,7 +624,7 @@ msgstr ""
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:610
+#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:616
msgid "Author type"
msgstr ""
@@ -671,8 +670,7 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_list.html:19
-#: templates/ishtar/import_table.html:12
+#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_table.html:30
msgid "Creation"
msgstr "Gründung"
@@ -688,7 +686,7 @@ msgstr ""
msgid "Manual merge"
msgstr ""
-#: ishtar_menu.py:110 models_imports.py:814
+#: ishtar_menu.py:110 models_imports.py:833
msgid "Imports"
msgstr ""
@@ -700,7 +698,7 @@ msgstr ""
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:121 views.py:1825
+#: ishtar_menu.py:121 views.py:1853
msgid "Old imports"
msgstr ""
@@ -717,7 +715,7 @@ msgid "This item already exists."
msgstr ""
#: models.py:440 models.py:2102 models.py:2118 models.py:2710
-#: models_imports.py:348
+#: models_imports.py:354
msgid "Label"
msgstr ""
@@ -732,11 +730,11 @@ msgid ""
msgstr ""
#: models.py:449 models.py:1703 models.py:2014 models.py:2713
-#: models_imports.py:129 models_imports.py:518
+#: models_imports.py:135 models_imports.py:524
msgid "Available"
msgstr ""
-#: models.py:824 models.py:976 models_imports.py:539
+#: models.py:824 models.py:976 models_imports.py:545
#: templates/ishtar/formset_import_match.html:21
msgid "Key"
msgstr ""
@@ -850,18 +848,18 @@ msgid "Site modification"
msgstr ""
#: models.py:1521
-msgid "Archaeological site search"
+msgid "Archaeological entity search"
msgstr ""
#: models.py:1522
-msgid "New archaeological site"
+msgid "New archaeological entity"
msgstr ""
#: models.py:1523
-msgid "Archaeological site modification"
+msgid "Archaeological entity modification"
msgstr ""
-#: models.py:1531 models.py:2008 models_imports.py:114
+#: models.py:1531 models.py:2008 models_imports.py:120
msgid "Slug"
msgstr ""
@@ -1086,7 +1084,7 @@ msgstr ""
msgid "Description of the variable"
msgstr ""
-#: models.py:1782 models_imports.py:540
+#: models.py:1782 models_imports.py:546
#: templates/ishtar/formset_import_match.html:22
msgid "Value"
msgstr ""
@@ -1122,7 +1120,7 @@ msgstr ""
msgid "Document templates"
msgstr ""
-#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:800
+#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:819
msgid "State"
msgstr ""
@@ -1174,7 +1172,7 @@ msgstr ""
msgid "Person types"
msgstr ""
-#: models.py:2385 models_imports.py:642
+#: models.py:2385 models_imports.py:648
msgid "Title type"
msgstr ""
@@ -1238,7 +1236,7 @@ msgstr ""
msgid "Source types"
msgstr ""
-#: models.py:2795 models_imports.py:641
+#: models.py:2795 models_imports.py:647
msgid "Support type"
msgstr ""
@@ -1262,7 +1260,7 @@ msgstr ""
msgid "Support"
msgstr ""
-#: models.py:2821 models_imports.py:611
+#: models.py:2821 models_imports.py:617
msgid "Format"
msgstr ""
@@ -1335,7 +1333,7 @@ msgstr ""
msgid "Is preventive"
msgstr ""
-#: models.py:3064 models_imports.py:612
+#: models.py:3064 models_imports.py:618
msgid "Operation type"
msgstr ""
@@ -1359,7 +1357,7 @@ msgstr ""
msgid "Authority SRID"
msgstr ""
-#: models.py:3129 models_imports.py:640
+#: models.py:3129 models_imports.py:646
msgid "Spatial reference system"
msgstr ""
@@ -1387,11 +1385,11 @@ msgstr ""
msgid "In progress"
msgstr ""
-#: models.py:3152 models_imports.py:760
+#: models.py:3152 models_imports.py:767
msgid "Finished with errors"
msgstr ""
-#: models.py:3153 models_imports.py:761
+#: models.py:3153 models_imports.py:768
msgid "Finished"
msgstr ""
@@ -1434,419 +1432,439 @@ msgid ""
"configuration."
msgstr ""
-#: models_imports.py:89
+#: models_imports.py:95
msgid "Class name"
msgstr ""
-#: models_imports.py:93
+#: models_imports.py:99
msgid "Importer - Model"
msgstr ""
-#: models_imports.py:94
+#: models_imports.py:100
msgid "Importer - Models"
msgstr ""
-#: models_imports.py:120
+#: models_imports.py:126
msgid "Associated model"
msgstr ""
-#: models_imports.py:123
+#: models_imports.py:129
msgid "Models that can accept new items"
msgstr ""
-#: models_imports.py:124
+#: models_imports.py:130
msgid "Leave blank for no restrictions"
msgstr ""
-#: models_imports.py:126
+#: models_imports.py:132
msgid "Is template"
msgstr ""
-#: models_imports.py:127
+#: models_imports.py:133
msgid "Unicity keys (separator \";\")"
msgstr ""
-#: models_imports.py:133
+#: models_imports.py:139
msgid "Importer - Type"
msgstr ""
-#: models_imports.py:134
+#: models_imports.py:140
msgid "Importer - Types"
msgstr ""
-#: models_imports.py:255
+#: models_imports.py:261
msgid "Importer - Default"
msgstr ""
-#: models_imports.py:256
+#: models_imports.py:262
msgid "Importer - Defaults"
msgstr ""
-#: models_imports.py:301
+#: models_imports.py:307
msgid "Importer - Default value"
msgstr ""
-#: models_imports.py:302
+#: models_imports.py:308
msgid "Importer - Default values"
msgstr ""
-#: models_imports.py:351
+#: models_imports.py:357
msgid "Column number"
msgstr ""
-#: models_imports.py:354
+#: models_imports.py:360
msgid "Required"
msgstr ""
-#: models_imports.py:356
+#: models_imports.py:362
msgid "Export field name"
msgstr ""
-#: models_imports.py:357
+#: models_imports.py:363
msgid ""
"Fill this field if the field name is ambiguous for export. For instance: "
"concatenated fields."
msgstr ""
-#: models_imports.py:363
+#: models_imports.py:369
msgid "Importer - Column"
msgstr ""
-#: models_imports.py:364
+#: models_imports.py:370
msgid "Importer - Columns"
msgstr ""
-#: models_imports.py:394
+#: models_imports.py:400
msgid "Field name"
msgstr ""
-#: models_imports.py:396 models_imports.py:453
+#: models_imports.py:402 models_imports.py:459
msgid "Force creation of new items"
msgstr ""
-#: models_imports.py:398 models_imports.py:455
+#: models_imports.py:404 models_imports.py:461
msgid "Concatenate with existing"
msgstr ""
-#: models_imports.py:400 models_imports.py:457
+#: models_imports.py:406 models_imports.py:463
msgid "Concatenate character"
msgstr ""
-#: models_imports.py:405
+#: models_imports.py:411
msgid "Importer - Duplicate field"
msgstr ""
-#: models_imports.py:406
+#: models_imports.py:412
msgid "Importer - Duplicate fields"
msgstr ""
-#: models_imports.py:424
+#: models_imports.py:430
msgid "Regular expression"
msgstr ""
-#: models_imports.py:428
+#: models_imports.py:434
msgid "Importer - Regular expression"
msgstr ""
-#: models_imports.py:429
+#: models_imports.py:435
msgid "Importer - Regular expressions"
msgstr ""
-#: models_imports.py:463
+#: models_imports.py:469
msgid "Importer - Target"
msgstr ""
-#: models_imports.py:464
+#: models_imports.py:470
msgid "Importer - Targets"
msgstr ""
-#: models_imports.py:501 views.py:604
+#: models_imports.py:507 views.py:604
msgid "True"
msgstr ""
-#: models_imports.py:502 views.py:606
+#: models_imports.py:508 views.py:606
msgid "False"
msgstr ""
-#: models_imports.py:514
+#: models_imports.py:520
msgid "All users can use it"
msgstr ""
-#: models_imports.py:516
+#: models_imports.py:522
msgid "All users can modify it"
msgstr ""
-#: models_imports.py:521
+#: models_imports.py:527
msgid "Importer - Target key group"
msgstr ""
-#: models_imports.py:522
+#: models_imports.py:528
msgid "Importer - Target key groups"
msgstr ""
-#: models_imports.py:541
+#: models_imports.py:547
msgid "Is set"
msgstr ""
-#: models_imports.py:549
+#: models_imports.py:555
msgid "Importer - Target key"
msgstr ""
-#: models_imports.py:550
+#: models_imports.py:556
msgid "Importer - Targets keys"
msgstr ""
-#: models_imports.py:613
+#: models_imports.py:619
msgid "Period"
msgstr ""
-#: models_imports.py:614
+#: models_imports.py:620
msgid "Report state"
msgstr ""
-#: models_imports.py:615
+#: models_imports.py:621
msgid "Remain type"
msgstr ""
-#: models_imports.py:616
+#: models_imports.py:622
msgid "Unit"
msgstr ""
-#: models_imports.py:618
+#: models_imports.py:624
msgid "Activity type"
msgstr ""
-#: models_imports.py:620
+#: models_imports.py:626
msgid "Documentation type"
msgstr ""
-#: models_imports.py:621
+#: models_imports.py:627
msgid "Material"
msgstr ""
-#: models_imports.py:623
+#: models_imports.py:629
msgid "Conservatory state"
msgstr ""
-#: models_imports.py:624
+#: models_imports.py:630
msgid "Container type"
msgstr ""
-#: models_imports.py:625
+#: models_imports.py:631
msgid "Treatment type"
msgstr ""
-#: models_imports.py:627
+#: models_imports.py:633
msgid "Treatment emergency type"
msgstr ""
-#: models_imports.py:628
+#: models_imports.py:634
msgid "Object type"
msgstr ""
-#: models_imports.py:629
+#: models_imports.py:635
msgid "Integrity type"
msgstr ""
-#: models_imports.py:631
+#: models_imports.py:637
msgid "Remarkability type"
msgstr ""
-#: models_imports.py:632
+#: models_imports.py:638
msgid "Alteration type"
msgstr ""
-#: models_imports.py:634
+#: models_imports.py:640
msgid "Alteration cause type"
msgstr ""
-#: models_imports.py:635
+#: models_imports.py:641
msgid "Batch type"
msgstr ""
-#: models_imports.py:637
+#: models_imports.py:643
msgid "Identification type"
msgstr ""
-#: models_imports.py:639
+#: models_imports.py:645
msgid "Context record relation type"
msgstr ""
-#: models_imports.py:648
+#: models_imports.py:654
msgid "Integer"
msgstr ""
-#: models_imports.py:649
+#: models_imports.py:655
msgid "Float"
msgstr ""
-#: models_imports.py:650
+#: models_imports.py:656
msgid "String"
msgstr ""
-#: models_imports.py:651
+#: models_imports.py:657
msgid "Date"
msgstr ""
-#: models_imports.py:653
+#: models_imports.py:659
#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
msgstr ""
-#: models_imports.py:654
+#: models_imports.py:660
msgid "INSEE code"
msgstr ""
-#: models_imports.py:655
+#: models_imports.py:661
msgid "String to boolean"
msgstr ""
-#: models_imports.py:656
+#: models_imports.py:662
msgctxt "filesystem"
msgid "File"
msgstr ""
-#: models_imports.py:657
+#: models_imports.py:663
msgid "Unknow type"
msgstr ""
-#: models_imports.py:674
+#: models_imports.py:680
msgid "4 digit year. e.g.: \"2015\""
msgstr ""
-#: models_imports.py:675
+#: models_imports.py:681
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr ""
-#: models_imports.py:676
+#: models_imports.py:682
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr ""
-#: models_imports.py:692
+#: models_imports.py:698
msgid "Options"
msgstr ""
-#: models_imports.py:694
+#: models_imports.py:700
msgid "Split character(s)"
msgstr ""
-#: models_imports.py:699
+#: models_imports.py:705
msgid "Importer - Formater type"
msgstr ""
-#: models_imports.py:700
+#: models_imports.py:706
msgid "Importer - Formater types"
msgstr ""
-#: models_imports.py:755
+#: models_imports.py:761
#: templates/ishtar/dashboards/dashboard_main_detail.html:132
msgid "Created"
msgstr ""
-#: models_imports.py:756
+#: models_imports.py:762
msgid "Analyse in progress"
msgstr ""
-#: models_imports.py:757
+#: models_imports.py:763
msgid "Analysed"
msgstr ""
-#: models_imports.py:758
+#: models_imports.py:764
msgid "Import pending"
msgstr ""
-#: models_imports.py:759
+#: models_imports.py:765
+msgid "Import in queue"
+msgstr ""
+
+#: models_imports.py:766
msgid "Import in progress"
msgstr ""
-#: models_imports.py:762
+#: models_imports.py:769
msgid "Archived"
msgstr ""
-#: models_imports.py:777
+#: models_imports.py:796
msgid "Imported file"
msgstr ""
-#: models_imports.py:779
+#: models_imports.py:798
msgid "Associated images (zip file)"
msgstr ""
-#: models_imports.py:783
+#: models_imports.py:802
msgid "If a group is selected, target key saved in this group will be used."
msgstr ""
-#: models_imports.py:786
+#: models_imports.py:805
msgid "Encoding"
msgstr ""
-#: models_imports.py:789
+#: models_imports.py:808
msgid "Skip lines"
msgstr ""
-#: models_imports.py:790
+#: models_imports.py:809
msgid "Number of header lines in your file (can be 0)."
msgstr ""
-#: models_imports.py:791
+#: models_imports.py:810
msgid "Error file"
msgstr ""
-#: models_imports.py:794
+#: models_imports.py:813
msgid "Result file"
msgstr ""
-#: models_imports.py:797
+#: models_imports.py:816
msgid "Match file"
msgstr ""
-#: models_imports.py:803
+#: models_imports.py:822
msgid "Conservative import"
msgstr ""
-#: models_imports.py:804
+#: models_imports.py:823
msgid "If set to true, do not overload existing values."
msgstr ""
-#: models_imports.py:807
+#: models_imports.py:826
msgid "End date"
msgstr ""
-#: models_imports.py:810
+#: models_imports.py:829
msgid "Remaining seconds"
msgstr ""
-#: models_imports.py:813
+#: models_imports.py:832
msgid "Import"
msgstr ""
-#: models_imports.py:842
+#: models_imports.py:861
msgid "Analyse"
msgstr ""
-#: models_imports.py:844 models_imports.py:847
+#: models_imports.py:863 models_imports.py:866
msgid "Re-analyse"
msgstr ""
-#: models_imports.py:845
+#: models_imports.py:864
msgid "Launch import"
msgstr ""
-#: models_imports.py:848
+#: models_imports.py:867
msgid "Re-import"
msgstr ""
-#: models_imports.py:849
+#: models_imports.py:868
msgid "Archive"
msgstr ""
-#: models_imports.py:851
+#: models_imports.py:870
msgid "Unarchive"
msgstr ""
-#: models_imports.py:852 templates/ishtar/form_delete.html:11 widgets.py:258
+#: models_imports.py:871 templates/ishtar/form_delete.html:11 widgets.py:258
msgid "Delete"
msgstr ""
+#: models_imports.py:939
+msgid "Import {} added to the queue"
+msgstr ""
+
+#: models_imports.py:957
+msgid "Error on imported file: {}"
+msgstr ""
+
+#: models_imports.py:983
+msgid "Import {} finished with errors"
+msgstr ""
+
+#: models_imports.py:989
+msgid "Import {} finished with no errors"
+msgstr ""
+
#: templates/404.html:14
msgid "Page not found"
msgstr ""
@@ -1906,34 +1924,42 @@ msgstr ""
msgid "no"
msgstr ""
-#: templates/base.html:65
+#: templates/base.html:43
+msgid "Autorefresh start. The form is disabled."
+msgstr ""
+
+#: templates/base.html:44
+msgid "Autorefresh end. The form is re-enabled."
+msgstr ""
+
+#: templates/base.html:67
msgid "Current items"
msgstr ""
-#: templates/base.html:67 templates/blocks/bs_form_snippet.html:55
+#: templates/base.html:69 templates/blocks/bs_form_snippet.html:55
#: templates/ishtar/manage_basket.html:4 templates/welcome.html:11
#: templates/welcome.html:12 templates/welcome.html:13
#: templates/welcome.html:14
msgid ":"
msgstr ""
-#: templates/base.html:83
+#: templates/base.html:82
msgid "Sheets"
msgstr ""
-#: templates/base.html:121
+#: templates/base.html:132
msgid "Processing..."
msgstr ""
-#: templates/base.html:123
+#: templates/base.html:134
msgid "This can be long."
msgstr ""
-#: templates/base.html:125
+#: templates/base.html:136
msgid "Time to take a coffee?"
msgstr ""
-#: templates/base.html:127
+#: templates/base.html:138
msgid "Time to take another coffee?"
msgstr ""
@@ -2034,7 +2060,7 @@ msgstr ""
#: templates/blocks/bs_form_snippet.html:85 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/import_list.html:30 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"
@@ -2297,47 +2323,49 @@ msgstr ""
msgid "Back"
msgstr ""
-#: templates/ishtar/import_list.html:12 templates/ishtar/import_table.html:5
+#: templates/ishtar/import_list.html:10
+msgid "Autorefresh the table (useful when waiting for an import result)"
+msgstr ""
+
+#: templates/ishtar/import_table.html:23
msgid "No pending imports."
msgstr ""
-#: templates/ishtar/import_list.html:18 templates/ishtar/import_table.html:11
+#: templates/ishtar/import_table.html:29
msgctxt "file"
msgid "File"
msgstr ""
-#: templates/ishtar/import_list.html:20 templates/ishtar/import_table.html:13
+#: templates/ishtar/import_table.html:31
msgid "Status"
msgstr ""
-#: templates/ishtar/import_list.html:21 templates/ishtar/import_table.html:14
+#: templates/ishtar/import_table.html:32
msgid "Action"
msgstr ""
-#: templates/ishtar/import_list.html:22 templates/ishtar/import_table.html:15
+#: templates/ishtar/import_table.html:33
msgid "Unmatched items"
msgstr ""
-#: templates/ishtar/import_list.html:23 templates/ishtar/import_table.html:16
+#: templates/ishtar/import_table.html:34
msgid "Error"
msgstr ""
-#: templates/ishtar/import_list.html:24 templates/ishtar/import_table.html:17
+#: templates/ishtar/import_table.html:35
msgid "Control"
msgstr ""
-#: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54
-#: templates/ishtar/import_table.html:18 templates/ishtar/import_table.html:47
+#: templates/ishtar/import_table.html:36 templates/ishtar/import_table.html:65
msgid "Match"
msgstr ""
-#: templates/ishtar/import_list.html:36 templates/ishtar/import_table.html:29
+#: templates/ishtar/import_table.html:47
msgid "Source file"
msgstr ""
-#: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61
-#: templates/ishtar/import_list.html:64 templates/ishtar/import_table.html:51
-#: templates/ishtar/import_table.html:54 templates/ishtar/import_table.html:57
+#: templates/ishtar/import_table.html:69 templates/ishtar/import_table.html:72
+#: templates/ishtar/import_table.html:75
msgctxt "not a directory"
msgid "File"
msgstr ""
@@ -2788,15 +2816,15 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: utils.py:145
+#: utils.py:146
msgid " (...)"
msgstr ""
-#: utils.py:207
+#: utils.py:208
msgid "Information"
msgstr ""
-#: utils.py:208
+#: utils.py:209
msgid "Load another random image?"
msgstr ""
@@ -2893,31 +2921,31 @@ msgstr ""
msgid "Treatments"
msgstr ""
-#: views.py:1839
+#: views.py:1867
msgid "Link unmatched items"
msgstr ""
-#: views.py:1860
+#: views.py:1888
msgid "Delete import"
msgstr ""
-#: views.py:1899
+#: views.py:1927
msgid "Merge persons"
msgstr ""
-#: views.py:1923
+#: views.py:1951
msgid "Select the main person"
msgstr ""
-#: views.py:1932
+#: views.py:1960
msgid "Merge organization"
msgstr ""
-#: views.py:1942
+#: views.py:1970
msgid "Select the main organization"
msgstr ""
-#: views.py:1982 views.py:1998
+#: views.py:2010 views.py:2026
msgid "Corporation manager"
msgstr ""
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 07d16e22c..c84d8faec 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -5,12 +5,13 @@
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
+# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-03-03 05:11-0500\n"
+"PO-Revision-Date: 2018-03-08 09:45-0500\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -59,7 +60,7 @@ msgstr "Identifiant libre"
#: forms.py:150 models_finds.py:681 templates/ishtar/sheet_find.html:18
msgid "Denomination"
-msgstr ""
+msgstr "Dénomination"
#: forms.py:151 models_finds.py:738
msgid "Previous ID"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index e9a6bb224..ce82aa341 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-03-08 05:31-0500\n"
+"PO-Revision-Date: 2018-03-08 09:44-0500\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -85,7 +85,7 @@ msgstr "Ces parents sont manquants : {}"
msgid "Form"
msgstr "Formulaire"
-#: admin.py:571 models.py:1727 models_imports.py:117
+#: admin.py:571 models.py:1727 models_imports.py:123
#: templates/ishtar/dashboards/dashboard_main.html:39
msgid "Users"
msgstr "Utilisateurs"
@@ -366,16 +366,15 @@ msgstr "Organisation"
#: forms_common.py:263 forms_common.py:301 forms_common.py:415
#: forms_common.py:471 forms_common.py:543 models.py:960 models.py:973
#: models.py:1530 models.py:1701 models.py:2007 models.py:2319 models.py:2433
-#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:88
-#: models_imports.py:113 models_imports.py:421 models_imports.py:513
-#: models_imports.py:774 templates/ishtar/import_list.html:16
-#: templates/ishtar/import_table.html:9
+#: models.py:2891 models.py:2939 models.py:3138 models_imports.py:94
+#: models_imports.py:119 models_imports.py:427 models_imports.py:519
+#: models_imports.py:793 templates/ishtar/import_table.html:27
#: templates/ishtar/sheet_organization.html:23
msgid "Name"
msgstr "Nom"
-#: forms_common.py:264 models.py:2295 models_imports.py:606
-#: models_imports.py:607
+#: forms_common.py:264 models.py:2295 models_imports.py:612
+#: models_imports.py:613
msgid "Organization type"
msgstr "Type d'organisation"
@@ -419,9 +418,9 @@ msgid "Full text search"
msgstr "Recherche en texte intégral"
#: forms_common.py:302 forms_common.py:418 forms_common.py:546 models.py:2321
-#: models.py:2818 models.py:2900 models_imports.py:652
+#: models.py:2818 models.py:2900 models_imports.py:658
#: templates/ishtar/blocks/window_tables/documents.html:8
-#: templates/ishtar/import_list.html:17 templates/ishtar/import_table.html:10
+#: templates/ishtar/import_table.html:28
#: templates/ishtar/sheet_organization.html:25
msgid "Type"
msgstr "Type"
@@ -460,7 +459,7 @@ msgid "Identity"
msgstr "Identité"
#: forms_common.py:466 forms_common.py:892 forms_common.py:937 models.py:2425
-#: models.py:2427 models.py:2815 models_imports.py:608
+#: models.py:2427 models.py:2815 models_imports.py:614
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr "Titre"
@@ -590,7 +589,7 @@ msgstr "Information sur le document"
msgid "Source - General"
msgstr "Documentation - Général"
-#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:609
+#: forms_common.py:894 forms_common.py:938 models.py:2784 models_imports.py:615
msgid "Source type"
msgstr "Type de document"
@@ -610,7 +609,7 @@ msgstr "Ressource numérique (adresse web)"
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:806
+#: forms_common.py:905 models.py:2833 models.py:2903 models_imports.py:825
msgid "Creation date"
msgstr "Date de création"
@@ -619,13 +618,13 @@ msgid "Receipt date in documentation"
msgstr "Date de réception en documentation"
#: forms_common.py:910 forms_common.py:942 models.py:448 models.py:2439
-#: models.py:2711 models.py:2843 models_imports.py:459
+#: models.py:2711 models.py:2843 models_imports.py:465
msgid "Comment"
msgstr "Commentaire"
#: forms_common.py:912 forms_common.py:941 models.py:1532 models.py:2842
-#: models.py:2892 models_imports.py:115 models_imports.py:352
-#: models_imports.py:422
+#: models.py:2892 models_imports.py:121 models_imports.py:358
+#: models_imports.py:428
msgid "Description"
msgstr "Description"
@@ -654,7 +653,7 @@ msgstr "Informations supplémentaires"
msgid "Would you like to delete this documentation?"
msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:610
+#: forms_common.py:971 models.py:2740 models.py:2752 models_imports.py:616
msgid "Author type"
msgstr "Type d'auteur"
@@ -700,8 +699,7 @@ msgstr "Annuaire"
msgid "Search"
msgstr "Recherche"
-#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_list.html:19
-#: templates/ishtar/import_table.html:12
+#: ishtar_menu.py:55 ishtar_menu.py:84 templates/ishtar/import_table.html:30
msgid "Creation"
msgstr "Ajout"
@@ -717,7 +715,7 @@ msgstr "Fusion automatique"
msgid "Manual merge"
msgstr "Fusion manuelle"
-#: ishtar_menu.py:110 models_imports.py:814
+#: ishtar_menu.py:110 models_imports.py:833
msgid "Imports"
msgstr "Imports"
@@ -729,7 +727,7 @@ msgstr "Nouvel import"
msgid "Current imports"
msgstr "Imports en cours"
-#: ishtar_menu.py:121 views.py:1825
+#: ishtar_menu.py:121 views.py:1853
msgid "Old imports"
msgstr "Anciens imports"
@@ -746,7 +744,7 @@ msgid "This item already exists."
msgstr "Cet élément existe déjà."
#: models.py:440 models.py:2102 models.py:2118 models.py:2710
-#: models_imports.py:348
+#: models_imports.py:354
msgid "Label"
msgstr "Dénomination"
@@ -764,11 +762,11 @@ msgstr ""
"être unique dans la typologie."
#: models.py:449 models.py:1703 models.py:2014 models.py:2713
-#: models_imports.py:129 models_imports.py:518
+#: models_imports.py:135 models_imports.py:524
msgid "Available"
msgstr "Disponible"
-#: models.py:824 models.py:976 models_imports.py:539
+#: models.py:824 models.py:976 models_imports.py:545
#: templates/ishtar/formset_import_match.html:21
msgid "Key"
msgstr "Clé"
@@ -886,18 +884,18 @@ msgid "Site modification"
msgstr "Modifier un site"
#: models.py:1521
-msgid "Archaeological site search"
-msgstr "Rechercher un site archéologique"
+msgid "Archaeological entity search"
+msgstr "Rechercher une entité archéologique"
#: models.py:1522
-msgid "New archaeological site"
-msgstr "Ajouter un site archéologique"
+msgid "New archaeological entity"
+msgstr "Nouvelle entité archéologique"
#: models.py:1523
-msgid "Archaeological site modification"
-msgstr "Modifier un site archéologique"
+msgid "Archaeological entity modification"
+msgstr "Modifier une entité archéologique"
-#: models.py:1531 models.py:2008 models_imports.py:114
+#: models.py:1531 models.py:2008 models_imports.py:120
msgid "Slug"
msgstr "Identifiant texte"
@@ -1155,7 +1153,7 @@ msgstr "Nom de la variable"
msgid "Description of the variable"
msgstr "Description de la variable"
-#: models.py:1782 models_imports.py:540
+#: models.py:1782 models_imports.py:546
#: templates/ishtar/formset_import_match.html:22
msgid "Value"
msgstr "Valeur"
@@ -1191,7 +1189,7 @@ msgstr "Patron de document"
msgid "Document templates"
msgstr "Patrons de document"
-#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:800
+#: models.py:2107 models.py:2120 models.py:3161 models_imports.py:819
msgid "State"
msgstr "État"
@@ -1243,7 +1241,7 @@ msgstr "Groupes"
msgid "Person types"
msgstr "Types de personne"
-#: models.py:2385 models_imports.py:642
+#: models.py:2385 models_imports.py:648
msgid "Title type"
msgstr "Type de titre"
@@ -1307,7 +1305,7 @@ msgstr "Types d'auteur"
msgid "Source types"
msgstr "Types de document"
-#: models.py:2795 models_imports.py:641
+#: models.py:2795 models_imports.py:647
msgid "Support type"
msgstr "Type de support"
@@ -1331,7 +1329,7 @@ msgstr "Identifiant"
msgid "Support"
msgstr "Support"
-#: models.py:2821 models_imports.py:611
+#: models.py:2821 models_imports.py:617
msgid "Format"
msgstr "Format"
@@ -1406,7 +1404,7 @@ msgstr "Nom en cache"
msgid "Is preventive"
msgstr "Est du préventif"
-#: models.py:3064 models_imports.py:612
+#: models.py:3064 models_imports.py:618
msgid "Operation type"
msgstr "Type d'opération"
@@ -1430,7 +1428,7 @@ msgstr "Registre"
msgid "Authority SRID"
msgstr "SRID"
-#: models.py:3129 models_imports.py:640
+#: models.py:3129 models_imports.py:646
msgid "Spatial reference system"
msgstr "Système de référence spatiale"
@@ -1458,11 +1456,11 @@ msgstr "Planifié"
msgid "In progress"
msgstr "En cours"
-#: models.py:3152 models_imports.py:760
+#: models.py:3152 models_imports.py:767
msgid "Finished with errors"
msgstr "Terminé avec des erreurs"
-#: models.py:3153 models_imports.py:761
+#: models.py:3153 models_imports.py:768
msgid "Finished"
msgstr "Terminé"
@@ -1513,75 +1511,75 @@ msgstr ""
"Le script « {} »n'est pas un fichier valable de votre répertoire de script. "
"Vérifiez la configuration."
-#: models_imports.py:89
+#: models_imports.py:95
msgid "Class name"
msgstr "Nom de la classe"
-#: models_imports.py:93
+#: models_imports.py:99
msgid "Importer - Model"
msgstr "Importeur - Modèle"
-#: models_imports.py:94
+#: models_imports.py:100
msgid "Importer - Models"
msgstr "Importeur - Modèles"
-#: models_imports.py:120
+#: models_imports.py:126
msgid "Associated model"
msgstr "Modèle associé"
-#: models_imports.py:123
+#: models_imports.py:129
msgid "Models that can accept new items"
msgstr "Modèles qui peuvent accepter de nouveaux éléments"
-#: models_imports.py:124
+#: models_imports.py:130
msgid "Leave blank for no restrictions"
msgstr "Laissez vide pour aucune restriction"
-#: models_imports.py:126
+#: models_imports.py:132
msgid "Is template"
msgstr "Est un patron"
-#: models_imports.py:127
+#: models_imports.py:133
msgid "Unicity keys (separator \";\")"
msgstr "Clés d'unicité (séparateur « ; »)"
-#: models_imports.py:133
+#: models_imports.py:139
msgid "Importer - Type"
msgstr "Importeur - Type"
-#: models_imports.py:134
+#: models_imports.py:140
msgid "Importer - Types"
msgstr "Importeur - Types"
-#: models_imports.py:255
+#: models_imports.py:261
msgid "Importer - Default"
msgstr "Importeur - Par défaut"
-#: models_imports.py:256
+#: models_imports.py:262
msgid "Importer - Defaults"
msgstr "Importeur - Par défaut"
-#: models_imports.py:301
+#: models_imports.py:307
msgid "Importer - Default value"
msgstr "Importeur - Valeur par défaut"
-#: models_imports.py:302
+#: models_imports.py:308
msgid "Importer - Default values"
msgstr "Importeur - Valeurs par défaut"
-#: models_imports.py:351
+#: models_imports.py:357
msgid "Column number"
msgstr "Numéro de colonne"
-#: models_imports.py:354
+#: models_imports.py:360
msgid "Required"
msgstr "Requis"
-#: models_imports.py:356
+#: models_imports.py:362
msgid "Export field name"
msgstr "Exporter le nom du champ"
-#: models_imports.py:357
+#: models_imports.py:363
msgid ""
"Fill this field if the field name is ambiguous for export. For instance: "
"concatenated fields."
@@ -1589,347 +1587,367 @@ msgstr ""
"Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple "
"dans le cas de champs concaténés."
-#: models_imports.py:363
+#: models_imports.py:369
msgid "Importer - Column"
msgstr "Importeur - Colonne"
-#: models_imports.py:364
+#: models_imports.py:370
msgid "Importer - Columns"
msgstr "Importeur - Colonnes"
-#: models_imports.py:394
+#: models_imports.py:400
msgid "Field name"
msgstr "Nom du champ"
-#: models_imports.py:396 models_imports.py:453
+#: models_imports.py:402 models_imports.py:459
msgid "Force creation of new items"
msgstr "Forcer la création de nouveaux éléments"
-#: models_imports.py:398 models_imports.py:455
+#: models_imports.py:404 models_imports.py:461
msgid "Concatenate with existing"
msgstr "Concaténer avec l'existant"
-#: models_imports.py:400 models_imports.py:457
+#: models_imports.py:406 models_imports.py:463
msgid "Concatenate character"
msgstr "Caractère de concaténation"
-#: models_imports.py:405
+#: models_imports.py:411
msgid "Importer - Duplicate field"
msgstr "Importeur - Champ dupliqué"
-#: models_imports.py:406
+#: models_imports.py:412
msgid "Importer - Duplicate fields"
msgstr "Importeur - Champs dupliqués"
-#: models_imports.py:424
+#: models_imports.py:430
msgid "Regular expression"
msgstr "Expression régulière"
-#: models_imports.py:428
+#: models_imports.py:434
msgid "Importer - Regular expression"
msgstr "Importeur - Expression régulière"
-#: models_imports.py:429
+#: models_imports.py:435
msgid "Importer - Regular expressions"
msgstr "Importeur - Expressions régulières"
-#: models_imports.py:463
+#: models_imports.py:469
msgid "Importer - Target"
msgstr "Importeur - Cible"
-#: models_imports.py:464
+#: models_imports.py:470
msgid "Importer - Targets"
msgstr "Importeur - Cibles"
-#: models_imports.py:501 views.py:604
+#: models_imports.py:507 views.py:604
msgid "True"
msgstr "Oui"
-#: models_imports.py:502 views.py:606
+#: models_imports.py:508 views.py:606
msgid "False"
msgstr "Non"
-#: models_imports.py:514
+#: models_imports.py:520
msgid "All users can use it"
msgstr "Tous les utilisateurs peuvent l'utiliser"
-#: models_imports.py:516
+#: models_imports.py:522
msgid "All users can modify it"
msgstr "Tous les utilisateurs peuvent le modifier"
-#: models_imports.py:521
+#: models_imports.py:527
msgid "Importer - Target key group"
msgstr "Importeur - Groupe de clé de rapprochement"
-#: models_imports.py:522
+#: models_imports.py:528
msgid "Importer - Target key groups"
msgstr "Importeur - Groupes de clé de rapprochement"
-#: models_imports.py:541
+#: models_imports.py:547
msgid "Is set"
msgstr "Est défini"
-#: models_imports.py:549
+#: models_imports.py:555
msgid "Importer - Target key"
msgstr "Importeur - Clé de rapprochement"
-#: models_imports.py:550
+#: models_imports.py:556
msgid "Importer - Targets keys"
msgstr "Importeur - Clés de rapprochement"
-#: models_imports.py:613
+#: models_imports.py:619
msgid "Period"
msgstr "Période"
-#: models_imports.py:614
+#: models_imports.py:620
msgid "Report state"
msgstr "État de rapport"
-#: models_imports.py:615
+#: models_imports.py:621
msgid "Remain type"
msgstr "Type de vestige"
-#: models_imports.py:616
+#: models_imports.py:622
msgid "Unit"
msgstr "Unité"
-#: models_imports.py:618
+#: models_imports.py:624
msgid "Activity type"
msgstr "Type d'activité"
-#: models_imports.py:620
+#: models_imports.py:626
msgid "Documentation type"
msgstr "Type de documentation"
-#: models_imports.py:621
+#: models_imports.py:627
msgid "Material"
msgstr "Matériau"
-#: models_imports.py:623
+#: models_imports.py:629
msgid "Conservatory state"
msgstr "État de conservation"
-#: models_imports.py:624
+#: models_imports.py:630
msgid "Container type"
msgstr "Type de contenant"
-#: models_imports.py:625
+#: models_imports.py:631
msgid "Treatment type"
msgstr "Type de traitement"
-#: models_imports.py:627
+#: models_imports.py:633
msgid "Treatment emergency type"
msgstr "Type d'urgence de traitement"
-#: models_imports.py:628
+#: models_imports.py:634
msgid "Object type"
msgstr "Type d'objet"
-#: models_imports.py:629
+#: models_imports.py:635
msgid "Integrity type"
msgstr "Type d'intégrité"
-#: models_imports.py:631
+#: models_imports.py:637
msgid "Remarkability type"
msgstr "Type de remarquabilité"
-#: models_imports.py:632
+#: models_imports.py:638
msgid "Alteration type"
msgstr "Type d'altération"
-#: models_imports.py:634
+#: models_imports.py:640
msgid "Alteration cause type"
msgstr "Type de cause d'altération"
-#: models_imports.py:635
+#: models_imports.py:641
msgid "Batch type"
msgstr "Type de lot"
-#: models_imports.py:637
+#: models_imports.py:643
msgid "Identification type"
msgstr "Type d'identification"
-#: models_imports.py:639
+#: models_imports.py:645
msgid "Context record relation type"
msgstr "Type de relations entre Unités d'Enregistrement"
-#: models_imports.py:648
+#: models_imports.py:654
msgid "Integer"
msgstr "Entier"
-#: models_imports.py:649
+#: models_imports.py:655
msgid "Float"
msgstr "Nombre à virgule"
-#: models_imports.py:650
+#: models_imports.py:656
msgid "String"
msgstr "Chaîne de caractères"
-#: models_imports.py:651
+#: models_imports.py:657
msgid "Date"
msgstr "Date"
-#: models_imports.py:653
+#: models_imports.py:659
#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
msgstr "Année"
-#: models_imports.py:654
+#: models_imports.py:660
msgid "INSEE code"
msgstr "Code INSEE"
-#: models_imports.py:655
+#: models_imports.py:661
msgid "String to boolean"
msgstr "Chaîne de caractères vers booléen"
-#: models_imports.py:656
+#: models_imports.py:662
msgctxt "filesystem"
msgid "File"
msgstr "Fichier"
-#: models_imports.py:657
+#: models_imports.py:663
msgid "Unknow type"
msgstr "Type inconnu"
-#: models_imports.py:674
+#: models_imports.py:680
msgid "4 digit year. e.g.: \"2015\""
msgstr "Année sur 4 chiffres. Exemple : « 2015 »"
-#: models_imports.py:675
+#: models_imports.py:681
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
-#: models_imports.py:676
+#: models_imports.py:682
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »"
-#: models_imports.py:692
+#: models_imports.py:698
msgid "Options"
msgstr "Options"
-#: models_imports.py:694
+#: models_imports.py:700
msgid "Split character(s)"
msgstr "Caractère(s) de séparation"
-#: models_imports.py:699
+#: models_imports.py:705
msgid "Importer - Formater type"
msgstr "Importeur - Type de mise en forme"
-#: models_imports.py:700
+#: models_imports.py:706
msgid "Importer - Formater types"
msgstr "Importeur - Types de mise en forme"
-#: models_imports.py:755
+#: models_imports.py:761
#: templates/ishtar/dashboards/dashboard_main_detail.html:132
msgid "Created"
msgstr "Créé"
-#: models_imports.py:756
+#: models_imports.py:762
msgid "Analyse in progress"
msgstr "Analyse en cours"
-#: models_imports.py:757
+#: models_imports.py:763
msgid "Analysed"
msgstr "Analysé"
-#: models_imports.py:758
+#: models_imports.py:764
msgid "Import pending"
msgstr "Import en attente"
-#: models_imports.py:759
+#: models_imports.py:765
+msgid "Import in queue"
+msgstr "Import en file d'attente"
+
+#: models_imports.py:766
msgid "Import in progress"
msgstr "Import en cours"
-#: models_imports.py:762
+#: models_imports.py:769
msgid "Archived"
msgstr "Archivé"
-#: models_imports.py:777
+#: models_imports.py:796
msgid "Imported file"
msgstr "Fichier importé"
-#: models_imports.py:779
+#: models_imports.py:798
msgid "Associated images (zip file)"
msgstr "Images associées (fichier zip)"
-#: models_imports.py:783
+#: models_imports.py:802
msgid "If a group is selected, target key saved in this group will be used."
msgstr ""
"Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce "
"groupe sont utilisées."
-#: models_imports.py:786
+#: models_imports.py:805
msgid "Encoding"
msgstr "Codage"
-#: models_imports.py:789
+#: models_imports.py:808
msgid "Skip lines"
msgstr "Nombre de lignes d'entête"
-#: models_imports.py:790
+#: models_imports.py:809
msgid "Number of header lines in your file (can be 0)."
msgstr "Nombre de ligne d'entête dans votre fichier (peut être égal à zéro)"
-#: models_imports.py:791
+#: models_imports.py:810
msgid "Error file"
msgstr "Fichier erreur"
-#: models_imports.py:794
+#: models_imports.py:813
msgid "Result file"
msgstr "Fichier résultant"
-#: models_imports.py:797
+#: models_imports.py:816
msgid "Match file"
msgstr "Fichier de correspondance"
-#: models_imports.py:803
+#: models_imports.py:822
msgid "Conservative import"
msgstr "Import conservateur"
-#: models_imports.py:804
+#: models_imports.py:823
msgid "If set to true, do not overload existing values."
msgstr "Si coché, ne surchargera pas les valeurs existantes."
-#: models_imports.py:807
+#: models_imports.py:826
msgid "End date"
msgstr "Date de fin"
-#: models_imports.py:810
+#: models_imports.py:829
msgid "Remaining seconds"
msgstr "Secondes restantes"
-#: models_imports.py:813
+#: models_imports.py:832
msgid "Import"
msgstr "Import"
-#: models_imports.py:842
+#: models_imports.py:861
msgid "Analyse"
msgstr "Analyser"
-#: models_imports.py:844 models_imports.py:847
+#: models_imports.py:863 models_imports.py:866
msgid "Re-analyse"
msgstr "Analyser de nouveau "
-#: models_imports.py:845
+#: models_imports.py:864
msgid "Launch import"
msgstr "Lancer l'import"
-#: models_imports.py:848
+#: models_imports.py:867
msgid "Re-import"
msgstr "Ré-importer"
-#: models_imports.py:849
+#: models_imports.py:868
msgid "Archive"
msgstr "Archiver"
-#: models_imports.py:851
+#: models_imports.py:870
msgid "Unarchive"
msgstr "Désarchiver"
-#: models_imports.py:852 templates/ishtar/form_delete.html:11 widgets.py:258
+#: models_imports.py:871 templates/ishtar/form_delete.html:11 widgets.py:258
msgid "Delete"
msgstr "Supprimer"
+#: models_imports.py:939
+msgid "Import {} added to the queue"
+msgstr "Import {} ajouté à la file d'attente"
+
+#: models_imports.py:957
+msgid "Error on imported file: {}"
+msgstr "Erreur sur le fichier d'import : {}"
+
+#: models_imports.py:983
+msgid "Import {} finished with errors"
+msgstr "Import {} fini avec des erreurs"
+
+#: models_imports.py:989
+msgid "Import {} finished with no errors"
+msgstr "Import {} fini avec aucune erreur"
+
#: templates/404.html:14
msgid "Page not found"
msgstr "Page non trouvée"
@@ -1991,34 +2009,42 @@ msgstr "oui"
msgid "no"
msgstr "non"
-#: templates/base.html:65
+#: templates/base.html:43
+msgid "Autorefresh start. The form is disabled."
+msgstr "Rafraîchissement automatique activé. Le formulaire est désactivé."
+
+#: templates/base.html:44
+msgid "Autorefresh end. The form is re-enabled."
+msgstr "Rafraîchissement automatique désactivé. Le formulaire est ré-activé."
+
+#: templates/base.html:67
msgid "Current items"
msgstr "Éléments courants"
-#: templates/base.html:67 templates/blocks/bs_form_snippet.html:55
+#: templates/base.html:69 templates/blocks/bs_form_snippet.html:55
#: templates/ishtar/manage_basket.html:4 templates/welcome.html:11
#: templates/welcome.html:12 templates/welcome.html:13
#: templates/welcome.html:14
msgid ":"
msgstr " :"
-#: templates/base.html:83
+#: templates/base.html:82
msgid "Sheets"
msgstr "Fiches"
-#: templates/base.html:121
+#: templates/base.html:132
msgid "Processing..."
msgstr "En traitement..."
-#: templates/base.html:123
+#: templates/base.html:134
msgid "This can be long."
msgstr "Cela peut être long."
-#: templates/base.html:125
+#: templates/base.html:136
msgid "Time to take a coffee?"
msgstr "Il est peut-être temps de prendre un café ?"
-#: templates/base.html:127
+#: templates/base.html:138
msgid "Time to take another coffee?"
msgstr "Pourquoi pas un autre café ?"
@@ -2121,7 +2147,7 @@ msgstr "Réinitialiser"
#: templates/blocks/bs_form_snippet.html:85 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/import_list.html:30 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"
@@ -2395,47 +2421,51 @@ msgstr "Oui"
msgid "Back"
msgstr "Retour"
-#: templates/ishtar/import_list.html:12 templates/ishtar/import_table.html:5
+#: templates/ishtar/import_list.html:10
+msgid "Autorefresh the table (useful when waiting for an import result)"
+msgstr ""
+"Rafraîchissement automatique de la table (utile lorsque l'on est en attente "
+"d'un résultat d'import)"
+
+#: templates/ishtar/import_table.html:23
msgid "No pending imports."
msgstr "Pas d'imports en attente."
-#: templates/ishtar/import_list.html:18 templates/ishtar/import_table.html:11
+#: templates/ishtar/import_table.html:29
msgctxt "file"
msgid "File"
msgstr "Fichier"
-#: templates/ishtar/import_list.html:20 templates/ishtar/import_table.html:13
+#: templates/ishtar/import_table.html:31
msgid "Status"
msgstr "État"
-#: templates/ishtar/import_list.html:21 templates/ishtar/import_table.html:14
+#: templates/ishtar/import_table.html:32
msgid "Action"
msgstr "Action"
-#: templates/ishtar/import_list.html:22 templates/ishtar/import_table.html:15
+#: templates/ishtar/import_table.html:33
msgid "Unmatched items"
msgstr "Éléments sans correspondance"
-#: templates/ishtar/import_list.html:23 templates/ishtar/import_table.html:16
+#: templates/ishtar/import_table.html:34
msgid "Error"
msgstr "Erreur"
-#: templates/ishtar/import_list.html:24 templates/ishtar/import_table.html:17
+#: templates/ishtar/import_table.html:35
msgid "Control"
msgstr "Contrôle"
-#: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54
-#: templates/ishtar/import_table.html:18 templates/ishtar/import_table.html:47
+#: templates/ishtar/import_table.html:36 templates/ishtar/import_table.html:65
msgid "Match"
msgstr "Correspondance"
-#: templates/ishtar/import_list.html:36 templates/ishtar/import_table.html:29
+#: templates/ishtar/import_table.html:47
msgid "Source file"
msgstr "Fichier source"
-#: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61
-#: templates/ishtar/import_list.html:64 templates/ishtar/import_table.html:51
-#: templates/ishtar/import_table.html:54 templates/ishtar/import_table.html:57
+#: templates/ishtar/import_table.html:69 templates/ishtar/import_table.html:72
+#: templates/ishtar/import_table.html:75
msgctxt "not a directory"
msgid "File"
msgstr "Fichier"
@@ -2900,15 +2930,15 @@ msgstr "Pas de résultats"
msgid "Loading..."
msgstr "Chargement..."
-#: utils.py:145
+#: utils.py:146
msgid " (...)"
msgstr " (...)"
-#: utils.py:207
+#: utils.py:208
msgid "Information"
msgstr "Information"
-#: utils.py:208
+#: utils.py:209
msgid "Load another random image?"
msgstr "Charger une autre image au hasard ?"
@@ -3010,31 +3040,31 @@ msgstr "Demandes de traitement"
msgid "Treatments"
msgstr "Traitements"
-#: views.py:1839
+#: views.py:1867
msgid "Link unmatched items"
msgstr "Associer les éléments non rapprochés"
-#: views.py:1860
+#: views.py:1888
msgid "Delete import"
msgstr "Supprimer un import"
-#: views.py:1899
+#: views.py:1927
msgid "Merge persons"
msgstr "Fusionner des personnes"
-#: views.py:1923
+#: views.py:1951
msgid "Select the main person"
msgstr "Choisir la personne principale"
-#: views.py:1932
+#: views.py:1960
msgid "Merge organization"
msgstr "Fusionner des organisations"
-#: views.py:1942
+#: views.py:1970
msgid "Select the main organization"
msgstr "Sélectionner l'organisation principale"
-#: views.py:1982 views.py:1998
+#: views.py:2010 views.py:2026
msgid "Corporation manager"
msgstr "Représentant de la personne morale"