summaryrefslogtreecommitdiff
path: root/translations
diff options
context:
space:
mode:
Diffstat (limited to 'translations')
-rw-r--r--translations/de/ishtar_common.po1014
-rw-r--r--translations/fr/archaeological_context_records.po325
-rw-r--r--translations/fr/archaeological_files.po13
-rw-r--r--translations/fr/archaeological_files_pdl.po6
-rw-r--r--translations/fr/archaeological_finds.po661
-rw-r--r--translations/fr/archaeological_operations.po555
-rw-r--r--translations/fr/archaeological_warehouse.po203
-rw-r--r--translations/fr/ishtar_common.po1058
8 files changed, 2105 insertions, 1730 deletions
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index 86630b3c7..6d8515a51 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -24,66 +24,115 @@ msgstr "E-Mail-Adresse"
msgid "Related item"
msgstr ""
-#: admin.py:72
+#: admin.py:73
msgid "CSV file"
msgstr ""
-#: admin.py:73
+#: admin.py:74
msgid "Only unicode encoding is managed - convert your file first"
msgstr ""
-#: admin.py:78
+#: admin.py:98
msgid "Export selected as CSV file"
msgstr ""
-#: admin.py:201 admin.py:220 models.py:813
+#: admin.py:206 templates/navbar.html:31
+msgid "Profile"
+msgstr ""
+
+#: admin.py:207 forms_common.py:765 forms_common.py:785 forms_common.py:786
+#: models.py:2651
+msgid "Profiles"
+msgstr ""
+
+#: admin.py:229 admin.py:248 models.py:838 models.py:3461
msgid "Parent"
msgstr ""
-#: admin.py:208
+#: admin.py:236
msgid "Center"
msgstr ""
-#: admin.py:210 models.py:2953
+#: admin.py:238 models.py:3341
msgid "Limit"
msgstr ""
-#: admin.py:213 models.py:2963
+#: admin.py:241 models.py:3351
msgid "Town children"
msgstr ""
-#: admin.py:221
+#: admin.py:249
msgid "Parents"
msgstr ""
-#: admin.py:365
+#: admin.py:397
msgid "The CSV file should at least have a slug/txt_idx column"
msgstr ""
-#: admin.py:422
+#: admin.py:454
#, python-format
msgid "%d item(s) created."
msgstr ""
-#: admin.py:426
+#: admin.py:458
#, python-format
msgid "%d item(s) updated."
msgstr ""
-#: admin.py:430
+#: admin.py:462
msgid "These parents are missing: {}"
msgstr ""
-#: admin.py:646 models.py:1712
+#: admin.py:560
+msgid "{} importer type(s) duplicated: {}."
+msgstr ""
+
+#: admin.py:571 admin.py:626
+msgid "Duplicate"
+msgstr ""
+
+#: admin.py:615
+msgid "{} importer column(s) duplicated: {}."
+msgstr ""
+
+#: admin.py:640
+msgid "{} importer column(s) right-shifted."
+msgstr ""
+
+#: admin.py:651
+msgid "Shift right"
+msgstr ""
+
+#: admin.py:676
+msgid "{} importer column(s) left-shifted."
+msgstr ""
+
+#: admin.py:682
+msgid "{} importer column(s) not left-shifted: no place available."
+msgstr ""
+
+#: admin.py:694
+msgid "Shift left"
+msgstr ""
+
+#: admin.py:839
+msgid "Display selected"
+msgstr ""
+
+#: admin.py:840
+msgid "Hide selected"
+msgstr ""
+
+#: admin.py:864 models.py:1785
msgid "Form"
msgstr ""
-#: admin.py:648 models.py:1737 models_imports.py:126
+#: admin.py:866 models.py:1810 models_imports.py:126
#: templates/ishtar/dashboards/dashboard_main.html:39
msgid "Users"
msgstr ""
-#: admin.py:668 models.py:1781
+#: admin.py:886 models.py:1885
msgid "Field"
msgstr ""
@@ -177,7 +226,7 @@ msgstr ""
msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
msgstr ""
-#: data_importer.py:729 views.py:1946
+#: data_importer.py:729 views.py:2011
msgid "No data provided"
msgstr ""
@@ -206,7 +255,7 @@ msgid ""
"source file."
msgstr ""
-#: data_importer.py:1234 views.py:2024 views.py:2034
+#: data_importer.py:1234 views.py:2089 views.py:2099
msgid "Not imported"
msgstr ""
@@ -230,74 +279,74 @@ msgstr ""
msgid " or "
msgstr ""
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "line"
msgstr ""
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "col"
msgstr ""
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "error"
msgstr ""
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "field"
msgstr ""
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "source"
msgstr ""
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "result"
msgstr ""
-#: data_importer.py:1871
+#: data_importer.py:1891
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
-#: forms.py:76
+#: forms.py:78
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr ""
-#: forms.py:92 forms_common.py:725
+#: forms.py:94 forms_common.py:792
msgid "Confirm"
msgstr ""
-#: forms.py:97
+#: forms.py:99
msgid "Are you sure you want to delete?"
msgstr ""
-#: forms.py:216
+#: forms.py:301
msgid "There are identical items."
msgstr ""
-#: forms.py:343 forms.py:344
+#: forms.py:432 forms.py:433
msgid "Closing date"
msgstr ""
-#: forms.py:356
+#: forms.py:445
msgid "You should select an item."
msgstr ""
-#: forms.py:357
+#: forms.py:446
msgid "Add a new item"
msgstr ""
-#: forms.py:473 models.py:2021
+#: forms.py:562 models.py:2139
msgid "Template"
msgstr ""
-#: forms_common.py:42 forms_common.py:60 forms_common.py:272
-#: forms_common.py:503 models.py:2152 models.py:2970
+#: forms_common.py:49 forms_common.py:67 forms_common.py:312
+#: forms_common.py:543 models.py:2270 models.py:3358
#: templates/blocks/JQueryAdvancedTown.html:19
msgid "Town"
msgstr ""
-#: forms_common.py:44
+#: forms_common.py:51
msgid ""
"<p>Type name, department code of the town you would like to select. The "
"search is insensitive to case.</p>\n"
@@ -307,358 +356,434 @@ msgid ""
"french town Saint-Denis in the Seine-Saint-Denis department.</p>"
msgstr ""
-#: forms_common.py:69 forms_common.py:975 ishtar_menu.py:48 models.py:2457
-#: models.py:2656 models.py:2760 templates/ishtar/sheet_person.html:4
+#: forms_common.py:76 forms_common.py:1144 ishtar_menu.py:48 models.py:2573
+#: models.py:2802 models.py:2889 models.py:3010
+#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr ""
-#: forms_common.py:140
+#: forms_common.py:117
+msgid "Associated images (web link to a zip file)"
+msgstr ""
+
+#: forms_common.py:152
msgid ""
"This import type have no unicity type defined. Conservative import is not "
"possible."
msgstr ""
-#: forms_common.py:158
+#: forms_common.py:157
+msgid "You put either a file or a download link for images but not both."
+msgstr ""
+
+#: forms_common.py:168
+msgid "Invalid link or no file is available for this link."
+msgstr ""
+
+#: forms_common.py:198
msgid "Target"
msgstr ""
-#: forms_common.py:159
+#: forms_common.py:199
msgid "Remember"
msgstr ""
-#: forms_common.py:177
+#: forms_common.py:217
msgid "Set to NULL"
msgstr ""
-#: forms_common.py:184
+#: forms_common.py:224
msgid "this import only"
msgstr ""
-#: forms_common.py:185
+#: forms_common.py:225
msgid "me"
msgstr ""
-#: forms_common.py:191
+#: forms_common.py:231
msgid "the current group: {}"
msgstr ""
-#: forms_common.py:194
+#: forms_common.py:234
msgid "all users"
msgstr ""
-#: forms_common.py:260 forms_common.py:422 forms_common.py:551
-#: ishtar_menu.py:76 models.py:2335 models.py:2431
+#: forms_common.py:300 forms_common.py:462 forms_common.py:592
+#: ishtar_menu.py:76 models.py:2453 models.py:2547
#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr ""
-#: forms_common.py:263 forms_common.py:302 forms_common.py:417
-#: forms_common.py:473 forms_common.py:546 models.py:964 models.py:977
-#: models.py:1538 models.py:1711 models.py:2017 models.py:2329 models.py:2443
-#: models.py:2901 models.py:2949 models.py:3167 models_imports.py:97
-#: models_imports.py:122 models_imports.py:431 models_imports.py:523
-#: models_imports.py:809 templates/ishtar/import_step_by_step.html:102
+#: forms_common.py:303 forms_common.py:342 forms_common.py:457
+#: forms_common.py:513 forms_common.py:587 forms_common.py:774
+#: forms_common.py:807 forms_common.py:1202 models.py:1011 models.py:1034
+#: models.py:1609 models.py:1784 models.py:2135 models.py:2447 models.py:2559
+#: models.py:2795 models.py:3159 models.py:3337 models.py:3570
+#: models_imports.py:97 models_imports.py:122 models_imports.py:431
+#: models_imports.py:523 models_imports.py:809
+#: templates/ishtar/import_step_by_step.html:102
#: templates/ishtar/import_step_by_step.html:270
#: templates/ishtar/import_table.html:27
#: templates/ishtar/sheet_organization.html:23
msgid "Name"
msgstr "Name"
-#: forms_common.py:264 models.py:2305 models_imports.py:616
+#: forms_common.py:304 models.py:2423 models_imports.py:616
#: models_imports.py:617
msgid "Organization type"
msgstr ""
-#: forms_common.py:266 forms_common.py:497 models.py:2147
+#: forms_common.py:306 forms_common.py:537 models.py:2265
#: templates/ishtar/blocks/sheet_address_section.html:3
msgid "Address"
msgstr ""
-#: forms_common.py:268 forms_common.py:500 models.py:2148
+#: forms_common.py:308 forms_common.py:540 models.py:2266
msgid "Address complement"
msgstr ""
-#: forms_common.py:270 forms_common.py:501 models.py:2150
+#: forms_common.py:310 forms_common.py:541 models.py:2268
msgid "Postal code"
msgstr "Postleitzahl"
-#: forms_common.py:273 forms_common.py:504 models.py:2153
+#: forms_common.py:313 forms_common.py:544 models.py:2271
msgid "Country"
msgstr ""
-#: forms_common.py:275 forms_common.py:419 forms_common.py:477
-#: forms_common.py:548 forms_common.py:673 models.py:2180
+#: forms_common.py:315 forms_common.py:459 forms_common.py:517
+#: forms_common.py:589 forms_common.py:714 models.py:2298
msgid "Email"
msgstr "E-Mail-Adresse"
-#: forms_common.py:276 forms_common.py:480 models.py:2165
-#: templates/ishtar/sheet_person.html:24
+#: forms_common.py:316 forms_common.py:520 models.py:2283
+#: templates/ishtar/sheet_person.html:27
#: templates/ishtar/wizard/wizard_person.html:33
msgid "Phone"
msgstr ""
-#: forms_common.py:277 forms_common.py:489 models.py:2177
-#: templates/ishtar/sheet_person.html:42
+#: forms_common.py:317 forms_common.py:529 models.py:2295
+#: templates/ishtar/sheet_person.html:45
#: templates/ishtar/wizard/wizard_person.html:54
msgid "Mobile phone"
msgstr ""
-#: forms_common.py:300 forms_common.py:415 forms_common.py:543
-#: forms_common.py:933
+#: forms_common.py:340 forms_common.py:455 forms_common.py:584
+#: forms_common.py:1102
msgid "Full text search"
msgstr ""
-#: forms_common.py:303 forms_common.py:420 forms_common.py:549 models.py:2331
-#: models.py:2828 models.py:2910 models_imports.py:662
+#: forms_common.py:343 forms_common.py:460 forms_common.py:590
+#: forms_common.py:771 forms_common.py:1201 models.py:1043 models.py:2449
+#: models.py:3077 models.py:3170 models_imports.py:662
+#: templates/ishtar/blocks/window_image.html:43
#: templates/ishtar/blocks/window_tables/documents.html:8
#: templates/ishtar/import_table.html:28
#: templates/ishtar/sheet_organization.html:25
msgid "Type"
msgstr ""
-#: forms_common.py:313 views.py:161
+#: forms_common.py:353 views.py:162
msgid "Organization search"
msgstr ""
-#: forms_common.py:337
+#: forms_common.py:377
msgid "At least two items have to be selected."
msgstr ""
-#: forms_common.py:355
+#: forms_common.py:395
msgid "Merge all items into"
msgstr ""
-#: forms_common.py:389
+#: forms_common.py:429
msgid "Organization to merge"
msgstr ""
-#: forms_common.py:418 forms_common.py:471 forms_common.py:547 models.py:2441
+#: forms_common.py:458 forms_common.py:511 forms_common.py:588 models.py:2557
#: templates/ishtar/sheet_organization.html:24
msgid "Surname"
msgstr ""
-#: forms_common.py:435 forms_common.py:532 views.py:126
+#: forms_common.py:475 forms_common.py:572 views.py:127
msgid "Person search"
msgstr ""
-#: forms_common.py:448
+#: forms_common.py:488
msgid "Person to merge"
msgstr ""
-#: forms_common.py:465 templates/ishtar/wizard/wizard_person.html:19
+#: forms_common.py:505 templates/ishtar/wizard/wizard_person.html:19
msgid "Identity"
msgstr ""
-#: forms_common.py:468 forms_common.py:895 forms_common.py:942 models.py:2435
-#: models.py:2437 models.py:2825 models_imports.py:618
+#: forms_common.py:508 forms_common.py:1064 forms_common.py:1111 models.py:2551
+#: models.py:2553 models.py:3074 models_imports.py:618
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr ""
-#: forms_common.py:469 models.py:2439
+#: forms_common.py:509 models.py:2555
msgid "Salutation"
msgstr ""
-#: forms_common.py:475 models.py:2445
+#: forms_common.py:515 models.py:2561
msgid "Raw name"
msgstr ""
-#: forms_common.py:478 models.py:2166
+#: forms_common.py:518 models.py:2284
msgid "Phone description"
msgstr ""
-#: forms_common.py:481 models.py:2168 models.py:2170
+#: forms_common.py:521 models.py:2286 models.py:2288
msgid "Phone description 2"
msgstr ""
-#: forms_common.py:483
+#: forms_common.py:523
msgid "Phone 2"
msgstr ""
-#: forms_common.py:485 models.py:2174
+#: forms_common.py:525 models.py:2292
msgid "Phone description 3"
msgstr ""
-#: forms_common.py:487 models.py:2172
+#: forms_common.py:527 models.py:2290
msgid "Phone 3"
msgstr ""
-#: forms_common.py:492
+#: forms_common.py:532
msgid "Current organization"
msgstr ""
-#: forms_common.py:506 models.py:2155
+#: forms_common.py:546 models.py:2273
msgid "Other address: address"
msgstr ""
-#: forms_common.py:509 models.py:2158
+#: forms_common.py:549 models.py:2276
msgid "Other address: address complement"
msgstr ""
-#: forms_common.py:511 models.py:2159
+#: forms_common.py:551 models.py:2277
msgid "Other address: postal code"
msgstr ""
-#: forms_common.py:513 models.py:2161
+#: forms_common.py:553 models.py:2279
msgid "Other address: town"
msgstr ""
-#: forms_common.py:515 models.py:2163
+#: forms_common.py:555 models.py:2281
msgid "Other address: country"
msgstr ""
-#: forms_common.py:527
+#: forms_common.py:567
msgid "Already has an account"
msgstr ""
-#: forms_common.py:545
+#: forms_common.py:586
msgid "Username"
msgstr "Benutzername"
-#: forms_common.py:564
+#: forms_common.py:605
msgid "Account search"
msgstr ""
-#: forms_common.py:611 forms_common.py:651 forms_common.py:655 models.py:2381
+#: forms_common.py:652 forms_common.py:692 forms_common.py:696 models.py:2495
msgid "Person type"
msgstr ""
-#: forms_common.py:667 forms_common.py:672 ishtar_menu.py:33
+#: forms_common.py:708 forms_common.py:713 ishtar_menu.py:33
msgid "Account"
msgstr ""
-#: forms_common.py:676 wizards.py:1394
+#: forms_common.py:717 wizards.py:1630
msgid "New password"
msgstr ""
-#: forms_common.py:679
+#: forms_common.py:720
msgid "New password (confirmation)"
msgstr ""
-#: forms_common.py:706
+#: forms_common.py:747
msgid "Your password and confirmation password do not match."
msgstr ""
-#: forms_common.py:711
+#: forms_common.py:752
msgid "You must provide a correct password."
msgstr ""
-#: forms_common.py:719
+#: forms_common.py:760
msgid "This username already exists."
msgstr ""
-#: forms_common.py:726
+#: forms_common.py:773 models.py:2798 models.py:3468
+msgid "Areas"
+msgstr ""
+
+#: forms_common.py:793
msgid "Send the new password by email?"
msgstr ""
-#: forms_common.py:735 forms_common.py:749 forms_common.py:750 models.py:2971
+#: forms_common.py:805 models.py:2800 views.py:1803
+msgid "Current profile"
+msgstr ""
+
+#: forms_common.py:808 models.py:2785 models.py:2797
+msgid "Profile type"
+msgstr ""
+
+#: forms_common.py:811
+msgid "Duplicate this profile"
+msgstr ""
+
+#: forms_common.py:813
+msgid "Delete this profile"
+msgstr ""
+
+#: forms_common.py:862
+msgid "A profile with the same name exists."
+msgstr ""
+
+#: forms_common.py:894
+msgid " (duplicate)"
+msgstr ""
+
+#: forms_common.py:905 forms_common.py:919 forms_common.py:920 models.py:3359
+#: models.py:3458
msgid "Towns"
msgstr ""
-#: forms_common.py:745
+#: forms_common.py:915
msgid "There are identical towns."
msgstr ""
-#: forms_common.py:832
+#: forms_common.py:1002
msgid "Only one choice can be checked."
msgstr ""
-#: forms_common.py:879
+#: forms_common.py:1049
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
"p>"
msgstr ""
-#: forms_common.py:889
+#: forms_common.py:1059
msgid "Documentation informations"
msgstr ""
-#: forms_common.py:890
+#: forms_common.py:1060
msgid "Source - General"
msgstr ""
-#: forms_common.py:897 forms_common.py:943 models.py:2794 models_imports.py:619
+#: forms_common.py:1066 forms_common.py:1112 models.py:3043
+#: models_imports.py:619
msgid "Source type"
msgstr ""
-#: forms_common.py:899 forms_common.py:944
+#: forms_common.py:1068 forms_common.py:1113
msgid "Reference"
msgstr ""
-#: forms_common.py:902 forms_common.py:945
+#: forms_common.py:1071 forms_common.py:1114
msgid "Internal reference"
msgstr ""
-#: forms_common.py:906 models.py:2839
+#: forms_common.py:1075 models.py:3088
msgid "Numerical ressource (web address)"
msgstr ""
-#: forms_common.py:907 models.py:2841
+#: forms_common.py:1076 models.py:3090
msgid "Receipt date"
msgstr ""
-#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:841
+#: forms_common.py:1078 forms_common.py:1210 models.py:3092 models.py:3173
+#: models_imports.py:841 templates/ishtar/blocks/window_image.html:73
msgid "Creation date"
msgstr "Gründungsdatum"
-#: forms_common.py:912 models.py:2846
+#: forms_common.py:1081 models.py:3095
msgid "Receipt date in documentation"
msgstr ""
-#: forms_common.py:914 forms_common.py:947 models.py:448 models.py:2449
-#: models.py:2721 models.py:2853 models_imports.py:469
+#: forms_common.py:1083 forms_common.py:1116 models.py:473 models.py:2565
+#: models.py:2968 models.py:3102 models_imports.py:469
msgid "Comment"
msgstr ""
-#: forms_common.py:916 forms_common.py:946 models.py:1543 models.py:2852
-#: models.py:2902 models_imports.py:124 models_imports.py:362
-#: models_imports.py:432
+#: forms_common.py:1085 forms_common.py:1115 forms_common.py:1207
+#: models.py:1614 models.py:3101 models.py:3160 models_imports.py:124
+#: models_imports.py:362 models_imports.py:432
msgid "Description"
msgstr "Beschreibung"
-#: forms_common.py:919 models.py:2854
+#: forms_common.py:1088 models.py:3103
msgid "Additional information"
msgstr ""
-#: forms_common.py:921 forms_common.py:950 models.py:2856
+#: forms_common.py:1090 forms_common.py:1119 models.py:3105
msgid "Has a duplicate"
msgstr ""
-#: forms_common.py:924 models.py:2920
+#: forms_common.py:1093 forms_common.py:1199 models.py:3180
msgid "Image"
msgstr "Bild"
-#: forms_common.py:939 forms_common.py:968 forms_common.py:1003 models.py:2766
-#: templates/ishtar/wizard/wizard_person_deletion.html:139
+#: forms_common.py:1108 forms_common.py:1137 forms_common.py:1172
+#: models.py:3015 templates/ishtar/wizard/wizard_person_deletion.html:139
msgid "Author"
msgstr ""
-#: forms_common.py:949
+#: forms_common.py:1118
msgid "Additional informations"
msgstr ""
-#: forms_common.py:960
+#: forms_common.py:1129
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:976 models.py:2750 models.py:2762 models_imports.py:620
+#: forms_common.py:1145 models.py:2997 models.py:3012 models_imports.py:620
msgid "Author type"
msgstr ""
-#: forms_common.py:995
+#: forms_common.py:1164
msgid "Author selection"
msgstr ""
-#: forms_common.py:1010
+#: forms_common.py:1179
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:1014 forms_common.py:1015 models.py:2767 models.py:2835
-#: models.py:2905 templates/ishtar/blocks/window_tables/documents.html:9
+#: forms_common.py:1184 forms_common.py:1185 forms_common.py:1204
+#: models.py:3016 models.py:3084 models.py:3165
+#: templates/ishtar/blocks/window_image.html:28
+#: templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
msgstr ""
+#: forms_common.py:1190 models.py:3181
+msgid "Images"
+msgstr ""
+
+#: forms_common.py:1212
+msgid "Licence"
+msgstr ""
+
+#: forms_common.py:1214 models.py:3097 models.py:3174
+#: templates/ishtar/blocks/window_image.html:53
+msgid "Ref."
+msgstr ""
+
+#: forms_common.py:1216 models.py:3100 models.py:3177
+#: templates/ishtar/blocks/window_image.html:63
+msgid "Internal ref."
+msgstr ""
+
+#: forms_common.py:1218 models.py:3298
+msgid "Main image"
+msgstr ""
+
+#: forms_common.py:1245
+msgid "Only one image can be a main image"
+msgstr ""
+
#: ishtar_menu.py:29 templates/registration/activation_complete.html:10
msgid "Home"
msgstr ""
@@ -675,7 +800,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:40 models.py:1796 views.py:1762
+#: ishtar_menu.py:40 models.py:1914 views.py:1827
msgid "Global variables"
msgstr ""
@@ -708,51 +833,51 @@ msgstr ""
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:113 views.py:1770
+#: ishtar_menu.py:113 views.py:1835
msgid "New import"
msgstr ""
-#: ishtar_menu.py:117 views.py:1789
+#: ishtar_menu.py:117 views.py:1854
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:121 views.py:2235
+#: ishtar_menu.py:121 views.py:2300
msgid "Old imports"
msgstr ""
-#: models.py:232
+#: models.py:229
msgid "Not a valid item."
msgstr ""
-#: models.py:247
+#: models.py:244
msgid "A selected item is not a valid item."
msgstr ""
-#: models.py:258
+#: models.py:255
msgid "This item already exists."
msgstr ""
-#: models.py:440 models.py:2112 models.py:2128 models.py:2720
+#: models.py:465 models.py:1896 models.py:2230 models.py:2246 models.py:2967
#: models_imports.py:358
msgid "Label"
msgstr ""
-#: models.py:442
+#: models.py:467
msgid "Textual ID"
msgstr ""
-#: models.py:445
+#: models.py:470
msgid ""
"The slug is the standardized version of the name. It contains only lowercase "
"letters, numbers and hyphens. Each slug must be unique."
msgstr ""
-#: models.py:449 models.py:1713 models.py:2024 models.py:2723
+#: models.py:474 models.py:1786 models.py:2142 models.py:2970
#: models_imports.py:138 models_imports.py:528
msgid "Available"
msgstr ""
-#: models.py:828 models.py:980 models_imports.py:549
+#: models.py:853 models.py:1037 models_imports.py:549
#: templates/ishtar/formset_import_match.html:21
#: templates/ishtar/import_step_by_step.html:171
#: templates/ishtar/import_step_by_step.html:199
@@ -761,356 +886,413 @@ msgstr ""
msgid "Key"
msgstr ""
-#: models.py:834
+#: models.py:859
msgid "Specific key to an import"
msgstr ""
-#: models.py:965 models.py:986 models.py:1383 models.py:2747 models.py:3070
-#: models.py:3152
+#: models.py:998
+msgid "Generated relation image (SVG)"
+msgstr ""
+
+#: models.py:1012 models.py:1045 models.py:1451 models.py:1898 models.py:2994
+#: models.py:3473 models.py:3555
msgid "Order"
msgstr ""
-#: models.py:968
+#: models.py:1015
msgid "Json data - Menu"
msgstr ""
-#: models.py:969
+#: models.py:1016
msgid "Json data - Menus"
msgstr ""
-#: models.py:981
+#: models.py:1024
+msgid "Text"
+msgstr ""
+
+#: models.py:1025
+msgid "Long text"
+msgstr ""
+
+#: models.py:1026 models_imports.py:658
+msgid "Integer"
+msgstr ""
+
+#: models.py:1027 models_imports.py:659
+msgid "Float"
+msgstr ""
+
+#: models.py:1028 models_imports.py:661
+msgid "Date"
+msgstr ""
+
+#: models.py:1029
+msgid "Choices"
+msgstr ""
+
+#: models.py:1038
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
"explain it. For instance for the key 'my_subkey' with data such as {'my_key':"
" {'my_subkey': 'value'}}, its value will be reached with my_key__my_subkey."
msgstr ""
-#: models.py:985
+#: models.py:1042
msgid "Display"
msgstr ""
-#: models.py:990
+#: models.py:1051
msgid "Json data - Field"
msgstr ""
-#: models.py:991
+#: models.py:1052
msgid "Json data - Fields"
msgstr ""
-#: models.py:1002
+#: models.py:1063
msgid "Content types of the field and of the menu do not match"
msgstr ""
-#: models.py:1062
+#: models.py:1123
msgid "Search vector"
msgstr ""
-#: models.py:1063
+#: models.py:1124
msgid "Auto filled at save"
msgstr ""
-#: models.py:1200
+#: models.py:1261
msgid "Last editor"
msgstr ""
-#: models.py:1203
+#: models.py:1264
msgid "Creator"
msgstr ""
-#: models.py:1384
+#: models.py:1444
+msgid "Above"
+msgstr ""
+
+#: models.py:1445
+msgid "Bellow"
+msgstr ""
+
+#: models.py:1446
+msgid "Equal"
+msgstr ""
+
+#: models.py:1452
msgid "Symmetrical"
msgstr ""
-#: models.py:1385
+#: models.py:1453
msgid "Tiny label"
msgstr ""
-#: models.py:1388
+#: models.py:1456
msgid "Inverse relation"
msgstr ""
-#: models.py:1398
+#: models.py:1459
+msgid "Logical relation"
+msgstr ""
+
+#: models.py:1469
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:1516
+#: models.py:1587
msgid "Euro"
msgstr ""
-#: models.py:1517
+#: models.py:1588
msgid "US dollar"
msgstr ""
-#: models.py:1518 views.py:1562 views.py:1623
+#: models.py:1589 views.py:1591 views.py:1652
msgid "Operations"
msgstr ""
-#: models.py:1519 views.py:1564 views.py:1627
+#: models.py:1590 views.py:1593 views.py:1656
msgid "Context records"
msgstr ""
-#: models.py:1520
+#: models.py:1591
msgid "Site"
msgstr ""
-#: models.py:1520
+#: models.py:1591
msgid "Archaeological entity"
msgstr ""
-#: models.py:1524
+#: models.py:1595
msgid "Site search"
msgstr ""
-#: models.py:1525
+#: models.py:1596
msgid "New site"
msgstr ""
-#: models.py:1526
+#: models.py:1597
msgid "Site modification"
msgstr ""
-#: models.py:1529
+#: models.py:1600
msgid "Archaeological entity search"
msgstr ""
-#: models.py:1530
+#: models.py:1601
msgid "New archaeological entity"
msgstr ""
-#: models.py:1531
+#: models.py:1602
msgid "Archaeological entity modification"
msgstr ""
-#: models.py:1539 models.py:2018 models_imports.py:123
+#: models.py:1610 models.py:2136 models_imports.py:123
msgid "Slug"
msgstr ""
-#: models.py:1540
+#: models.py:1611
msgid "Current active"
msgstr ""
-#: models.py:1542
+#: models.py:1613
msgid "Activate experimental feature"
msgstr ""
-#: models.py:1544
+#: models.py:1615
msgid "Files module"
msgstr ""
-#: models.py:1546
+#: models.py:1617
msgid "Archaeological site module"
msgstr ""
-#: models.py:1548
+#: models.py:1619
msgid "Archaeological site type"
msgstr ""
-#: models.py:1552
+#: models.py:1623
msgid "Context records module"
msgstr ""
-#: models.py:1554
+#: models.py:1625
msgid "Finds module"
msgstr ""
-#: models.py:1555
+#: models.py:1626
msgid "Need context records module"
msgstr ""
-#: models.py:1557
+#: models.py:1628
msgid "Find index is based on"
msgstr ""
-#: models.py:1559
+#: models.py:1630
msgid ""
"To prevent irrelevant indexes, change this parameter only if there is no "
"find in the database"
msgstr ""
-#: models.py:1562
+#: models.py:1633
msgid "Warehouses module"
msgstr ""
-#: models.py:1563
+#: models.py:1634
msgid "Need finds module"
msgstr ""
-#: models.py:1564
+#: models.py:1635
msgid "Preservation module"
msgstr ""
-#: models.py:1566
+#: models.py:1637
msgid "Mapping module"
msgstr ""
-#: models.py:1567
+#: models.py:1638
msgid "Underwater module"
msgstr ""
-#: models.py:1569
+#: models.py:1640
msgid "Parcel are mandatory for context records"
msgstr ""
-#: models.py:1571
+#: models.py:1642
msgid "Home page"
msgstr ""
-#: models.py:1572
+#: models.py:1643
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax. {random_image} can be used to display a random image."
msgstr ""
-#: models.py:1576
+#: models.py:1647
msgid "File external id"
msgstr ""
-#: models.py:1578
+#: models.py:1649
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1583
+#: models.py:1654
msgid "Parcel external id"
msgstr ""
-#: models.py:1586
+#: models.py:1657
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1591
+#: models.py:1662
msgid "Context record external id"
msgstr ""
-#: models.py:1593
+#: models.py:1664
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1598
+#: models.py:1669
msgid "Base find external id"
msgstr ""
-#: models.py:1600
+#: models.py:1671
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1605
+#: models.py:1676
msgid "Find external id"
msgstr ""
-#: models.py:1607
+#: models.py:1678
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1612
+#: models.py:1683
msgid "Container external id"
msgstr ""
-#: models.py:1614
+#: models.py:1685
msgid ""
"Formula to manage container external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1619
+#: models.py:1690
msgid "Warehouse external id"
msgstr ""
-#: models.py:1621
+#: models.py:1692
msgid ""
"Formula to manage warehouse external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-#: models.py:1626
+#: models.py:1697
msgid "Raw name for person"
msgstr ""
-#: models.py:1628
+#: models.py:1699
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-#: models.py:1632
+#: models.py:1703
msgid "Currency"
msgstr ""
-#: models.py:1636
+#: models.py:1707
msgid "Ishtar site profile"
msgstr ""
-#: models.py:1637
+#: models.py:1708
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:1715
+#: models.py:1788
msgid "Enable this form"
msgstr ""
-#: models.py:1716
+#: models.py:1789
msgid ""
"Disable with caution: disabling a form with mandatory fields may lead to "
"database errors."
msgstr ""
-#: models.py:1719
+#: models.py:1792
msgid "Apply to all"
msgstr ""
-#: models.py:1720
+#: models.py:1793
msgid ""
"Apply this form to all users. If set to True, selecting user and user type "
"is useless."
msgstr ""
-#: models.py:1726
+#: models.py:1799
msgid "Custom form"
msgstr ""
-#: models.py:1727
+#: models.py:1800
msgid "Custom forms"
msgstr ""
-#: models.py:1743
+#: models.py:1816
msgid "User types"
msgstr ""
-#: models.py:1784
+#: models.py:1888
msgid "Excluded field"
msgstr ""
-#: models.py:1785
+#: models.py:1889
msgid "Excluded fields"
msgstr ""
-#: models.py:1789
+#: models.py:1899 templates/blocks/form_flex_snippet.html:18
+#: templates/blocks/table_form_snippet.html:9
+msgid "Help"
+msgstr ""
+
+#: models.py:1902
+msgid "Custom form - Json data field"
+msgstr ""
+
+#: models.py:1903
+msgid "Custom form - Json data fields"
+msgstr ""
+
+#: models.py:1907
msgid "Variable name"
msgstr ""
-#: models.py:1790
+#: models.py:1908
msgid "Description of the variable"
msgstr ""
-#: models.py:1792 models_imports.py:550
+#: models.py:1910 models_imports.py:550
#: templates/ishtar/formset_import_match.html:22
#: templates/ishtar/import_step_by_step.html:172
#: templates/ishtar/import_step_by_step.html:200
@@ -1118,352 +1300,372 @@ msgstr ""
msgid "Value"
msgstr ""
-#: models.py:1795
+#: models.py:1913
msgid "Global variable"
msgstr ""
-#: models.py:1922 models.py:1952
+#: models.py:2040 models.py:2070
msgid "Total"
msgstr ""
-#: models.py:1929 models.py:2113 models.py:2129
+#: models.py:2047 models.py:2231 models.py:2247
#: templates/ishtar/dashboards/dashboard_main_detail.html:211
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
-#: templates/ishtar/sheet_person.html:27
+#: templates/ishtar/sheet_person.html:30
msgid "Number"
msgstr ""
-#: models.py:2016
+#: models.py:2134
msgid "Administrative Act"
msgstr ""
-#: models.py:2023
+#: models.py:2141
msgid "Associated object"
msgstr ""
-#: models.py:2028
+#: models.py:2146
msgid "Document template"
msgstr ""
-#: models.py:2029
+#: models.py:2147
msgid "Document templates"
msgstr ""
-#: models.py:2117 models.py:2130 models.py:3190 models_imports.py:835
+#: models.py:2235 models.py:2248 models.py:3593 models_imports.py:835
msgid "State"
msgstr ""
-#: models.py:2135 models.py:2957 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:2253 models.py:3345 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:2136
+#: models.py:2254
msgid "Departments"
msgstr ""
-#: models.py:2176
+#: models.py:2294
msgid "Raw phone"
msgstr ""
-#: models.py:2182
+#: models.py:2300
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:2221
+#: models.py:2339
msgid "Tel: "
msgstr ""
-#: models.py:2225
+#: models.py:2343
msgid "Mobile: "
msgstr ""
-#: models.py:2229
+#: models.py:2347
msgid "Email: "
msgstr "E-Mail-Adresse:"
-#: models.py:2234
+#: models.py:2352
msgid "Merge key"
msgstr ""
-#: models.py:2306
+#: models.py:2424
msgid "Organization types"
msgstr ""
-#: models.py:2336
+#: models.py:2454
msgid "Organizations"
msgstr ""
-#: models.py:2377
-msgid "Groups"
-msgstr ""
-
-#: models.py:2382
+#: models.py:2496
msgid "Person types"
msgstr ""
-#: models.py:2395 models_imports.py:652
+#: models.py:2509 models_imports.py:652
msgid "Title type"
msgstr ""
-#: models.py:2396
+#: models.py:2510
msgid "Title types"
msgstr ""
-#: models.py:2407
+#: models.py:2521
msgid "Mr"
msgstr ""
-#: models.py:2408
+#: models.py:2522
msgid "Miss"
msgstr ""
-#: models.py:2409
+#: models.py:2523
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2410
+#: models.py:2524
msgid "Mrs"
msgstr ""
-#: models.py:2411
+#: models.py:2525
msgid "Doctor"
msgstr ""
-#: models.py:2447
+#: models.py:2563
msgid "Contact type"
msgstr ""
-#: models.py:2450 models.py:2514
+#: models.py:2566 models.py:2645
msgid "Types"
msgstr ""
-#: models.py:2453
+#: models.py:2569
msgid "Is attached to"
msgstr ""
-#: models.py:2458
+#: models.py:2574
msgid "Persons"
msgstr ""
-#: models.py:2659
+#: models.py:2781
+msgid "Groups"
+msgstr ""
+
+#: models.py:2786
+msgid "Profile types"
+msgstr ""
+
+#: models.py:2805
+msgid "User profile"
+msgstr ""
+
+#: models.py:2806
+msgid "User profiles"
+msgstr ""
+
+#: models.py:2841
+msgid " - duplicate"
+msgstr ""
+
+#: models.py:2892
msgid "Advanced shortcut menu"
msgstr ""
-#: models.py:2662
+#: models.py:2895
msgid "Ishtar user"
msgstr ""
-#: models.py:2663
+#: models.py:2896
msgid "Ishtar users"
msgstr ""
-#: models.py:2751
+#: models.py:2998
msgid "Author types"
msgstr ""
-#: models.py:2795
+#: models.py:3044
msgid "Source types"
msgstr ""
-#: models.py:2805 models_imports.py:651
+#: models.py:3054 models_imports.py:651
msgid "Support type"
msgstr ""
-#: models.py:2806
+#: models.py:3055
msgid "Support types"
msgstr ""
-#: models.py:2815
+#: models.py:3064
msgid "Format type"
msgstr ""
-#: models.py:2816
+#: models.py:3065
msgid "Format types"
msgstr ""
-#: models.py:2826
+#: models.py:3075
msgid "External ID"
msgstr ""
-#: models.py:2829
+#: models.py:3078
msgid "Support"
msgstr ""
-#: models.py:2831 models_imports.py:621
+#: models.py:3080 models_imports.py:621
msgid "Format"
msgstr ""
-#: models.py:2833
+#: models.py:3082
msgid "Scale"
msgstr ""
-#: models.py:2847
+#: models.py:3096
msgid "Item number"
msgstr ""
-#: models.py:2848 models.py:2914
-msgid "Ref."
-msgstr ""
-
-#: models.py:2851 models.py:2917
-msgid "Internal ref."
+#: models.py:3136
+msgid "URL"
msgstr ""
-#: models.py:2888
+#: models.py:3138
msgid "License type"
msgstr ""
-#: models.py:2889
+#: models.py:3139
msgid "License types"
msgstr ""
-#: models.py:2895
+#: models.py:3145
msgid "Image type"
msgstr ""
-#: models.py:2896
+#: models.py:3146
msgid "Image types"
msgstr ""
-#: models.py:2903
-msgid "License"
+#: models.py:3161
+msgid "Symbolic links"
msgstr ""
-#: models.py:2907
-msgid "Authors (raw)"
+#: models.py:3163
+msgid "License"
msgstr ""
-#: models.py:2921
-msgid "Images"
+#: models.py:3167
+msgid "Authors (raw)"
msgstr ""
-#: models.py:2950
+#: models.py:3338
msgid "Surface (m2)"
msgstr ""
-#: models.py:2951
+#: models.py:3339
msgid "Localisation"
msgstr "Lokalisierung"
-#: models.py:2959
+#: models.py:3347
msgid "Year of creation"
msgstr ""
-#: models.py:2960
+#: models.py:3348
msgid ""
"Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
-#: models.py:2965
+#: models.py:3353
msgid "Cached name"
msgstr ""
-#: models.py:3071
+#: models.py:3462
+msgid "Only four level of parent are managed."
+msgstr ""
+
+#: models.py:3467
+msgid "Area"
+msgstr ""
+
+#: models.py:3474
msgid "Is preventive"
msgstr ""
-#: models.py:3072
+#: models.py:3475
msgid "Is judiciary"
msgstr ""
-#: models.py:3075 models_imports.py:622
+#: models.py:3478 models_imports.py:622
msgid "Operation type"
msgstr ""
-#: models.py:3076
+#: models.py:3479
msgid "Operation types"
msgstr ""
-#: models.py:3115
+#: models.py:3518
msgid "Judiciary"
msgstr ""
-#: models.py:3117
+#: models.py:3520
msgid "Preventive"
msgstr ""
-#: models.py:3119
+#: models.py:3522
msgid "Research"
msgstr ""
-#: models.py:3154
+#: models.py:3557
msgid "Authority name"
msgstr ""
-#: models.py:3155
+#: models.py:3558
msgid "Authority SRID"
msgstr ""
-#: models.py:3158 models_imports.py:650
+#: models.py:3561 models_imports.py:650
msgid "Spatial reference system"
msgstr ""
-#: models.py:3159
+#: models.py:3562
msgid "Spatial reference systems"
msgstr ""
-#: models.py:3166
+#: models.py:3569
msgid "Filename"
msgstr ""
-#: models.py:3171
+#: models.py:3574
msgid "Administration script"
msgstr ""
-#: models.py:3172
+#: models.py:3575
msgid "Administration scripts"
msgstr ""
-#: models.py:3179
+#: models.py:3582
msgid "Scheduled"
msgstr ""
-#: models.py:3180
+#: models.py:3583
msgid "In progress"
msgstr ""
-#: models.py:3181 models_imports.py:774
+#: models.py:3584 models_imports.py:774
msgid "Finished with errors"
msgstr ""
-#: models.py:3182 models_imports.py:775
+#: models.py:3585 models_imports.py:775
msgid "Finished"
msgstr ""
-#: models.py:3195
+#: models.py:3598
msgid "Result"
msgstr ""
-#: models.py:3198
+#: models.py:3601
msgid "Administration task"
msgstr ""
-#: models.py:3199
+#: models.py:3602
msgid "Administration tasks"
msgstr ""
-#: models.py:3203
+#: models.py:3606
msgid "Unknown"
msgstr ""
-#: models.py:3218
+#: models.py:3621
msgid ""
"ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
"administrator."
msgstr ""
-#: models.py:3227
+#: models.py:3630
msgid ""
"Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
"relative paths, it can be a security issue and this is not allowed. Only put "
"a full path."
msgstr ""
-#: models.py:3238
+#: models.py:3641
msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
msgstr ""
-#: models.py:3254
+#: models.py:3657
msgid ""
"Script \"{}\" is not available in your script directory. Check your "
"configuration."
@@ -1596,11 +1798,11 @@ msgstr ""
msgid "Importer - Targets"
msgstr ""
-#: models_imports.py:511 views.py:607
+#: models_imports.py:511 views.py:611
msgid "True"
msgstr ""
-#: models_imports.py:512 views.py:609
+#: models_imports.py:512 views.py:613
msgid "False"
msgstr ""
@@ -1708,22 +1910,10 @@ msgstr ""
msgid "Context record relation type"
msgstr ""
-#: models_imports.py:658
-msgid "Integer"
-msgstr ""
-
-#: models_imports.py:659
-msgid "Float"
-msgstr ""
-
#: models_imports.py:660
msgid "String"
msgstr ""
-#: models_imports.py:661
-msgid "Date"
-msgstr ""
-
#: models_imports.py:663
#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
@@ -1927,7 +2117,8 @@ msgstr ""
msgid "Unarchive"
msgstr ""
-#: models_imports.py:974 templates/ishtar/form_delete.html:11 widgets.py:258
+#: models_imports.py:974 templates/ishtar/form_delete.html:11 widgets.py:349
+#: widgets.py:381
msgid "Delete"
msgstr ""
@@ -1995,12 +2186,12 @@ msgid "View on site"
msgstr ""
#: templates/admin/change_form.html:24 templates/admin/change_form.html:27
-#: views.py:2000 views.py:2005
+#: views.py:2065 views.py:2070
msgid "Previous"
msgstr ""
#: templates/admin/change_form.html:32 templates/admin/change_form.html:35
-#: views.py:2008 views.py:2011
+#: views.py:2073 views.py:2076
msgid "Next"
msgstr ""
@@ -2044,7 +2235,7 @@ msgstr ""
#: templates/base.html:69 templates/blocks/bs_form_snippet.html:49
#: templates/ishtar/manage_basket.html:4 templates/welcome.html:11
#: templates/welcome.html:12 templates/welcome.html:13
-#: templates/welcome.html:14
+#: templates/welcome.html:14 wizards.py:468
msgid ":"
msgstr ""
@@ -2187,11 +2378,6 @@ msgstr ""
msgid "Show / hide advanced search"
msgstr ""
-#: templates/blocks/form_flex_snippet.html:18
-#: templates/blocks/table_form_snippet.html:9
-msgid "Help"
-msgstr ""
-
#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
#: templates/ishtar/blocks/shortcut_menu.html:6
#: templates/ishtar/blocks/shortcut_menu.html:11
@@ -2267,6 +2453,14 @@ msgstr ""
msgid "Internal ID"
msgstr ""
+#: templates/ishtar/blocks/sheet_json.html:3
+msgid "Data"
+msgstr ""
+
+#: templates/ishtar/blocks/window_image.html:14
+msgid "Licenses"
+msgstr ""
+
#: templates/ishtar/blocks/window_nav.html:17
msgid ""
"Are you sure to restore to this version? All changes made since this version "
@@ -2419,7 +2613,7 @@ msgstr ""
msgid "Are you sure?"
msgstr ""
-#: templates/ishtar/import_delete.html:20 wizards.py:394
+#: templates/ishtar/import_delete.html:20 wizards.py:438
msgid "Yes"
msgstr ""
@@ -2455,7 +2649,7 @@ msgstr ""
msgid "Go"
msgstr ""
-#: templates/ishtar/import_step_by_step.html:63 views.py:1850
+#: templates/ishtar/import_step_by_step.html:63 views.py:1915
msgid "Import step by step"
msgstr ""
@@ -2690,57 +2884,57 @@ msgstr ""
msgid "Planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:26
+#: templates/ishtar/sheet_person.html:29
#: templates/ishtar/wizard/wizard_person.html:38
msgid "Phone type"
msgstr ""
-#: templates/ishtar/sheet_person.html:49
+#: templates/ishtar/sheet_person.html:52
#: templates/ishtar/wizard/wizard_person.html:64
msgid "Business address"
msgstr ""
-#: templates/ishtar/sheet_person.html:58
+#: templates/ishtar/sheet_person.html:61
#: templates/ishtar/wizard/wizard_person.html:77
msgid "Other address"
msgstr ""
-#: templates/ishtar/sheet_person.html:67
+#: templates/ishtar/sheet_person.html:70
msgid "Associated organization"
msgstr ""
-#: templates/ishtar/sheet_person.html:79
+#: templates/ishtar/sheet_person.html:82
msgid "Associated operations as scientist"
msgstr ""
-#: templates/ishtar/sheet_person.html:83
+#: templates/ishtar/sheet_person.html:86
msgid "Associated operations as responsible"
msgstr ""
-#: templates/ishtar/sheet_person.html:88
+#: templates/ishtar/sheet_person.html:91
#: templates/ishtar/wizard/wizard_person_deletion.html:6
msgid "In charge of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:93
+#: templates/ishtar/sheet_person.html:96
#: templates/ishtar/wizard/wizard_person_deletion.html:15
msgid "General contractor of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:98
+#: templates/ishtar/sheet_person.html:101
#: templates/ishtar/wizard/wizard_person_deletion.html:24
msgid "Responsible for planning service of archaeological files"
msgstr ""
-#: templates/ishtar/sheet_person.html:104
+#: templates/ishtar/sheet_person.html:107
msgid "Documents associated to operations"
msgstr ""
-#: templates/ishtar/sheet_person.html:109
+#: templates/ishtar/sheet_person.html:112
msgid "Documents associated to context records"
msgstr ""
-#: templates/ishtar/sheet_person.html:114
+#: templates/ishtar/sheet_person.html:117
msgid "Documents associated to finds"
msgstr ""
@@ -2888,15 +3082,15 @@ msgstr ""
msgid "Toggle navigation"
msgstr ""
-#: templates/navbar.html:28
-msgid "Log out"
+#: templates/navbar.html:34
+msgid "Change password"
msgstr ""
-#: templates/navbar.html:31
-msgid "Change password"
+#: templates/navbar.html:37
+msgid "Log out"
msgstr ""
-#: templates/navbar.html:37 templates/registration/activate.html:10
+#: templates/navbar.html:43 templates/registration/activate.html:10
#: templates/registration/login.html:7 templates/registration/login.html:34
#: templates/registration/password_reset_complete.html:8
msgid "Log in"
@@ -3036,176 +3230,188 @@ msgstr ""
msgid "where the magic happens."
msgstr ""
-#: templates/widgets/image_input.html:14
+#: templates/widgets/image_input.html:19
msgid "delete"
msgstr ""
-#: templatetags/window_tables.py:99 widgets.py:780
+#: templatetags/window_tables.py:99 widgets.py:950
msgid "No results"
msgstr ""
-#: templatetags/window_tables.py:100 widgets.py:781
+#: templatetags/window_tables.py:100 widgets.py:951
msgid "Loading..."
msgstr ""
-#: utils.py:147
+#: utils.py:179
msgid " (...)"
msgstr ""
-#: utils.py:209
+#: utils.py:243
msgid "Information"
msgstr ""
-#: utils.py:210
+#: utils.py:244
msgid "Load another random image?"
msgstr ""
-#: views.py:102
+#: views.py:103
msgid ""
"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
"your admin to do it)."
msgstr ""
-#: views.py:107
+#: views.py:108
msgid ""
"The slug of your current profile is set to \"default\". Change it on the "
"administration page (or ask your admin to do it)."
msgstr ""
-#: views.py:133
+#: views.py:134
msgid "New person"
msgstr ""
-#: views.py:141
+#: views.py:142
msgid "Person modification"
msgstr ""
-#: views.py:156
+#: views.py:157
msgid "Person deletion"
msgstr ""
-#: views.py:167
+#: views.py:168
msgid "New organization"
msgstr ""
-#: views.py:174
+#: views.py:175
msgid "Organization modification"
msgstr ""
-#: views.py:190
+#: views.py:191
msgid "Organization deletion"
msgstr ""
-#: views.py:200
+#: views.py:202
msgid "Account management"
msgstr ""
-#: views.py:206
+#: views.py:208
msgid "Account deletion"
msgstr ""
-#: views.py:270
+#: views.py:272
msgid "Archaeological file"
msgstr ""
-#: views.py:271
+#: views.py:273
msgid "Operation"
msgstr ""
-#: views.py:273
+#: views.py:275
msgid "Context record"
msgstr ""
-#: views.py:275
+#: views.py:277
msgid "Find"
msgstr ""
-#: views.py:277
+#: views.py:279
msgid "Treatment request"
msgstr ""
-#: views.py:278
+#: views.py:280
msgid "Treatment"
msgstr ""
-#: views.py:1504 views.py:1544
+#: views.py:1528 views.py:1573
msgid "Operation not permitted."
msgstr ""
-#: views.py:1506
+#: views.py:1530
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:1561 views.py:1619
+#: views.py:1590 views.py:1648
msgid "Archaeological files"
msgstr ""
-#: views.py:1566 views.py:1630
+#: views.py:1595 views.py:1659
msgid "Finds"
msgstr ""
-#: views.py:1568 views.py:1635
+#: views.py:1597 views.py:1664
msgid "Treatment requests"
msgstr ""
-#: views.py:1569 views.py:1641
+#: views.py:1598 views.py:1670
msgid "Treatments"
msgstr ""
-#: views.py:2190
+#: views.py:2255
msgid "Col. "
msgstr ""
-#: views.py:2196 views.py:2208
+#: views.py:2261 views.py:2273
msgid "* empty *"
msgstr ""
-#: views.py:2249
+#: views.py:2314
msgid "Link unmatched items"
msgstr ""
-#: views.py:2270
+#: views.py:2335
msgid "Delete import"
msgstr ""
-#: views.py:2309
+#: views.py:2374
msgid "Merge persons"
msgstr ""
-#: views.py:2333
+#: views.py:2398
msgid "Select the main person"
msgstr ""
-#: views.py:2342
+#: views.py:2407
msgid "Merge organization"
msgstr ""
-#: views.py:2352
+#: views.py:2417
msgid "Select the main organization"
msgstr ""
-#: views.py:2392 views.py:2408
+#: views.py:2457 views.py:2473
msgid "Corporation manager"
msgstr ""
-#: widgets.py:355 widgets.py:489 widgets.py:604
+#: widgets.py:174
+msgid "The character \" is not accepted."
+msgstr ""
+
+#: widgets.py:525 widgets.py:659 widgets.py:774
msgid "Search..."
msgstr ""
-#: widgets.py:424
+#: widgets.py:594
msgid "Previous value:"
msgstr ""
-#: widgets.py:782
+#: widgets.py:952
msgid "Remove"
msgstr ""
-#: wizards.py:396
+#: wizards.py:76
+msgid "You don't have sufficient permissions to do this action."
+msgstr ""
+
+#: wizards.py:440
msgid "No"
msgstr ""
-#: wizards.py:1459
+#: wizards.py:476
+msgid "Deleted"
+msgstr ""
+
+#: wizards.py:1746
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr ""
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index 979288421..2484039de 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.po
@@ -10,11 +10,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2018-05-31 06:28+0000\n"
-=======
"PO-Revision-Date: 2018-06-04 03:46+0000\n"
->>>>>>> Update translations
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -25,261 +21,265 @@ msgstr ""
msgid "Point"
msgstr "Point"
-#: admin.py:51 models.py:324
+#: admin.py:51 models.py:325
msgid "Polygon"
msgstr "Polygone"
-#: forms.py:50 forms.py:56 models.py:266 models.py:666 wizards.py:77
+#: forms.py:49 forms.py:55 models.py:267 models.py:675 wizards.py:77
msgid "Operation"
msgstr "Opération"
-#: forms.py:51
+#: forms.py:50
msgid "Context record - 010 - Operation choice"
msgstr "Unité d'enregistrement - 010 - Choix de l'opération"
-#: forms.py:64
+#: forms.py:63
msgid "Full text search"
-msgstr "Recherche texte"
+msgstr "Recherche en texte intégral"
-#: forms.py:66 forms.py:158 models.py:271 models.py:631
+#: forms.py:65 forms.py:157 models.py:272 models.py:640
msgid "ID"
msgstr "Identifiant"
-#: forms.py:72
+#: forms.py:71
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:73
+#: forms.py:72
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:75
+#: forms.py:74
msgid "Operation's number (index by year)"
msgstr "Numéro de l'opération (index par année)"
-#: forms.py:77 models.py:269
+#: forms.py:76 models.py:270
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:83
+#: forms.py:82
msgid "Search within related operations"
msgstr "Rechercher parmi les opérations liées"
-#: forms.py:85 forms.py:276 models.py:64
+#: forms.py:84 forms.py:280 models.py:65
msgid "Period"
msgstr "Période"
-#: forms.py:86
+#: forms.py:85
msgid "Unit type"
msgstr "Type d'unité"
-#: forms.py:87
+#: forms.py:86
msgid "Parcel (section/number/public domain)"
msgstr "Parcelle (section/numéro/domaine public)"
-#: forms.py:89
+#: forms.py:88
msgid "Search within relations"
msgstr "Rechercher parmi les relations"
-#: forms.py:119 forms.py:371 views.py:96
+#: forms.py:118 forms.py:375 views.py:105
msgid "Context record search"
msgstr "Rechercher une Unité d'Enregistrement"
-#: forms.py:134
+#: forms.py:133
msgid "You should at least select one context record."
msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
-#: forms.py:140
+#: forms.py:139
msgid "General"
msgstr "Général"
-#: forms.py:141
+#: forms.py:140
msgid "Context record - 020 - General"
msgstr "Unité d'enregistrement - 020 - Général"
-#: forms.py:152 models.py:229 models.py:264 models.py:633
+#: forms.py:151 models.py:230 models.py:265 models.py:642
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:155
+#: forms.py:154
msgid "Only the items associated to the operation can be selected."
msgstr "Seuls les éléments associés à l'opération peuvent être sélectionnés."
-#: forms.py:160 models.py:272 models.py:634
+#: forms.py:159 models.py:273 models.py:643
#: templates/ishtar/sheet_contextrecord.html:45
msgid "Description"
msgstr "Description"
-#: forms.py:162 models.py:273
+#: forms.py:161 models.py:274
msgid "General comment"
msgstr "Commentaire général"
-#: forms.py:165 models.py:319
+#: forms.py:164 models.py:320
msgid "Excavation technique"
msgstr "Méthode de fouille"
-#: forms.py:166 models.py:277
+#: forms.py:165 models.py:278
msgid "Length (m)"
msgstr "Taille (m)"
-#: forms.py:167 models.py:278
+#: forms.py:166 models.py:279
msgid "Width (m)"
msgstr "Largeur (m)"
-#: forms.py:168 models.py:279
+#: forms.py:167 models.py:280
msgid "Thickness (m)"
msgstr "Épaisseur (m)"
-#: forms.py:169 models.py:281
+#: forms.py:168 models.py:282
msgid "Diameter (m)"
msgstr "Diamètre (m)"
-#: forms.py:170 models.py:282
+#: forms.py:169 models.py:283
msgid "Depth (m)"
msgstr "Profondeur (m)"
-#: forms.py:172 models.py:284
+#: forms.py:171 models.py:285
msgid "Depth of appearance (m)"
msgstr "Profondeur d'apparition (m)"
-#: forms.py:173 forms.py:391 models.py:293 models.py:632
+#: forms.py:172 forms.py:395 models.py:294 models.py:641
msgid "Context record type"
msgstr "Type d'Unité d'Enregistrement"
-#: forms.py:175 models.py:274
+#: forms.py:174 models.py:275
msgid "Opening date"
msgstr "Date d'ouverture"
-#: forms.py:177 models.py:276 templates/ishtar/sheet_contextrecord.html:106
+#: forms.py:176 models.py:277 templates/ishtar/sheet_contextrecord.html:128
msgid "Closing date"
msgstr "Date de clôture"
-#: forms.py:180 ishtar_menu.py:48
+#: forms.py:179 ishtar_menu.py:48
msgid "Documentation"
msgstr "Documentation"
-#: forms.py:183 models.py:286
+#: forms.py:182 models.py:287
msgid "Location"
-msgstr "Lieu"
+msgstr "Localisation"
-#: forms.py:186
-msgid "Image"
-msgstr "Image"
-
-#: forms.py:265
+#: forms.py:261
msgid "This ID already exists for this operation."
msgstr "Cet identifiant existe déjà pour cette opération."
-#: forms.py:271 forms.py:292 models.py:75
+#: forms.py:269 models.py:326
+msgid "Images"
+msgstr "Images"
+
+#: forms.py:270
+msgid "Context record - 025 - Images"
+msgstr "Unité d'enregistrement - 025 - Images"
+
+#: forms.py:275 forms.py:296 models.py:76
msgid "Dating"
msgstr "Datation"
-#: forms.py:277 models.py:65
+#: forms.py:281 models.py:66
msgid "Start date"
msgstr "Date de début"
-#: forms.py:278 models.py:66
+#: forms.py:282 models.py:67
msgid "End date"
msgstr "Date de fin"
-#: forms.py:279 models.py:69
+#: forms.py:283 models.py:70
msgid "Quality"
msgstr "Qualité"
-#: forms.py:280 models.py:43 models.py:67
+#: forms.py:284 models.py:44 models.py:68
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:293
+#: forms.py:297
msgid "Context record - 030 - Dating"
msgstr "Unité d'enregistrement - 030 - Datation"
-#: forms.py:303 ishtar_menu.py:29 models.py:89 models.py:709
+#: forms.py:307 ishtar_menu.py:29 models.py:90 models.py:718
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:319
+#: forms.py:323
msgid "Relations"
msgstr "Relations"
-#: forms.py:320
+#: forms.py:324
msgid "Context record - 050 - Relations"
msgstr "Unité d'enregistrement - 050 - Relations"
-#: forms.py:325 forms.py:336 models.py:296
+#: forms.py:329 forms.py:340 models.py:297
#: templates/ishtar/sheet_contextrecord.html:59
msgid "Interpretation"
msgstr "Interprétation"
-#: forms.py:332
+#: forms.py:336
msgid "Comments on dating"
-msgstr "Commentaires sur la datation"
+msgstr "Commentaire relatif à la datation"
-#: forms.py:334 models.py:295
+#: forms.py:338 models.py:296
msgid "Filling"
msgstr "Remplissage"
-#: forms.py:338 models.py:316
+#: forms.py:342 models.py:317
msgid "Activity"
msgstr "Activité"
-#: forms.py:340 models.py:314
+#: forms.py:344 models.py:315
msgid "Identification"
msgstr "Identification"
-#: forms.py:342 models.py:299
+#: forms.py:346 models.py:300
msgid "TAQ"
msgstr "TAQ"
-#: forms.py:343 models.py:303
+#: forms.py:347 models.py:304
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: forms.py:345 models.py:306
+#: forms.py:349 models.py:307
msgid "TPQ"
msgstr "TPQ"
-#: forms.py:346 models.py:310
+#: forms.py:350 models.py:311
msgid "Estimated TPQ"
msgstr "TPQ estimé"
-#: forms.py:356
+#: forms.py:360
msgid "Operation search"
msgstr "Rechercher une opération"
-#: forms.py:358
+#: forms.py:362
msgid "You should select an operation."
msgstr "Vous devez sélectionner une Opération."
-#: forms.py:363
+#: forms.py:367
msgid "Would you like to delete this context record?"
msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?"
-#: forms.py:373
+#: forms.py:377
msgid "You should select a context record."
msgstr "Vous devez sélectionner une Unité d'Enregistrement."
-#: forms.py:378
+#: forms.py:382
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:380
+#: forms.py:384
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:387
+#: forms.py:391
msgid "Town of the operation"
msgstr "Commune de l'opération"
-#: forms.py:389
+#: forms.py:393
msgid "Period of the context record"
msgstr "Période de l'Unité d'Enregistrement"
-#: forms.py:404
+#: forms.py:408
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:406
+#: forms.py:410
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
@@ -299,127 +299,127 @@ msgstr "Modification"
msgid "Deletion"
msgstr "Suppression"
-#: models.py:44
+#: models.py:45
msgid "Dating types"
msgstr "Types de datation"
-#: models.py:54
+#: models.py:55
msgid "Dating quality type"
msgstr "Type de qualité de datation"
-#: models.py:55
+#: models.py:56
msgid "Dating quality types"
msgstr "Types de qualité de datation"
-#: models.py:71
+#: models.py:72
msgid "Precise dating"
msgstr "Datation précise"
-#: models.py:76
+#: models.py:77
msgid "Datings"
msgstr "Datations"
-#: models.py:96
+#: models.py:97
msgid "Find"
msgstr "Mobilier"
-#: models.py:115 models.py:134 models.py:150
+#: models.py:116 models.py:135 models.py:151
msgid "Order"
msgstr "Ordre"
-#: models.py:117
+#: models.py:118
msgid "Parent context record type"
msgstr "Type d'UE parent"
-#: models.py:121
+#: models.py:122
msgid "Context record Type"
msgstr "Type d'Unité d'Enregistrement"
-#: models.py:122
+#: models.py:123
msgid "Context record Types"
msgstr "Types d'Unité d'Enregistrement"
-#: models.py:137
+#: models.py:138
msgid "Activity Type"
msgstr "Type d'activité"
-#: models.py:138
+#: models.py:139
msgid "Activity Types"
msgstr "Types d'activité"
-#: models.py:153
+#: models.py:154
msgid "Identification Type"
msgstr "Type d'identification"
-#: models.py:154
+#: models.py:155
msgid "Identification Types"
msgstr "Types d'identification"
-#: models.py:167
+#: models.py:168
msgid "Excavation technique type"
msgstr "Type de méthode de fouille"
-#: models.py:168
+#: models.py:169
msgid "Excavation technique types"
msgstr "Types de méthode de fouille"
-#: models.py:178
+#: models.py:179
msgid "Documentation type"
msgstr "Type de documentation"
-#: models.py:179
+#: models.py:180
msgid "Documentation types"
msgstr "Types de documentation"
-#: models.py:220 models.py:635
+#: models.py:221 models.py:644
msgid "Periods"
msgstr "Périodes"
-#: models.py:221
+#: models.py:222
msgid "Datings (period)"
msgstr "Datations (période)"
-#: models.py:222
+#: models.py:223
msgid "Related context records"
msgstr "Unités d'Enregistrement liées"
-#: models.py:223
+#: models.py:224
msgid "Operation (Patriarche code)"
msgstr "Opération (code Patriarche)"
-#: models.py:224
+#: models.py:225
msgid "Operation (name)"
msgstr "Opération (nom)"
-#: models.py:225
+#: models.py:226
msgid "Parcel (external ID)"
-msgstr "Parcelle (identifiant externe)"
+msgstr "Parcelle (identifiant)"
-#: models.py:226 models.py:227
+#: models.py:227 models.py:228
msgid "Parcel (town)"
msgstr "Parcelle (commune)"
-#: models.py:228
+#: models.py:229
msgid "Parcel (year)"
msgstr "Parcelle (année)"
-#: models.py:260
+#: models.py:261
msgid "External ID"
-msgstr "ID externe"
+msgstr "Identifiant"
-#: models.py:262
+#: models.py:263
msgid "External ID is set automatically"
-msgstr "L'identifiant externe est configuré automatiquement"
+msgstr "L'identifiant est attribué automatiquement"
-#: models.py:287
+#: models.py:288
msgid "A short description of the location of the context record"
msgstr "Une courte description de la localisation de l'Unité d'Enregistrement"
-#: models.py:291
+#: models.py:292
msgid "Comment on datings"
-msgstr "Commentaire sur les datations"
+msgstr "Commentaire relatif aux datations"
-#: models.py:300
+#: models.py:301
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -427,11 +427,11 @@ msgstr ""
"« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée "
"après cette date."
-#: models.py:304
+#: models.py:305
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »."
-#: models.py:307
+#: models.py:308
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -439,96 +439,92 @@ msgstr ""
"« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée "
"avant cette date."
-#: models.py:311
+#: models.py:312
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »."
-#: models.py:322
+#: models.py:323
msgid "Point (2D)"
msgstr "Point (2D)"
-#: models.py:323
+#: models.py:324
msgid "Point (3D)"
msgstr "Point (3D)"
-#: models.py:325
-msgid "Images"
-msgstr "Images"
-
-#: models.py:327
+#: models.py:328
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:338 models.py:339 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:339 models.py:340 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:355
+#: models.py:356
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: models.py:562 models.py:585 models.py:630
+#: models.py:571 models.py:594 models.py:639
msgid "Relation type"
msgstr "Type de relation"
-#: models.py:563
+#: models.py:572
msgid "Relation types"
msgstr "Types de relation"
-#: models.py:580
+#: models.py:589
msgid "ID (left)"
-msgstr "ID (gauche)"
+msgstr "Identifiant (gauche)"
-#: models.py:581
+#: models.py:590
msgid "Context record type (left)"
msgstr "Type d'UE (gauche)"
-#: models.py:582
+#: models.py:591
msgid "Parcel (left)"
msgstr "Parcelle (gauche)"
-#: models.py:583
+#: models.py:592
msgid "Description (left)"
msgstr "Description (gauche)"
-#: models.py:584
+#: models.py:593
msgid "Periods (left)"
msgstr "Périodes (gauche)"
-#: models.py:586
+#: models.py:595
msgid "ID (right)"
-msgstr "ID (droit)"
+msgstr "Identifiant (droit)"
-#: models.py:587
+#: models.py:596
msgid "Context record type (right)"
msgstr "Type d'UE (droite)"
-#: models.py:588
+#: models.py:597
msgid "Parcel (right)"
msgstr "Parcelle (droite)"
-#: models.py:589
+#: models.py:598
msgid "Description (right)"
msgstr "Description (droite)"
-#: models.py:590
+#: models.py:599
msgid "Periods (right)"
msgstr "Périodes (droite)"
-#: models.py:599
+#: models.py:608
msgid "Record relation"
msgstr "Relation entre Unités d'Enregistrement"
-#: models.py:600
+#: models.py:609
msgid "Record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: models.py:694
+#: models.py:703
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: models.py:695
+#: models.py:704
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
@@ -540,51 +536,59 @@ msgstr "Datations"
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:86
+#: templates/ishtar/sheet_contextrecord.html:97
+msgid "Re-generate image"
+msgstr "Re-générer l'image"
+
+#: templates/ishtar/sheet_contextrecord.html:99
+msgid "Generate image"
+msgstr "Générer l'image"
+
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "Operation summary"
msgstr "Résumé de l'opération"
-#: templates/ishtar/sheet_contextrecord.html:89
+#: templates/ishtar/sheet_contextrecord.html:111
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
-#: templates/ishtar/sheet_contextrecord.html:94
+#: templates/ishtar/sheet_contextrecord.html:116
msgid "Numerical reference"
msgstr "Référence numérique"
-#: templates/ishtar/sheet_contextrecord.html:100
+#: templates/ishtar/sheet_contextrecord.html:122
msgid "State"
msgstr "État"
-#: templates/ishtar/sheet_contextrecord.html:101
+#: templates/ishtar/sheet_contextrecord.html:123
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_contextrecord.html:101
+#: templates/ishtar/sheet_contextrecord.html:123
msgid "Closed operation"
msgstr "Opération close"
-#: templates/ishtar/sheet_contextrecord.html:108
+#: templates/ishtar/sheet_contextrecord.html:130
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_contextrecord.html:118
+#: templates/ishtar/sheet_contextrecord.html:140
msgid "Localisation"
msgstr "Lieu"
-#: templates/ishtar/sheet_contextrecord.html:127
+#: templates/ishtar/sheet_contextrecord.html:149
msgid "No operation linked to this context record!"
msgstr "Pas d'opération liée à cette unité d'enregistrement !"
-#: templates/ishtar/sheet_contextrecord.html:139
+#: templates/ishtar/sheet_contextrecord.html:161
msgid "Document from this context record"
msgstr "Document associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:144
+#: templates/ishtar/sheet_contextrecord.html:166
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_contextrecord.html:149
+#: templates/ishtar/sheet_contextrecord.html:171
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
@@ -596,30 +600,35 @@ msgstr "Documentation associée à l'UE"
msgid "Related context record"
msgstr "Unité d'Enregistrement associée"
-#: views.py:109
+#: views.py:120
msgid "New context record"
msgstr "Ajouter une Unité d'Enregistrement"
-#: views.py:120
+#: views.py:137
msgid "Context record modification"
msgstr "Modifier une Unité d'Enregistrement"
-#: views.py:134
+#: views.py:148
+msgid "You don't have sufficient permissions to do this action."
+msgstr ""
+"Vous n'avez pas les permissions suffisantes pour effectuer cette action."
+
+#: views.py:161
msgid "Context record deletion"
msgstr "Supprimer une Unité d'Enregistrement"
-#: views.py:139
+#: views.py:166
msgid "Context record: source search"
msgstr "Unité d'Enregistrement : rechercher une documentation associée"
-#: views.py:147
+#: views.py:174
msgid "Context record: new source"
msgstr "Unité d'Enregistrement : ajouter une documentation associée"
-#: views.py:155
+#: views.py:182
msgid "Context record: source modification"
msgstr "Unité d'Enregistrement : modifier une documentation associée"
-#: views.py:170
+#: views.py:197
msgid "Context record: source deletion"
msgstr "Unité d'Enregistrement : supprimer une documentation associée"
diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po
index d6e078bc9..40087b4eb 100644
--- a/translations/fr/archaeological_files.po
+++ b/translations/fr/archaeological_files.po
@@ -6,14 +6,13 @@
# Étienne Loks <etienne.loks@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-05-31 06:29+0000\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
+"PO-Revision-Date: 2018-02-26 07:30+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -236,7 +235,7 @@ msgstr "Type d'acte"
#: forms.py:418
msgid "Object (full text search)"
-msgstr "Objet (recherche texte intégral)"
+msgstr "Objet (recherche en texte intégral)"
#: forms.py:447
msgid "Indexed?"
@@ -346,11 +345,11 @@ msgstr "Référence interne"
#: models.py:130
msgid "External ID"
-msgstr "ID externe"
+msgstr "Identifiant"
#: models.py:133
msgid "External ID is set automatically"
-msgstr "L'identifiant externe est configuré automatiquement"
+msgstr "L'identifiant est attribué automatiquement"
#: models.py:145
msgid "General contractor (raw)"
@@ -398,7 +397,7 @@ msgstr "Organisation"
#: models.py:209
msgid "Research archaeology comment"
-msgstr "Commentaire archéologie programmée"
+msgstr "Commentaire relatif à l'archéologie programmée"
#: models.py:223
msgid "Cached name"
diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po
index ee747caee..c49546246 100644
--- a/translations/fr/archaeological_files_pdl.po
+++ b/translations/fr/archaeological_files_pdl.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the Ishtar package.
# Étienne Loks <etienne.loks at peacefrogs net>, 2014.
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata
+# Valérie-Emma Leroux <emma@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-05-31 06:30+0000\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
+"PO-Revision-Date: 2018-02-08 05:22+0000\n"
+"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 91551b7bd..fdbe52674 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -11,13 +11,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2018-05-31 06:33+0000\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
-=======
"PO-Revision-Date: 2018-06-04 03:32+0000\n"
"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
->>>>>>> Update translations
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -35,135 +30,131 @@ msgstr "Ligne"
msgid "Polygon"
msgstr "Polygon"
-#: forms.py:98 forms.py:104 forms.py:443 models_finds.py:610
+#: forms.py:101 forms.py:107 forms.py:452 models_finds.py:610
#: models_finds.py:948 wizards.py:71
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:99
+#: forms.py:102
msgid "Find - 010 - Context record choice"
msgstr "Mobilier - 010 - Choix de l'unité d'enregistrement"
-#: forms.py:133 ishtar_menu.py:32 models_finds.py:849 models_finds.py:1484
-#: models_finds.py:1505 models_treatments.py:311
+#: forms.py:136 ishtar_menu.py:32 models_finds.py:849 models_finds.py:1495
+#: models_finds.py:1516 models_treatments.py:316
#: templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr "Mobilier"
-#: forms.py:134
+#: forms.py:137
msgid "Find - 020 - General"
msgstr "Mobilier - 020 - Général"
-#: forms.py:148 templates/ishtar/sheet_find.html:36
+#: forms.py:151 templates/ishtar/sheet_find.html:119
msgid "Identification"
msgstr "Identification"
-#: forms.py:151 forms.py:425 forms.py:708 models_finds.py:237
+#: forms.py:154 forms.py:434 forms.py:717 models_finds.py:237
#: models_finds.py:719 templates/ishtar/sheet_find.html:19
msgid "Free ID"
-msgstr "ID libre"
+msgstr "Identifiant libre"
-#: forms.py:153 models_finds.py:720 templates/ishtar/sheet_find.html:18
+#: forms.py:156 models_finds.py:720 templates/ishtar/sheet_find.html:18
msgid "Denomination"
msgstr "Dénomination"
-#: forms.py:154 models_finds.py:793
+#: forms.py:157 models_finds.py:793
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:156 models_finds.py:241
+#: forms.py:159 models_finds.py:241
msgid "Excavation ID"
msgstr "Identifiant fouille"
-#: forms.py:157 models_finds.py:721
+#: forms.py:160 models_finds.py:721
msgid "Museum ID"
msgstr "Identifiant musée"
-#: forms.py:158 models_finds.py:716
+#: forms.py:161 models_finds.py:716
msgid "Seal number"
msgstr "Numéro de scellé"
-#: forms.py:159 models_finds.py:789
+#: forms.py:162 models_finds.py:789
msgid "Mark"
-msgstr "Marque"
+msgstr "Marquage"
-#: forms.py:161 forms.py:162 forms.py:465 forms_treatments.py:139
-#: models_finds.py:242 models_finds.py:722 models_treatments.py:111
-#: templates/ishtar/sheet_find.html:51
+#: forms.py:164 forms.py:165 forms.py:474 forms_treatments.py:139
+#: models_finds.py:242 models_finds.py:722 models_treatments.py:112
+#: templates/ishtar/sheet_find.html:134
msgid "Description"
msgstr "Description"
-#: forms.py:165 models_finds.py:249
+#: forms.py:168 models_finds.py:249
msgid "Discovery date (exact or TPQ)"
msgstr "Date de découverte (exacte ou TPQ)"
-#: forms.py:168 models_finds.py:251 templates/ishtar/sheet_find.html:258
+#: forms.py:171 models_finds.py:251 templates/ishtar/sheet_find.html:78
msgid "Discovery date (TAQ)"
msgstr "Date de découverte (TAQ)"
-#: forms.py:170 forms.py:467 models_finds.py:253
+#: forms.py:173 forms.py:476 models_finds.py:253
msgid "Batch/object"
msgstr "Lot/objet"
-#: forms.py:172 models_finds.py:754
+#: forms.py:175 models_finds.py:754
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:175 models_finds.py:54 models_finds.py:633 models_finds.py:728
+#: forms.py:178 models_finds.py:54 models_finds.py:633 models_finds.py:728
msgid "Material types"
msgstr "Types de matériau"
-#: forms.py:178 models_finds.py:733
+#: forms.py:181 models_finds.py:733
msgid "Material type quality"
msgstr "Qualité du type de matériaux"
-#: forms.py:180 models_finds.py:149 models_finds.py:634 models_finds.py:757
+#: forms.py:183 models_finds.py:149 models_finds.py:634 models_finds.py:757
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:183 models_finds.py:762
+#: forms.py:186 models_finds.py:762
msgid "Object type quality"
msgstr "Qualité du type d'objet"
-#: forms.py:184 forms.py:715 models_finds.py:740
+#: forms.py:187 forms.py:724 models_finds.py:740
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:186 models_finds.py:775
+#: forms.py:189 models_finds.py:775
msgid "Minimum number of individuals (MNI)"
msgstr "Nombre minimum d'individus (NMI)"
-#: forms.py:188 models_finds.py:723
+#: forms.py:191 models_finds.py:723
msgid "Decoration"
msgstr "Décor"
-#: forms.py:190 models_finds.py:724
+#: forms.py:193 models_finds.py:724
msgid "Inscription"
msgstr "Inscription"
-#: forms.py:193 models_finds.py:726
+#: forms.py:196 models_finds.py:726
msgid "Manufacturing place"
msgstr "Lieu de fabrication"
-#: forms.py:195 models_finds.py:772
+#: forms.py:198 models_finds.py:772
msgid "Communicability"
msgstr "Communicabilité"
-#: forms.py:198 forms_treatments.py:156
-msgid "Image"
-msgstr "Image"
-
-#: forms.py:200 forms_treatments.py:141 forms_treatments.py:487
-#: models_finds.py:243 models_finds.py:790 models_treatments.py:110
-#: models_treatments.py:530
+#: forms.py:200 forms_treatments.py:141 forms_treatments.py:492
+#: models_finds.py:243 models_finds.py:790 models_treatments.py:111
+#: models_treatments.py:535
msgid "Comment"
-msgstr "Commentaires"
+msgstr "Commentaire général"
#: forms.py:203 models_finds.py:791
msgid "Comment on dating"
-msgstr "Commentaire général sur les datations"
+msgstr "Commentaire relatif aux datations"
-#: forms.py:205 templates/ishtar/sheet_find.html:69
+#: forms.py:205 templates/ishtar/sheet_find.html:152
msgid "Dimensions"
msgstr "Dimensions"
@@ -187,11 +178,11 @@ msgstr "Diamètre (cm)"
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: forms.py:211 forms.py:713 models_finds.py:736
+#: forms.py:211 forms.py:722 models_finds.py:736
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:212 forms.py:714 templates/ishtar/sheet_find.html:77
+#: forms.py:212 forms.py:723 templates/ishtar/sheet_find.html:160
msgid "Weight (g)"
msgstr "Poids (g)"
@@ -209,16 +200,16 @@ msgstr "Encombrement hauteur (cm)"
#: forms.py:220 models_finds.py:787
msgid "Dimensions comment"
-msgstr "Commentaire concernant les dimensions"
+msgstr "Commentaire relatif aux dimensions"
-#: forms.py:223 templates/ishtar/sheet_find.html:274
-#: templates/ishtar/sheet_find.html:278
+#: forms.py:223 templates/ishtar/sheet_find.html:94
+#: templates/ishtar/sheet_find.html:98
msgid "Coordinates"
msgstr "Coordonnées"
#: forms.py:225 models_finds.py:258
msgid "Point of topographic reference"
-msgstr "Point de référence topographique"
+msgstr "Point topographique"
#: forms.py:228 models_finds.py:260
msgid "X"
@@ -248,11 +239,11 @@ msgstr "Erreur estimée pour Y"
msgid "Estimated error for Z"
msgstr "Erreur estimée pour Z"
-#: forms.py:241 templates/ishtar/sheet_find.html:86
+#: forms.py:241 templates/ishtar/sheet_find.html:169
msgid "Sheet"
msgstr "Fiche"
-#: forms.py:242 forms.py:468 models_finds.py:795
+#: forms.py:242 forms.py:477 models_finds.py:795
msgid "Check"
msgstr "Vérification"
@@ -260,7 +251,7 @@ msgstr "Vérification"
msgid "Check date"
msgstr "Date de vérification"
-#: forms.py:282
+#: forms.py:283
msgid ""
"Discovery date: if a TAQ date is provided a TPQ date has to be informed. If "
"you have a precise date fill only the TPQ - discovery date field."
@@ -269,294 +260,303 @@ msgstr ""
"renseignée. Si vous avez une date précise, remplissez seulement le champ « "
"date de découverte (exacte ou TPQ) »."
-#: forms.py:288
+#: forms.py:289
msgid "Discovery date: TAQ date must be older than TPQ date."
msgstr "Date de découverte : la date TAQ doit être postérieure à la date TPQ."
-#: forms.py:298
+#: forms.py:299
msgid "Clutter: short side cannot be bigger than the long side."
msgstr ""
"Encombrement : le petit côté court ne peut pas être plus grand que le grand "
"côté."
-#: forms.py:315
+#: forms.py:316
msgid ""
"You should at least provide X, Y and the spatial reference system used."
msgstr ""
"Vous devez au minimum fournir X, Y et le système de référence spatiale "
"utilisé."
-#: forms.py:324
+#: forms.py:325
msgid ""
"Coordinates are not relevant for the spatial reference system used: {}."
msgstr ""
"Les coordonnées ne sont pas pertinentes pour le système de référence "
"spatiale utilisé : {}."
-#: forms.py:330 templates/ishtar/sheet_find.html:99
+#: forms.py:333 forms_treatments.py:264 models_finds.py:831
+#: models_treatments.py:128
+msgid "Images"
+msgstr "Images"
+
+#: forms.py:334
+msgid "Find - 025 - Images"
+msgstr "Mobilier - 025 - Images"
+
+#: forms.py:339 templates/ishtar/sheet_find.html:182
msgid "Preservation"
msgstr "Conservation"
-#: forms.py:331
+#: forms.py:340
msgid "Find - 030 - Preservation"
msgstr "Mobilier - 030 - Conservation"
-#: forms.py:344 forms.py:461 models_finds.py:766
+#: forms.py:353 forms.py:470 models_finds.py:766
msgid "Integrity / interest"
msgstr "Intégrité / intérêt"
-#: forms.py:347 forms.py:463 models_finds.py:769
+#: forms.py:356 forms.py:472 models_finds.py:769
msgid "Remarkability"
msgstr "Remarquabilité"
-#: forms.py:349 forms.py:459 models_finds.py:77 models_finds.py:807
+#: forms.py:358 forms.py:468 models_finds.py:77 models_finds.py:807
msgid "Conservatory state"
msgstr "État sanitaire"
-#: forms.py:352 models_finds.py:816
+#: forms.py:361 models_finds.py:816
msgid "Alteration"
msgstr "Altération"
-#: forms.py:355 models_finds.py:820
+#: forms.py:364 models_finds.py:820
msgid "Alteration cause"
msgstr "Cause d'altération"
-#: forms.py:358 models_finds.py:813
+#: forms.py:367 models_finds.py:813
msgid "Recommended treatments"
msgstr "Traitements recommandés"
-#: forms.py:360 models_finds.py:824
+#: forms.py:369 models_finds.py:824
msgid "Treatment emergency"
msgstr "Urgence du traitement"
-#: forms.py:362 models_finds.py:799
+#: forms.py:371 models_finds.py:799
msgid "Estimated value"
msgstr "Valeur estimée"
-#: forms.py:363 models_finds.py:827
+#: forms.py:372 models_finds.py:827
msgid "Insurance value"
msgstr "Valeur d'assurance"
-#: forms.py:365 models_finds.py:829
+#: forms.py:374 models_finds.py:829
msgid "Appraisal date"
msgstr "Date d'évaluation"
-#: forms.py:367 models_finds.py:809
+#: forms.py:376 models_finds.py:809
msgid "Conservatory comment"
msgstr "Commentaire relatif à la conservation"
-#: forms.py:391 forms.py:415 models_finds.py:748
-#: templates/ishtar/sheet_find.html:118
+#: forms.py:400 forms.py:424 models_finds.py:748
+#: templates/ishtar/sheet_find.html:199
msgid "Dating"
msgstr "Datation"
-#: forms.py:396 forms.py:454
+#: forms.py:405 forms.py:463
msgid "Period"
msgstr "Période"
-#: forms.py:397 forms_treatments.py:143 forms_treatments.py:287
-#: forms_treatments.py:489 models_finds.py:1510 models_treatments.py:113
-#: models_treatments.py:322 templates/ishtar/sheet_find.html:149
-#: templates/ishtar/sheet_find.html:187
+#: forms.py:406 forms_treatments.py:143 forms_treatments.py:292
+#: forms_treatments.py:494 models_finds.py:1521 models_treatments.py:114
+#: models_treatments.py:327 templates/ishtar/sheet_find.html:232
+#: templates/ishtar/sheet_find.html:270
msgid "Start date"
msgstr "Date de début"
-#: forms.py:399 models_finds.py:1511 models_treatments.py:323
-#: templates/ishtar/sheet_find.html:150 templates/ishtar/sheet_find.html:188
+#: forms.py:408 models_finds.py:1522 models_treatments.py:328
+#: templates/ishtar/sheet_find.html:233 templates/ishtar/sheet_find.html:271
msgid "End date"
msgstr "Date de fin"
-#: forms.py:400
+#: forms.py:409
msgid "Quality"
msgstr "Qualité"
-#: forms.py:402
+#: forms.py:411
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:404
+#: forms.py:413
msgid "Precise dating"
msgstr "Datation précise"
-#: forms.py:416
+#: forms.py:425
msgid "Find - 040 - Dating"
msgstr "Mobilier - 040 - Datation"
-#: forms.py:421 forms_treatments.py:52 forms_treatments.py:333
-#: forms_treatments.py:404 forms_treatments.py:591
+#: forms.py:430 forms_treatments.py:52 forms_treatments.py:338
+#: forms_treatments.py:409 forms_treatments.py:596
msgid "Full text search"
-msgstr "Recherche texte"
+msgstr "Recherche en texte intégral"
-#: forms.py:423 models_finds.py:277
+#: forms.py:432 models_finds.py:277
msgid "Short ID"
-msgstr "ID court"
+msgstr "Identifiant court"
-#: forms.py:424 models_finds.py:280
+#: forms.py:433 models_finds.py:280
msgid "Complete ID"
-msgstr "ID complet"
+msgstr "Identifiant complet"
-#: forms.py:428 forms_treatments.py:56 forms_treatments.py:101
-#: forms_treatments.py:335 forms_treatments.py:408 forms_treatments.py:459
-#: forms_treatments.py:593 models_treatments.py:87 models_treatments.py:503
+#: forms.py:437 forms_treatments.py:56 forms_treatments.py:101
+#: forms_treatments.py:340 forms_treatments.py:413 forms_treatments.py:464
+#: forms_treatments.py:598 models_treatments.py:88 models_treatments.py:508
msgid "Year"
msgstr "Année"
-#: forms.py:430
+#: forms.py:439
msgid "Operation's number (index by year)"
msgstr "Numéro de l'opération (index par année)"
-#: forms.py:433
+#: forms.py:442
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:437
+#: forms.py:446
msgid "Archaeological site"
msgstr "Entité (EA)"
-#: forms.py:449
+#: forms.py:458
msgid "Search within related operations"
msgstr "Rechercher parmi les opérations liées"
-#: forms.py:452
+#: forms.py:461
msgid "Search within related context records"
msgstr "Recherche parmi les Unités d'Enregistrement associées"
-#: forms.py:455 forms.py:712 models_finds.py:53
+#: forms.py:464 forms.py:721 models_finds.py:53
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:456 models_finds.py:148
+#: forms.py:465 models_finds.py:148
msgid "Object type"
msgstr "Type d'objet"
-#: forms.py:458
+#: forms.py:467
msgid "Preservation type"
msgstr "Type de conservation"
-#: forms.py:469 forms_treatments.py:59
+#: forms.py:478 forms_treatments.py:59
msgid "Has an image?"
msgstr "Dispose d'une image ?"
-#: forms.py:523
+#: forms.py:532
msgid "Warehouse (location)"
-msgstr "Dépôt (lieu)"
+msgstr "Lieu de conservation (localisation)"
-#: forms.py:529
+#: forms.py:538
msgid "Warehouse (responsible)"
-msgstr "Dépôt (responsable)"
+msgstr "Lieu de conservation (responsable)"
-#: forms.py:534
+#: forms.py:543
msgid "Container ID"
msgstr "Identifiant du contenant"
-#: forms.py:535
+#: forms.py:544
msgid "Container ref."
msgstr "Réf. contenant"
-#: forms.py:540 forms.py:563 views.py:159
+#: forms.py:549 forms.py:572 views.py:161
msgid "Find search"
msgstr "Rechercher un mobilier"
-#: forms.py:588 models_treatments.py:220
+#: forms.py:597 models_treatments.py:220
#: templates/ishtar/sheet_treatment.html:56
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:590 models_finds.py:850
+#: forms.py:599 models_finds.py:850
msgid "Finds"
msgstr "Mobilier"
-#: forms.py:602
+#: forms.py:611
msgid "You should at least select one archaeological find."
msgstr "Vous devez sélectionner au moins un mobilier archéologique."
-#: forms.py:705
+#: forms.py:714
msgid "Resulting find"
msgstr "Mobilier résultant"
-#: forms.py:710
+#: forms.py:719
msgid "Precise description"
msgstr "Description précise"
-#: forms.py:724
+#: forms.py:733
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:729
+#: forms.py:738
msgid "Would you like to delete this find?"
msgstr "Voulez-vous supprimer ce mobilier ?"
-#: forms.py:733 models_treatments.py:69
+#: forms.py:742 models_treatments.py:70
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:746
+#: forms.py:755
msgid "Archaeological find search"
msgstr "Rechercher un mobilier"
-#: forms.py:748
+#: forms.py:757
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:753
+#: forms.py:762
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:755
+#: forms.py:764
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:762
+#: forms.py:771
msgid "Period of the archaeological find"
msgstr "Période du mobilier"
-#: forms.py:764
+#: forms.py:773
msgid "Material type of the archaeological find"
msgstr "Type de matériau du mobilier"
-#: forms.py:766
+#: forms.py:775
msgid "Description of the archaeological find"
msgstr "Description du mobilier"
-#: forms.py:778 forms_treatments.py:693 forms_treatments.py:719
+#: forms.py:787 forms_treatments.py:698 forms_treatments.py:728
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:780 forms_treatments.py:695 forms_treatments.py:721
+#: forms.py:789 forms_treatments.py:700 forms_treatments.py:730
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:797
+#: forms.py:806
msgid "Another basket already exists with this name."
msgstr "Un autre panier existant utilise déjà ce nom."
-#: forms.py:807 forms.py:811 forms_treatments.py:183 ishtar_menu.py:57
+#: forms.py:816 forms.py:820 forms_treatments.py:180 ishtar_menu.py:57
msgid "Basket"
msgstr "Panier"
-#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:83
-#: templates/ishtar/sheet_find.html:143 templates/ishtar/sheet_find.html:181
+#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:84
+#: templates/ishtar/sheet_find.html:226 templates/ishtar/sheet_find.html:264
msgid "Label"
-msgstr "Intitulé"
+msgstr "Dénomination"
-#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:85
+#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:86
msgid "Other ref."
msgstr "Autre réf."
-#: forms_treatments.py:57 forms_treatments.py:235 forms_treatments.py:336
-#: forms_treatments.py:398 forms_treatments.py:409 forms_treatments.py:512
-#: forms_treatments.py:594 forms_treatments.py:659 models_treatments.py:88
-#: models_treatments.py:504
+#: forms_treatments.py:57 forms_treatments.py:232 forms_treatments.py:341
+#: forms_treatments.py:403 forms_treatments.py:414 forms_treatments.py:517
+#: forms_treatments.py:599 forms_treatments.py:664 models_treatments.py:89
+#: models_treatments.py:509
msgid "Index"
msgstr "Index"
-#: forms_treatments.py:58 forms_treatments.py:106 forms_treatments.py:295
-#: forms_treatments.py:352 forms_treatments.py:681 models_finds.py:103
-#: models_treatments.py:93 models_treatments.py:321
+#: forms_treatments.py:58 forms_treatments.py:106 forms_treatments.py:300
+#: forms_treatments.py:357 forms_treatments.py:686 models_finds.py:103
+#: models_treatments.py:94 models_treatments.py:326
msgid "Treatment type"
msgstr "Type de traitement"
-#: forms_treatments.py:71 forms_treatments.py:663 views.py:415
+#: forms_treatments.py:71 forms_treatments.py:668 views.py:426
msgid "Treatment search"
msgstr "Rechercher un traitement"
@@ -568,8 +568,8 @@ msgstr "Traitement de base"
msgid "Treatment - 020 - General"
msgstr "Traitement - 020 - Général"
-#: forms_treatments.py:108 models_treatments.py:71 models_treatments.py:95
-#: templates/ishtar/sheet_find.html:145 templates/ishtar/sheet_find.html:183
+#: forms_treatments.py:108 models_treatments.py:72 models_treatments.py:96
+#: templates/ishtar/sheet_find.html:228 templates/ishtar/sheet_find.html:266
msgid "State"
msgstr "État"
@@ -577,32 +577,32 @@ msgstr "État"
msgid "Target"
msgstr "Destination"
-#: forms_treatments.py:112 forms_treatments.py:470 models_treatments.py:103
+#: forms_treatments.py:112 forms_treatments.py:475 models_treatments.py:104
msgid "Responsible"
msgstr "Responsable"
-#: forms_treatments.py:118 models_treatments.py:106
+#: forms_treatments.py:118 models_treatments.py:107
msgid "Organization"
msgstr "Organisation"
-#: forms_treatments.py:124 models_treatments.py:98 models_treatments.py:324
+#: forms_treatments.py:124 models_treatments.py:99 models_treatments.py:329
msgid "Location"
-msgstr "Lieu"
+msgstr "Localisation"
#: forms_treatments.py:130
msgid "Container (relevant for packaging)"
msgstr "Contenant (pertinent dans le cadre du conditionnement)"
-#: forms_treatments.py:136 forms_treatments.py:466
+#: forms_treatments.py:136 forms_treatments.py:471
msgid "External ref."
-msgstr "Réf. externe"
+msgstr "Référence"
-#: forms_treatments.py:137 models_treatments.py:112
+#: forms_treatments.py:137 models_treatments.py:113
msgid "Goal"
msgstr "But"
-#: forms_treatments.py:145 forms_treatments.py:287 forms_treatments.py:495
-#: forms_treatments.py:547 models_treatments.py:114 models_treatments.py:524
+#: forms_treatments.py:145 forms_treatments.py:292 forms_treatments.py:500
+#: forms_treatments.py:552 models_treatments.py:115 models_treatments.py:529
msgid "Closing date"
msgstr "Date de clôture"
@@ -626,11 +626,11 @@ msgstr "Coût réalisé ({currency})"
msgid "Insurance cost ({currency})"
msgstr "Coût d''assurance ({currency})"
-#: forms_treatments.py:183
+#: forms_treatments.py:180
msgid "Single find"
msgstr "Mobilier isolé"
-#: forms_treatments.py:207
+#: forms_treatments.py:204
msgid ""
"The container field is attached to the treatment. If no packaging treatment "
"is done it is not relevant."
@@ -638,34 +638,38 @@ msgstr ""
"Le champ concernant le contenant est rattaché au traitement. Si aucun "
"conditionnement n'est réalisé, il n'est pas pertinent."
-#: forms_treatments.py:212
+#: forms_treatments.py:209
msgid "If a packaging treatment is done, the container field must be filled."
msgstr ""
"Si un conditionnement est fait, le champ du contenant doit être rempli."
-#: forms_treatments.py:216
+#: forms_treatments.py:213
msgid "A responsible or an organization must be defined."
msgstr "Un responsable ou une organisation doit être défini."
-#: forms_treatments.py:259
+#: forms_treatments.py:256
msgid "Another treatment with this index exists for {}."
msgstr "Un autre traitement avec cet index existe pour {}."
-#: forms_treatments.py:265 models_treatments.py:91
+#: forms_treatments.py:265
+msgid "Treatment - 025 - Images"
+msgstr "Traitements - 025 - Images"
+
+#: forms_treatments.py:270 models_treatments.py:92
msgid "Associated request"
msgstr "Demande associée"
-#: forms_treatments.py:266
+#: forms_treatments.py:271
msgid "Treatment - 010 - Request choice"
msgstr "Traitement - 010 - Choix de la demande de traitement"
-#: forms_treatments.py:271 forms_treatments.py:450 ishtar_menu.py:108
-#: models_treatments.py:536 models_treatments.py:564 models_treatments.py:644
+#: forms_treatments.py:276 forms_treatments.py:455 ishtar_menu.py:108
+#: models_treatments.py:541 models_treatments.py:569 models_treatments.py:649
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:195
msgid "Treatment request"
msgstr "Demande de traitement"
-#: forms_treatments.py:280
+#: forms_treatments.py:285
msgid ""
"Are you sure you want to delete this treatment? All changes made to the "
"associated finds since this treatment record will be lost!"
@@ -674,161 +678,161 @@ msgstr ""
"sur le mobilier associé réalisées depuis l'enregistrement de ce traitement "
"seront perdues !"
-#: forms_treatments.py:283
+#: forms_treatments.py:288
msgid "Would you like to delete this treatment?"
msgstr "Voulez-vous supprimer ce traitement ?"
-#: forms_treatments.py:286
+#: forms_treatments.py:291
msgid "months"
msgstr "mois"
-#: forms_treatments.py:286
+#: forms_treatments.py:291
msgid "years"
msgstr "années"
-#: forms_treatments.py:291 forms_treatments.py:551
+#: forms_treatments.py:296 forms_treatments.py:556
msgid "Slicing"
msgstr "Découpage"
-#: forms_treatments.py:294 forms_treatments.py:554
+#: forms_treatments.py:299 forms_treatments.py:559
msgid "Date get from"
msgstr "Date utilisée"
-#: forms_treatments.py:297 forms_treatments.py:557
+#: forms_treatments.py:302 forms_treatments.py:562
msgid "Date after"
msgstr "Date après"
-#: forms_treatments.py:299 forms_treatments.py:559
+#: forms_treatments.py:304 forms_treatments.py:564
msgid "Date before"
msgstr "Date avant"
-#: forms_treatments.py:337 forms_treatments.py:387 forms_treatments.py:595
-#: forms_treatments.py:648
+#: forms_treatments.py:342 forms_treatments.py:392 forms_treatments.py:600
+#: forms_treatments.py:653
msgid "Act type"
msgstr "Type d'acte"
-#: forms_treatments.py:338 forms_treatments.py:596
+#: forms_treatments.py:343 forms_treatments.py:601
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms_treatments.py:339 forms_treatments.py:597
+#: forms_treatments.py:344 forms_treatments.py:602
msgid "Object"
msgstr "Objet"
-#: forms_treatments.py:343 forms_treatments.py:601
+#: forms_treatments.py:348 forms_treatments.py:606
msgid "Signature date after"
msgstr "Date de signature après"
-#: forms_treatments.py:345 forms_treatments.py:603
+#: forms_treatments.py:350 forms_treatments.py:608
msgid "Signature date before"
msgstr "Date de signature avant"
-#: forms_treatments.py:347 forms_treatments.py:676
+#: forms_treatments.py:352 forms_treatments.py:681
msgid "Treatment name"
msgstr "Nom du traitement"
-#: forms_treatments.py:348 forms_treatments.py:677
+#: forms_treatments.py:353 forms_treatments.py:682
msgid "Treatment year"
msgstr "Année du traitement"
-#: forms_treatments.py:349 forms_treatments.py:678
+#: forms_treatments.py:354 forms_treatments.py:683
msgid "Treatment index"
msgstr "Index du traitement"
-#: forms_treatments.py:351 forms_treatments.py:680
+#: forms_treatments.py:356 forms_treatments.py:685
msgid "Treatment internal reference"
msgstr "Référence interne du traitement"
-#: forms_treatments.py:355 forms_treatments.py:615
+#: forms_treatments.py:360 forms_treatments.py:620
msgid "Modified by"
msgstr "Modifié par"
-#: forms_treatments.py:385
+#: forms_treatments.py:390
msgid "Treatment - Administrative act - General"
msgstr "Traitement - Acte administratif - Général"
-#: forms_treatments.py:406 forms_treatments.py:457 models_treatments.py:509
+#: forms_treatments.py:411 forms_treatments.py:462 models_treatments.py:514
msgid "Name"
msgstr "Nom"
-#: forms_treatments.py:407 forms_treatments.py:464
+#: forms_treatments.py:412 forms_treatments.py:469
msgid "Internal ref."
msgstr "Réf. interne"
-#: forms_treatments.py:410 forms_treatments.py:468 models_treatments.py:70
-#: templates/ishtar/sheet_find.html:144 templates/ishtar/sheet_find.html:182
+#: forms_treatments.py:415 forms_treatments.py:473 models_treatments.py:71
+#: templates/ishtar/sheet_find.html:227 templates/ishtar/sheet_find.html:265
#: templates/ishtar/sheet_find.html:306
msgid "Type"
msgstr "Type"
-#: forms_treatments.py:412
+#: forms_treatments.py:417
msgid "In charge"
msgstr "Responsable"
-#: forms_treatments.py:418 forms_treatments.py:476 models_treatments.py:518
+#: forms_treatments.py:423 forms_treatments.py:481 models_treatments.py:523
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Applicant"
msgstr "Demandeur"
-#: forms_treatments.py:424 forms_treatments.py:482 models_treatments.py:522
+#: forms_treatments.py:429 forms_treatments.py:487 models_treatments.py:527
#: templates/ishtar/sheet_treatmentfile.html:53
msgid "Applicant organisation"
msgstr "Organisation du demandeur"
-#: forms_treatments.py:438 forms_treatments.py:668 views.py:519
+#: forms_treatments.py:443 forms_treatments.py:673 views.py:531
msgid "Treatment request search"
msgstr "Rechercher une demande de traitement"
-#: forms_treatments.py:493 forms_treatments.py:546 models_treatments.py:528
+#: forms_treatments.py:498 forms_treatments.py:551 models_treatments.py:533
msgid "Reception date"
msgstr "Date de réception"
-#: forms_treatments.py:535
+#: forms_treatments.py:540
msgid "Another treatment request with this index exists for {}."
msgstr "Une autre demande de traitement avec cet index existe pour {}."
-#: forms_treatments.py:541
+#: forms_treatments.py:546
msgid "Are you sure you want to delete this treatment request?"
msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ? "
-#: forms_treatments.py:542
+#: forms_treatments.py:547
msgid "Would you like to delete this treatment request?"
msgstr "Voulez-vous supprimer cette demande de traitement ?"
-#: forms_treatments.py:545 models_treatments.py:526
+#: forms_treatments.py:550 models_treatments.py:531
msgid "Creation date"
msgstr "Date de création"
-#: forms_treatments.py:555 forms_treatments.py:613 forms_treatments.py:708
-#: models_treatments.py:481 models_treatments.py:511
+#: forms_treatments.py:560 forms_treatments.py:618 forms_treatments.py:717
+#: models_treatments.py:486 models_treatments.py:516
msgid "Treatment request type"
msgstr "Type de demande de traitement"
-#: forms_treatments.py:605 forms_treatments.py:700
+#: forms_treatments.py:610 forms_treatments.py:709
msgid "Treatment request name"
msgstr "Nom du dossier de traitement"
-#: forms_treatments.py:607 forms_treatments.py:702
+#: forms_treatments.py:612 forms_treatments.py:711
msgid "Treatment request year"
msgstr "Année du dossier de traitement"
-#: forms_treatments.py:609 forms_treatments.py:704
+#: forms_treatments.py:614 forms_treatments.py:713
msgid "Treatment request index"
msgstr "Index de la demande de traitement"
-#: forms_treatments.py:611 forms_treatments.py:706
+#: forms_treatments.py:616 forms_treatments.py:715
msgid "Treatment request internal reference"
msgstr "Référence interne de la demande de traitement"
-#: forms_treatments.py:646
+#: forms_treatments.py:651
msgid "Treatment request - Administrative act - General"
msgstr "Demande de traitement - Acte administratif - Général"
-#: forms_treatments.py:665
+#: forms_treatments.py:670
msgid "You should select a treatment."
msgstr "Vous devez sélectionner un traitement."
-#: forms_treatments.py:671
+#: forms_treatments.py:676
msgid "You should select a treatment request."
msgstr "Vous devez sélectionner une demande de traitement."
@@ -862,7 +866,7 @@ msgstr "Gestion des éléments"
msgid "Documentation"
msgstr "Documentation"
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1507
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1518
msgid "Administrative act"
msgstr "Acte administratif"
@@ -875,8 +879,8 @@ msgstr "Documents"
msgid "Source"
msgstr "Documentation"
-#: ishtar_menu.py:185 models_treatments.py:134 models_treatments.py:313
-#: models_treatments.py:610 models_treatments.py:613
+#: ishtar_menu.py:185 models_treatments.py:135 models_treatments.py:318
+#: models_treatments.py:616 models_treatments.py:619
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr "Traitement"
@@ -894,7 +898,7 @@ msgid "Recommendation"
msgstr "Recommandation"
#: models_finds.py:63 models_finds.py:87 models_finds.py:135
-#: models_finds.py:158 models_finds.py:718 models_treatments.py:317
+#: models_finds.py:158 models_finds.py:718 models_treatments.py:322
msgid "Order"
msgstr "Ordre"
@@ -1006,14 +1010,14 @@ msgstr "Type de communicabilité"
msgid "Communicability types"
msgstr "Types de communicabilité"
-#: models_finds.py:238 models_finds.py:711 models_treatments.py:108
-#: models_treatments.py:507
+#: models_finds.py:238 models_finds.py:711 models_treatments.py:109
+#: models_treatments.py:512
msgid "External ID"
-msgstr "ID externe"
+msgstr "Identifiant"
#: models_finds.py:240 models_finds.py:713
msgid "External ID is set automatically"
-msgstr "L'identifiant externe est configuré automatiquement"
+msgstr "L'identifiant est attribué automatiquement"
#: models_finds.py:244
msgid "Special interest"
@@ -1115,9 +1119,9 @@ msgstr "Mobilier d'origine - Date de découverte (exacte ou TPQ)"
msgid "Base find - Discovery date (TAQ)"
msgstr "Mobilier d'origine - Date de découverte (TAQ)"
-#: models_finds.py:631 models_finds.py:751 models_treatments.py:115
-#: models_treatments.py:325 templates/ishtar/sheet_find.html:148
-#: templates/ishtar/sheet_find.html:186
+#: models_finds.py:631 models_finds.py:751 models_treatments.py:116
+#: models_treatments.py:330 templates/ishtar/sheet_find.html:231
+#: templates/ishtar/sheet_find.html:269
msgid "Container"
msgstr "Contenant"
@@ -1133,11 +1137,11 @@ msgstr "Poids"
msgid "Weight unit"
msgstr "Unité de poids"
-#: models_finds.py:744 templates/ishtar/sheet_find.html:138
+#: models_finds.py:744 templates/ishtar/sheet_find.html:221
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models_finds.py:747 templates/ishtar/sheet_find.html:176
+#: models_finds.py:747 templates/ishtar/sheet_find.html:259
msgid "Downstream treatment"
msgstr "Traitement aval"
@@ -1157,11 +1161,7 @@ msgstr "Encombrement - hauteur (cm)"
msgid "Collection"
msgstr "Collection"
-#: models_finds.py:831 models_treatments.py:127
-msgid "Images"
-msgstr "Images"
-
-#: models_finds.py:833 models_treatments.py:129 models_treatments.py:531
+#: models_finds.py:833 models_treatments.py:130 models_treatments.py:536
msgid "Cached name"
msgstr "Nom en cache"
@@ -1173,79 +1173,80 @@ msgstr "MOBILIER"
msgid "Operation"
msgstr "Opération (OA)"
-#: models_finds.py:1264
+#: models_finds.py:1269
msgid "No container have been set - the localisation cannot be set."
msgstr ""
"Aucun contenant n'a été défini - la localisation ne peut être définie."
-#: models_finds.py:1270
+#: models_finds.py:1275
msgid "The division number {} have not been set for the warehouse {}."
-msgstr "La division numéro {} n'a pas été définie pour le dépôt {}."
+msgstr ""
+"La division numéro {} n'a pas été définie pour le lieu de conservation {}."
-#: models_finds.py:1470
+#: models_finds.py:1481
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models_finds.py:1471
+#: models_finds.py:1482
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models_finds.py:1508
+#: models_finds.py:1519
msgid "Person"
msgstr "Individu"
-#: models_finds.py:1514
+#: models_finds.py:1525
msgid "Property"
msgstr "Propriété"
-#: models_finds.py:1515
+#: models_finds.py:1526
msgid "Properties"
msgstr "Propriétés"
-#: models_treatments.py:41
+#: models_treatments.py:42
msgid "Treatment state type"
msgstr "Type d'état de traitement"
-#: models_treatments.py:42
+#: models_treatments.py:43
msgid "Treatment state types"
msgstr "Types d'état de traitement"
-#: models_treatments.py:68
+#: models_treatments.py:69
msgid "Downstream find"
msgstr "Mobilier aval"
-#: models_treatments.py:100
+#: models_treatments.py:101
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-"Endroit où le traitement est réalisé. Renseignez le dépôt de destination "
-"pour un déplacement."
+"Endroit où le traitement est réalisé. Renseignez le lieu de conservation de "
+"destination pour un déplacement."
-#: models_treatments.py:117
+#: models_treatments.py:118
msgid "Estimated cost"
msgstr "Coût estimé"
-#: models_treatments.py:119
+#: models_treatments.py:120
msgid "Quoted cost"
msgstr "Coût devisé"
-#: models_treatments.py:121
+#: models_treatments.py:122
msgid "Realized cost"
msgstr "Coût réalisé"
-#: models_treatments.py:123
+#: models_treatments.py:124
msgid "Insurance cost"
msgstr "Coût d'assurance"
-#: models_treatments.py:125
+#: models_treatments.py:126
msgid "Target a basket"
msgstr "Appliquer à un panier"
-#: models_treatments.py:135 templates/ishtar/sheet_find.html:135
+#: models_treatments.py:136 templates/ishtar/sheet_find.html:218
#: templates/ishtar/sheet_treatmentfile.html:61
msgid "Treatments"
msgstr "Traitements"
-#: models_treatments.py:154
+#: models_treatments.py:155
msgid "TREATMENT"
msgstr "TRAITEMENT"
@@ -1253,52 +1254,52 @@ msgstr "TRAITEMENT"
msgid "Downstream finds"
msgstr "Mobilier aval"
-#: models_treatments.py:326 templates/ishtar/sheet_find.html:147
-#: templates/ishtar/sheet_find.html:185
+#: models_treatments.py:331 templates/ishtar/sheet_find.html:230
+#: templates/ishtar/sheet_find.html:268
msgid "Doer"
msgstr "Opérateur"
-#: models_treatments.py:327 models_treatments.py:328
+#: models_treatments.py:332 models_treatments.py:333
msgid "Related finds"
msgstr "Mobilier associé"
-#: models_treatments.py:470
+#: models_treatments.py:475
msgid "Is upstream"
msgstr "Est en amont"
-#: models_treatments.py:482
+#: models_treatments.py:487
msgid "Treatment request types"
msgstr "Types de demande de traitement"
-#: models_treatments.py:505
+#: models_treatments.py:510
msgid "Internal reference"
msgstr "Référence interne"
-#: models_treatments.py:514
+#: models_treatments.py:519
msgid "Person in charge"
msgstr "Personne responsable"
-#: models_treatments.py:537
+#: models_treatments.py:542
msgid "Treatment requests"
msgstr "Demandes de traitement"
-#: models_treatments.py:618
+#: models_treatments.py:624
msgid "Treatment documentation"
msgstr "Documentation de traitement"
-#: models_treatments.py:619
+#: models_treatments.py:625
msgid "Treament documentations"
msgstr "Documentations de traitement"
-#: models_treatments.py:648
+#: models_treatments.py:653
msgid "Treatment file"
msgstr "Dossier de traitement"
-#: models_treatments.py:653
+#: models_treatments.py:658
msgid "Treatment request documentation"
msgstr "Documentation de demande de traitement"
-#: models_treatments.py:654
+#: models_treatments.py:659
msgid "Treatment request documentations"
msgstr "Documentations de demande de traitement"
@@ -1314,79 +1315,79 @@ msgstr ""
"Cette fiche a un traitement aval associé, elle concerne une vieille version "
"de ce mobilier."
-#: templates/ishtar/sheet_find.html:45
-msgid "Administrative index"
-msgstr "Index administratif"
-
-#: templates/ishtar/sheet_find.html:88
-msgid "Checked"
-msgstr "Vérifié"
-
-#: templates/ishtar/sheet_find.html:124
-msgid "Warehouse"
-msgstr "Dépôt"
-
-#: templates/ishtar/sheet_find.html:142 templates/ishtar/sheet_find.html:180
-msgid "Year - index"
-msgstr "Année - index"
-
-#: templates/ishtar/sheet_find.html:146 templates/ishtar/sheet_find.html:184
-msgid "Related finds (max. 15 displayed)"
-msgstr "Mobilier associé (max. 15 affichés)"
-
-#: templates/ishtar/sheet_find.html:172
-msgid "Export as CSV"
-msgstr "Export en CSV"
-
-#: templates/ishtar/sheet_find.html:172 templates/ishtar/sheet_find.html:211
-msgid "CSV"
-msgstr "CSV"
-
-#: templates/ishtar/sheet_find.html:216
+#: templates/ishtar/sheet_find.html:36
msgid "Associated base finds"
msgstr "Mobilier d'origine associé"
-#: templates/ishtar/sheet_find.html:224
+#: templates/ishtar/sheet_find.html:44
msgid "Internal ID"
msgstr "ID interne"
-#: templates/ishtar/sheet_find.html:238
+#: templates/ishtar/sheet_find.html:58
msgid "Last modified by"
msgstr "Modifié en dernier par"
-#: templates/ishtar/sheet_find.html:250
+#: templates/ishtar/sheet_find.html:70
msgid "Discovery date"
msgstr "Date de découverte"
-#: templates/ishtar/sheet_find.html:253
+#: templates/ishtar/sheet_find.html:73
msgid "Discovery year"
msgstr "Date de découverte"
-#: templates/ishtar/sheet_find.html:256
+#: templates/ishtar/sheet_find.html:76
msgid "Discovery date (TPQ)"
msgstr "Date de découverte (TPQ)"
-#: templates/ishtar/sheet_find.html:280
+#: templates/ishtar/sheet_find.html:100
msgid "X:"
msgstr "X :"
-#: templates/ishtar/sheet_find.html:281 templates/ishtar/sheet_find.html:283
-#: templates/ishtar/sheet_find.html:285
+#: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:103
+#: templates/ishtar/sheet_find.html:105
msgid "error:"
msgstr "erreur :"
-#: templates/ishtar/sheet_find.html:282
+#: templates/ishtar/sheet_find.html:102
msgid "Y:"
msgstr "Y :"
-#: templates/ishtar/sheet_find.html:284
+#: templates/ishtar/sheet_find.html:104
msgid "Z:"
msgstr "Z :"
-#: templates/ishtar/sheet_find.html:288
+#: templates/ishtar/sheet_find.html:108
msgid "SRID"
msgstr "SRID"
+#: templates/ishtar/sheet_find.html:128
+msgid "Administrative index"
+msgstr "Index administratif"
+
+#: templates/ishtar/sheet_find.html:171
+msgid "Checked"
+msgstr "Vérifié"
+
+#: templates/ishtar/sheet_find.html:207
+msgid "Warehouse"
+msgstr "Lieu de conservation"
+
+#: templates/ishtar/sheet_find.html:225 templates/ishtar/sheet_find.html:263
+msgid "Year - index"
+msgstr "Année - index"
+
+#: templates/ishtar/sheet_find.html:229 templates/ishtar/sheet_find.html:267
+msgid "Related finds (max. 15 displayed)"
+msgstr "Mobilier associé (max. 15 affichés)"
+
+#: templates/ishtar/sheet_find.html:255
+msgid "Export as CSV"
+msgstr "Export en CSV"
+
+#: templates/ishtar/sheet_find.html:255 templates/ishtar/sheet_find.html:294
+msgid "CSV"
+msgstr "CSV"
+
#: templates/ishtar/sheet_find.html:305
msgid "Title"
msgstr "Titre"
@@ -1461,134 +1462,134 @@ msgstr "Documentation de traitement"
msgid "Related treatment"
msgstr "Traitement associé"
-#: views.py:147
+#: views.py:149
msgid "New find"
msgstr "Ajouter un mobilier"
-#: views.py:179
+#: views.py:186
msgid "Find modification"
msgstr "Modifier un mobilier"
-#: views.py:207
+#: views.py:215
msgid "Find deletion"
msgstr "Supprimer un mobilier"
-#: views.py:212
+#: views.py:220
msgid "Find: source search"
msgstr "Mobilier : rechercher une documentation associée"
-#: views.py:220
+#: views.py:228
msgid "Find: new source"
msgstr "Mobilier : ajouter une documentation associée"
-#: views.py:228
+#: views.py:236
msgid "Find: source modification"
msgstr "Mobilier : modifier une documentation associée"
-#: views.py:243
+#: views.py:251
msgid "Find: source deletion"
msgstr "Mobilier : supprimer un mobilier associé"
-#: views.py:256
+#: views.py:264
msgid "New basket"
msgstr "Ajouter un panier"
-#: views.py:275
+#: views.py:283
msgid "Manage items in basket"
msgstr "Gérer les éléments dans un panier"
-#: views.py:295
+#: views.py:303
msgid "Manage basket"
msgstr "Gérer un panier"
-#: views.py:386
+#: views.py:394
msgid "Delete basket"
msgstr "Supprimer un panier"
-#: views.py:436
+#: views.py:447
msgid "New treatment"
msgstr "Ajouter un traitement"
-#: views.py:444
+#: views.py:456
msgid "Treatment modification"
msgstr "Modifier un traitement"
-#: views.py:461
+#: views.py:473
msgid "Treatment deletion"
msgstr "Supprimer un traitement"
-#: views.py:468
+#: views.py:480
msgid "Treatment: search administrative act"
msgstr "Traitement : rechercher un acte administratif"
-#: views.py:477
+#: views.py:489
msgid "Treatment: new administrative act"
msgstr "Traitement : ajouter un acte administratif"
-#: views.py:487
+#: views.py:499
msgid "Treatment: administrative act modification"
msgstr "Traitement : modifier un acte administratif"
-#: views.py:496
+#: views.py:508
msgid "Treatment: administrative act deletion"
msgstr "Traitement : supprimer un acte administratif"
-#: views.py:529
+#: views.py:541
msgid "New treatment request"
msgstr "Ajouter une demande de traitement"
-#: views.py:536
+#: views.py:548
msgid "Treatment request modification"
msgstr "Modifier une demande de traitement"
-#: views.py:552
+#: views.py:564
msgid "Treatment request deletion"
msgstr "Supprimer une demande de traitement"
-#: views.py:559
+#: views.py:571
msgid "Treatment request: search administrative act"
msgstr "Demande de traitement : rechercher un acte administratif"
-#: views.py:569
+#: views.py:581
msgid "Treatment request: new administrative act"
msgstr "Demande de traitement : ajouter un acte administratif"
-#: views.py:579
+#: views.py:591
msgid "Treatment request: administrative act modification"
msgstr "Demande de traitement : modifier un acte administratif"
-#: views.py:588
+#: views.py:600
msgid "Treatment request: administrative act deletion"
msgstr "Demande de traitement : supprimer un acte administratif"
-#: views.py:614
+#: views.py:626
msgid "Treatment: source search"
msgstr "Traitement : rechercher une documentation associée"
-#: views.py:622
+#: views.py:634
msgid "Treatment: new source"
msgstr "Traitement : ajouter une documentation associée"
-#: views.py:630
+#: views.py:642
msgid "Treatment: source modification"
msgstr "Traitement : modifier une documentation associée"
-#: views.py:645
+#: views.py:657
msgid "Treatment: source deletion"
msgstr "Traitement : supprimer une documentation associée"
-#: views.py:658
+#: views.py:670
msgid "Treatment request: source search"
msgstr "Demande de traitement : rechercher une documentation associée"
-#: views.py:666
+#: views.py:678
msgid "Treatment request: new source"
msgstr "Demande de traitement : ajouter une documentation associée"
-#: views.py:675
+#: views.py:687
msgid "Treatment request: source modification"
msgstr "Demande de traitement : modifier une documentation associée"
-#: views.py:694
+#: views.py:706
msgid "Treatment request: source deletion"
msgstr "Demande de traitement : supprimer une documentation associée"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 0049e72e7..0d8812a84 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -10,32 +10,28 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2018-05-31 06:38+0000\n"
-=======
"PO-Revision-Date: 2018-06-04 03:34+0000\n"
->>>>>>> Update translations
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 4.4.5\n"
-#: admin.py:90 models.py:488
+#: admin.py:91 models.py:496
msgid "Point"
msgstr "Point"
-#: admin.py:92 models.py:489
+#: admin.py:93 models.py:497
msgid "Multi polygon"
msgstr "Polygones multi-parties"
-#: forms.py:71 forms.py:1090 forms.py:1106 forms.py:1112 models.py:1416
+#: forms.py:71 forms.py:1095 forms.py:1111 forms.py:1117 models.py:1449
#: templates/ishtar/blocks/window_tables/parcels.html:9
-#: templates/ishtar/sheet_operation.html:227
+#: templates/ishtar/sheet_operation.html:236
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:74 forms.py:207 forms.py:1065 models.py:1402
+#: forms.py:74 forms.py:207 forms.py:1070 models.py:1435
#: templates/ishtar/blocks/window_tables/parcels.html:6
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -44,22 +40,22 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:76 forms.py:484 forms.py:787 forms.py:1453 models.py:387
-#: models.py:1208 models.py:1400
+#: forms.py:76 forms.py:484 forms.py:787 forms.py:1467 models.py:395
+#: models.py:1241 models.py:1433
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Year"
msgstr "Année"
-#: forms.py:79 models.py:1403
+#: forms.py:79 models.py:1436
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Section"
msgstr "Section"
-#: forms.py:82 models.py:1405
+#: forms.py:82 models.py:1438
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: forms.py:84 models.py:1407 models.py:1424 models.py:1473
+#: forms.py:84 models.py:1440 models.py:1457 models.py:1506
msgid "Public domain"
msgstr "Domaine public"
@@ -95,17 +91,17 @@ msgstr "Il y a des parcelles identiques."
msgid "Relation type"
msgstr "Type de relation"
-#: forms.py:380 ishtar_menu.py:105 models.py:494 models.py:999 models.py:1036
-#: models.py:1078 models.py:1190 models.py:1399
+#: forms.py:380 ishtar_menu.py:105 models.py:502 models.py:1033 models.py:1070
+#: models.py:1111 models.py:1223 models.py:1432
#: templates/ishtar/sheet_operation.html:4 wizards.py:358 wizards.py:369
msgid "Operation"
-msgstr "Opération"
+msgstr "Opération (OA)"
#: forms.py:403
msgid ":"
msgstr ": "
-#: forms.py:411 forms.py:634 forms.py:1415
+#: forms.py:411 forms.py:634 forms.py:1429
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
@@ -133,19 +129,19 @@ msgstr "Relations"
msgid "Operation - 080 - Relations"
msgstr "Opération - 080 - Relations"
-#: forms.py:482 forms.py:1263 forms.py:1451
+#: forms.py:482 forms.py:1268 forms.py:1465
msgid "Full text search"
-msgstr "Recherche texte"
+msgstr "Recherche en texte intégral"
-#: forms.py:485 forms.py:1421 models.py:388
+#: forms.py:485 forms.py:1435 models.py:396
msgid "Numeric reference"
msgstr "Identifiant numérique"
-#: forms.py:492 forms.py:1465
+#: forms.py:492 forms.py:1479
msgid "Parcel (section/number/public domain)"
msgstr "Parcelle (section/numéro/domaine public)"
-#: forms.py:495 forms.py:1468 models.py:1000
+#: forms.py:495 forms.py:1482 models.py:1034
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -154,17 +150,17 @@ msgstr "Parcelle (section/numéro/domaine public)"
msgid "Department"
msgstr "Département"
-#: forms.py:496 forms.py:1177 forms.py:1267 forms.py:1306 models.py:103
+#: forms.py:496 forms.py:1182 forms.py:1272 forms.py:1311 models.py:103
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
#: templates/ishtar/sheet_operation.html:28
msgid "Name"
msgstr "Nom"
-#: forms.py:498 forms.py:785 models.py:450
+#: forms.py:498 forms.py:785 models.py:458
msgid "Address / Locality"
msgstr "Adresse / Lieu-dit"
-#: forms.py:500 forms.py:704 forms.py:781 forms.py:1428 models.py:395
+#: forms.py:500 forms.py:704 forms.py:781 forms.py:1442 models.py:403
msgid "Operation type"
msgstr "Type d'opération"
@@ -172,26 +168,26 @@ msgstr "Type d'opération"
msgid "Is open?"
msgstr "Est ouvert ?"
-#: forms.py:510 forms.py:817 models.py:380
+#: forms.py:510 forms.py:817 models.py:388
msgid "In charge"
msgstr "Responsable du suivi scientifique"
-#: forms.py:517 models.py:1184
+#: forms.py:517 models.py:1217
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:519 forms.py:706 forms.py:807 models.py:378
+#: forms.py:519 forms.py:706 forms.py:807 models.py:386
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:528 forms.py:1182 forms.py:1269 forms.py:1311 models.py:107
-#: models.py:397
+#: forms.py:528 forms.py:1187 forms.py:1274 forms.py:1316 models.py:107
+#: models.py:405
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:529 forms.py:1160 forms.py:1179 forms.py:1268 forms.py:1308
-#: models.py:105 models.py:403
+#: forms.py:529 forms.py:1165 forms.py:1184 forms.py:1273 forms.py:1313
+#: models.py:105 models.py:411
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Periods"
msgstr "Périodes"
@@ -216,39 +212,39 @@ msgstr "Terminé après"
msgid "Search within relations"
msgstr "Rechercher parmi les relations"
-#: forms.py:537 forms.py:865 forms.py:1321 models.py:111 models.py:451
+#: forms.py:537 forms.py:865 forms.py:1326 models.py:111 models.py:459
msgid "Comment"
msgstr "Commentaire"
#: forms.py:538
msgid "Abstract (full text search)"
-msgstr "Résumé (recherche texte intégral)"
+msgstr "Résumé (recherche en texte intégral)"
-#: forms.py:540 forms.py:868 models.py:453
+#: forms.py:540 forms.py:868 models.py:461
msgid "Comment about scientific documentation"
-msgstr "Commentaire concernant la documentation scientifique"
+msgstr "Commentaire relatif à la documentation scientifique"
-#: forms.py:541 forms.py:870 models.py:467
+#: forms.py:541 forms.py:870 models.py:475
msgid "Record quality"
msgstr "Qualité d'enregistrement"
-#: forms.py:542 forms.py:836 models.py:415
+#: forms.py:542 forms.py:836 models.py:423
msgid "Report processing"
msgstr "Traitement du rapport"
-#: forms.py:544 forms.py:873 models.py:462
+#: forms.py:544 forms.py:873 models.py:470
msgid "Virtual operation"
msgstr "Opération virtuelle"
-#: forms.py:546 forms.py:1217 forms.py:1221 models.py:134
+#: forms.py:546 forms.py:1222 forms.py:1226 models.py:136
msgid "Archaeological site"
-msgstr "Entité archéologique"
+msgstr "Entité (EA)"
-#: forms.py:552 forms.py:1472
+#: forms.py:552 forms.py:1486
msgid "Created by"
msgstr "Créé par"
-#: forms.py:558 forms.py:1478
+#: forms.py:558 forms.py:1492
msgid "Modified by"
msgstr "Modifié par"
@@ -260,7 +256,7 @@ msgstr "Date limite de versement de la documentation avant"
msgid "Documentation deadline after"
msgstr "Date limite de versement de la documentation après"
-#: forms.py:569 forms.py:858 models.py:474
+#: forms.py:569 forms.py:858 models.py:482
msgid "Documentation received"
msgstr "Documentation reçue"
@@ -272,11 +268,11 @@ msgstr "Date limite de versement du mobilier avant"
msgid "Finds deadline after"
msgstr "Date limite de versement du mobilier après"
-#: forms.py:575 forms.py:863 models.py:478
+#: forms.py:575 forms.py:863 models.py:486
msgid "Finds received"
msgstr "Mobilier reçu"
-#: forms.py:621 forms.py:1413 views.py:189
+#: forms.py:621 forms.py:1427 views.py:191
msgid "Operation search"
msgstr "Rechercher une opération"
@@ -284,12 +280,12 @@ msgstr "Rechercher une opération"
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:669 forms.py:966 models.py:644 models.py:1077 models.py:1195
+#: forms.py:669 forms.py:963 models.py:655 models.py:1110 models.py:1228
#: wizards.py:83
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: forms.py:676 forms.py:680 models.py:469
+#: forms.py:676 forms.py:680 models.py:477
msgid "Abstract"
msgstr "Résumé"
@@ -305,7 +301,7 @@ msgstr "mois"
msgid "years"
msgstr "années"
-#: forms.py:686 models.py:364
+#: forms.py:686 models.py:372
msgid "Creation date"
msgstr "Date de création"
@@ -357,7 +353,7 @@ msgstr "Avec un rapport"
msgid "With finds"
msgstr "Avec du mobilier"
-#: forms.py:763 forms.py:1300 forms.py:1527
+#: forms.py:763 forms.py:1305 forms.py:1541
#: templates/ishtar/sheet_administrativeact.html:23
#: templates/ishtar/sheet_operation.html:36 templates/ishtar/sheet_site.html:37
msgid "General"
@@ -367,11 +363,11 @@ msgstr "Général"
msgid "Operation - 010 - General"
msgstr "Opération - 010 - Général"
-#: forms.py:783 models.py:449
+#: forms.py:783 models.py:457
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:792 models.py:417
+#: forms.py:792 models.py:425
msgid "Old code"
msgstr "Ancien code"
@@ -379,7 +375,7 @@ msgstr "Ancien code"
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:814 models.py:448
+#: forms.py:814 models.py:456
msgid "Operator reference"
msgstr "Référence de l'opérateur"
@@ -387,43 +383,39 @@ msgstr "Référence de l'opérateur"
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:831 models.py:57 models.py:367 models.py:1611
+#: forms.py:831 models.py:57 models.py:375 models.py:1644
msgid "Start date"
msgstr "Date de début"
-#: forms.py:832 models.py:369
+#: forms.py:832 models.py:377
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:834 models.py:370
+#: forms.py:834 models.py:378
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
-#: forms.py:855 models.py:471
+#: forms.py:855 models.py:479
msgid "Deadline for submission of the documentation"
msgstr "Date limite de versement de la documentation"
-#: forms.py:860 models.py:476
+#: forms.py:860 models.py:484
msgid "Deadline for submission of the finds"
msgstr "Date limite de versement du mobilier"
-#: forms.py:875
-msgid "Image"
-msgstr "Image"
-
-#: forms.py:917
+#: forms.py:914
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
"Avant de renseigner la date de fin de chantier, il est nécessaire de "
"renseigner une date de début."
-#: forms.py:922
+#: forms.py:919
msgid "The excavation end date cannot be before the start date."
msgstr ""
"La date de fin de chantier ne peut être antérieure à la date de début."
-#: forms.py:952
+#: forms.py:949
#, python-format
msgid ""
"Operation code already exists for year: %(year)d - use a value bigger than "
@@ -432,220 +424,232 @@ msgstr ""
"Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:956
+#: forms.py:953
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:962 models.py:659 models.py:1029
+#: forms.py:959 models.py:670 models.py:1063
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:997 templates/ishtar/sheet_operation.html:135
+#: forms.py:994 templates/ishtar/sheet_operation.html:135
msgid "Court-ordered seizure"
msgstr "Saisie judiciaire"
-#: forms.py:998
+#: forms.py:995
msgid "Operation - 015 - Court-ordered seizure"
msgstr "Opération - 015 - Saisie judiciaire"
-#: forms.py:1002 models.py:481
+#: forms.py:999 models.py:489
msgid "Seizure name"
msgstr "Nom de la saisie"
-#: forms.py:1005 models.py:482
+#: forms.py:1002 models.py:490
msgid "Official report number"
msgstr "Numéro de procès-verbal"
-#: forms.py:1008 models.py:484
+#: forms.py:1005 models.py:492
msgid "Name of the protagonist"
msgstr "Nom du protagoniste"
-#: forms.py:1013 forms.py:1020 models.py:384
+#: forms.py:1010 forms.py:1017 models.py:392
msgid "Collaborators"
msgstr "Collaborateurs"
-#: forms.py:1014
+#: forms.py:1011
msgid "Operation - 020 - Collaborators"
msgstr "Opération - 020 - Collaborateurs"
+#: forms.py:1028 forms.py:1354 models.py:132 models.py:462
+msgid "Images"
+msgstr "Images"
+
#: forms.py:1029
+msgid "Operation - 025 - Images"
+msgstr "Opération - 025 - Images"
+
+#: forms.py:1034
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:1030
+#: forms.py:1035
msgid "Operation - 033 - Preventive - Excavation"
msgstr "Opération - 033 - Préventif - Fouille"
-#: forms.py:1033 models.py:401
+#: forms.py:1038 models.py:409
#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr "Coût (euros)"
-#: forms.py:1034 models.py:406
+#: forms.py:1039 models.py:414
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:1036 models.py:409
+#: forms.py:1041 models.py:417
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:1038 models.py:412
+#: forms.py:1043 models.py:420
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
-#: forms.py:1048
+#: forms.py:1053
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:1049
+#: forms.py:1054
msgid "Operation - 037 - Preventive - Diagnostic"
msgstr "Opération - 037 - Préventif - Diagnostic"
-#: forms.py:1054 models.py:432
+#: forms.py:1059 models.py:440
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:1056 models.py:435
+#: forms.py:1061 models.py:443
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:1059 models.py:437
+#: forms.py:1064 models.py:445
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:1063 forms.py:1079 forms.py:1084 forms.py:1341 models.py:109
-#: models.py:399 models.py:1218
+#: forms.py:1068 forms.py:1084 forms.py:1089 forms.py:1346 models.py:109
+#: models.py:407 models.py:1251
msgid "Towns"
msgstr "Communes"
-#: forms.py:1080
+#: forms.py:1085
msgid "Operation - 040 - Towns"
msgstr "Opération - 040 - Communes"
-#: forms.py:1085
+#: forms.py:1090
msgid "Operation - 040 - Towns (2)"
msgstr "Opération - 040 - Communes (2)"
-#: forms.py:1093 models.py:1415 models.py:1609
+#: forms.py:1098 models.py:1448 models.py:1642
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:1107
+#: forms.py:1112
msgid "Operation - 050 - Parcels"
msgstr "Opération - 050 - Parcelles"
-#: forms.py:1114
+#: forms.py:1119
msgid "Operation - 050 - Parcels (2)"
msgstr "Opération - 050 - Parcelles (2)"
-#: forms.py:1144 models.py:47
+#: forms.py:1149 models.py:47
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:1145
+#: forms.py:1150
msgid "Operation - 060 - Remains"
msgstr "Opération - 060 - Vestiges"
-#: forms.py:1151 models.py:46
+#: forms.py:1156 models.py:46
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:1161
+#: forms.py:1166
msgid "Operation - 070 - Periods"
msgstr "Opération - 070 - Périodes"
-#: forms.py:1167 templates/ishtar/sheet_operation.html:250
-#: templates/ishtar/sheet_operation.html:287
+#: forms.py:1172 templates/ishtar/sheet_operation.html:259
+#: templates/ishtar/sheet_operation.html:296
msgid "Period"
msgstr "Période"
-#: forms.py:1176 forms.py:1265 forms.py:1305 models.py:102
+#: forms.py:1181 forms.py:1270 forms.py:1310 models.py:102
msgid "Reference"
msgstr "Référence"
-#: forms.py:1200 forms.py:1335
+#: forms.py:1205 forms.py:1340
msgid "This reference already exists."
msgstr "Cette référence existe déjà."
-#: forms.py:1232 models.py:135 models.py:459
-#: templates/ishtar/sheet_operation.html:171
+#: forms.py:1237 models.py:137 models.py:467
+#: templates/ishtar/sheet_operation.html:180
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: forms.py:1234
+#: forms.py:1239
msgid "Operation - 030 - Archaeological sites"
msgstr "Opération - 030 - Sites archéologiques"
-#: forms.py:1239
+#: forms.py:1244
msgid "Associated archaeological sites"
msgstr "Entités archéologiques associées"
-#: forms.py:1245 ishtar_menu.py:109 ishtar_menu.py:139 ishtar_menu.py:168
+#: forms.py:1250 ishtar_menu.py:109 ishtar_menu.py:139 ishtar_menu.py:168
#: ishtar_menu.py:210
msgid "Search"
msgstr "Recherche"
-#: forms.py:1250
+#: forms.py:1255
msgid "Would you like to close this operation?"
msgstr "Voulez-vous clore cette opération ?"
-#: forms.py:1255
+#: forms.py:1260
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1295
+#: forms.py:1300
msgid "You should select an item."
msgstr "Vous devez sélectionner un élément."
-#: forms.py:1301
+#: forms.py:1306
msgid "Archaeological site - 010 - General"
msgstr "Site archéologique - 010 - Général"
-#: forms.py:1314 models.py:116
+#: forms.py:1319 models.py:116
msgid "National Geographic Institute locality"
msgstr "Lieu-dit IGN"
-#: forms.py:1318 models.py:119
+#: forms.py:1323 models.py:119
msgid "Cadastral locality"
msgstr "Lieu-dit cadastre"
-#: forms.py:1342
+#: forms.py:1347
msgid "Archaeological site - 020 - Towns"
msgstr "Site archéologique - 020 - Villes"
-#: forms.py:1351 templates/ishtar/sheet_site.html:56
+#: forms.py:1355
+msgid "Archaeological site - 025 - Images"
+msgstr "Site archéologique - 025 - Images"
+
+#: forms.py:1364 templates/ishtar/sheet_site.html:56
msgid "Underwater"
msgstr "Sous-marin / subaquatique"
-#: forms.py:1352
+#: forms.py:1365
msgid "Archaeological site - 030 - Underwater"
msgstr "Site archéologique - 030 - Sous-marin / subaquatique"
-#: forms.py:1356 models.py:123
+#: forms.py:1369 models.py:123
msgid "Shipwreck name"
msgstr "Nom de l'épave"
-#: forms.py:1358 models.py:127
+#: forms.py:1371 models.py:127
msgid "Shipwreck code"
msgstr "Code épave"
-#: forms.py:1360 models.py:129
+#: forms.py:1373 models.py:129
msgid "Sinking date"
msgstr "Date de naufrage"
-#: forms.py:1362 models.py:131
+#: forms.py:1375 models.py:131
msgid "Discovery area"
msgstr "Zone de découverte"
-#: forms.py:1364 models.py:125
+#: forms.py:1377 models.py:125
msgid "Oceanographic service localisation"
msgstr "Localisation SHOM"
-#: forms.py:1376 forms.py:1454 forms.py:1594 models.py:1038 models.py:1175
+#: forms.py:1390 forms.py:1468 forms.py:1610 models.py:1072 models.py:1208
msgid "Index"
msgstr "Index"
-#: forms.py:1406
+#: forms.py:1420
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
@@ -654,52 +658,52 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:1419
+#: forms.py:1433
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:1427
+#: forms.py:1441
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: forms.py:1440
+#: forms.py:1454
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:1442
+#: forms.py:1456
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1462 forms.py:1533 models.py:1091 models.py:1169
+#: forms.py:1476 forms.py:1544 models.py:1124 models.py:1202
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:1463 forms.py:1664
+#: forms.py:1477 forms.py:1680
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1469 forms.py:1538 models.py:1209
+#: forms.py:1483 forms.py:1549 models.py:1242
#: templates/ishtar/blocks/window_tables/administrativacts.html:9
msgid "Object"
msgstr "Objet"
-#: forms.py:1507 views.py:452
+#: forms.py:1521 views.py:466
msgid "Administrative act search"
msgstr "Rechercher un acte administratif"
-#: forms.py:1522 forms.py:1622 forms.py:1689
+#: forms.py:1536 forms.py:1638 forms.py:1705
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1528
-msgid "Operation - Administrative act - General"
-msgstr "Opération - Acte administratif - Général"
-
-#: forms.py:1541 models.py:1206
+#: forms.py:1552 models.py:1239
msgid "Signature date"
msgstr "Date de signature"
-#: forms.py:1582
+#: forms.py:1564
+msgid "Operation - Administrative act - General"
+msgstr "Opération - Acte administratif - Général"
+
+#: forms.py:1598
#, python-format
msgid ""
"This index already exists for year: %(year)d - use a value bigger than "
@@ -708,31 +712,31 @@ msgstr ""
"Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus "
"grande que %(last_val)d"
-#: forms.py:1586
+#: forms.py:1602
msgid "Bad index"
msgstr "Mauvais index"
-#: forms.py:1599
+#: forms.py:1615
msgid "Would you like to delete this administrative act?"
msgstr "Voulez-vous supprimer cet acte administratif ?"
-#: forms.py:1604
+#: forms.py:1620
msgid "Template"
msgstr "Patron"
-#: forms.py:1628 forms.py:1632
+#: forms.py:1644 forms.py:1648
msgid "This document is not intended for this type of act."
msgstr "Ce document n'est pas destiné à ce type d'acte."
-#: forms.py:1650
+#: forms.py:1666
msgid "Doc generation"
msgstr "Génération de document"
-#: forms.py:1652
+#: forms.py:1668
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:1673 ishtar_menu.py:198 views.py:505
+#: forms.py:1689 ishtar_menu.py:198 views.py:519
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
@@ -753,7 +757,7 @@ msgstr "Clôture"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:134 models.py:1225
+#: ishtar_menu.py:134 models.py:1258
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr "Acte administratif"
@@ -778,17 +782,17 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:240 models.py:495
+#: ishtar_menu.py:240 models.py:503
#: templates/ishtar/dashboards/dashboard_operation.html:8
#: templates/ishtar/sheet_site.html:67
msgid "Operations"
msgstr "Opérations"
-#: models.py:56 models.py:76 models.py:2089
+#: models.py:56 models.py:76 models.py:2122
msgid "Order"
msgstr "Ordre"
-#: models.py:58 models.py:1612
+#: models.py:58 models.py:1645
msgid "End date"
msgstr "Date de fin"
@@ -816,345 +820,341 @@ msgstr "Types d'état de rapport"
msgid "Top operation"
msgstr "Opération chapeau"
-#: models.py:182
+#: models.py:184
msgid "Unknown"
msgstr "Inconnu"
-#: models.py:185
+#: models.py:187
msgid "Virtual operation of site: {}"
msgstr "Opération virtuelle du site : {}"
-#: models.py:240
+#: models.py:248
msgid "Not documented"
msgstr "Non documenté"
-#: models.py:241
+#: models.py:249
msgid "Arbitrary"
msgstr "Arbitraire"
-#: models.py:242
+#: models.py:250
msgid "Reliable"
msgstr "Fiable"
-#: models.py:328
+#: models.py:336
msgid "Associated file (label)"
msgstr "Dossier associé (nom)"
-#: models.py:329
+#: models.py:337
msgid "Operator name"
msgstr "Nom de l'opérateur"
-#: models.py:330
+#: models.py:338
msgid "Scientist (full name)"
msgstr "Responsable scientifique (nom complet)"
-#: models.py:331
+#: models.py:339
msgid "Associated file (external ID)"
-msgstr "Dossier associé (identifiant externe)"
+msgstr "Dossier associé (identifiant)"
-#: models.py:332
+#: models.py:340
msgid "Scientist (title)"
msgstr "Responsable scientifique (titre)"
-#: models.py:333
+#: models.py:341
msgid "Scientist (surname)"
msgstr "Responsable scientifique (nom)"
-#: models.py:334
+#: models.py:342
msgid "Scientist (name)"
msgstr "Scientifique (nom)"
-#: models.py:335
+#: models.py:343
msgid "Scientist - Organization (name)"
msgstr "Scientifique - Organisation (nom)"
-#: models.py:336
+#: models.py:344
msgid "In charge (title)"
msgstr "Responsable du suivi scientifique (titre)"
-#: models.py:337
+#: models.py:345
msgid "In charge (surname)"
msgstr "Responsable du suivi scientifique (prénom)"
-#: models.py:338
+#: models.py:346
msgid "In charge (name)"
msgstr "Responsable du suivi scientifique (nom)"
-#: models.py:339
+#: models.py:347
msgid "In charge - Organization (name)"
msgstr "Responsable du suivi scientifique - Organisation (nom)"
-#: models.py:344
+#: models.py:352
msgid "Archaeological sites (reference)"
msgstr "Entités archéologiques (référence)"
-#: models.py:366 templates/ishtar/sheet_operation.html:57
+#: models.py:374 templates/ishtar/sheet_operation.html:57
msgid "Closing date"
msgstr "Date de clôture"
-#: models.py:373
+#: models.py:381
msgid "In charge scientist"
msgstr "Responsable du suivi scientifique"
-#: models.py:392 models.py:1395
+#: models.py:400 models.py:1428
msgid "File"
msgstr "Dossier"
-#: models.py:396
+#: models.py:404
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:454
-msgid "Images"
-msgstr "Images"
-
-#: models.py:456
+#: models.py:464
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:464
+#: models.py:472
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
"Si coché, cela signifie que cette opération n'a pas été officiellement "
"enregistrée."
-#: models.py:531
+#: models.py:539
msgid "OPE"
msgstr "OPE"
-#: models.py:607
+#: models.py:618
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:645
+#: models.py:656
msgid "Code patriarche"
msgstr "Code patriarche"
-#: models.py:685
+#: models.py:696
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:712
+#: models.py:741
msgid "Number of parcels"
msgstr "Nombre de parcelles"
-#: models.py:722
+#: models.py:751
msgid "Number of administrative acts"
msgstr "Nombre d'actes administratifs"
-#: models.py:730
+#: models.py:759
msgid "Number of indexed administrative acts"
msgstr "Nombre d'actes administratifs indexés"
-#: models.py:738
+#: models.py:767
msgid "Number of context records"
msgstr "Nombre d'Unités d'Enregistrement"
-#: models.py:774
+#: models.py:803
msgid "Number of finds"
msgstr "Nombre d'éléments de mobilier"
-#: models.py:819
+#: models.py:848
msgid "No type"
msgstr "Pas de type"
-#: models.py:850
+#: models.py:879
msgid "Number of sources"
msgstr "Nombre de documents"
-#: models.py:892 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:921 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr "Moyenne"
-#: models.py:954
+#: models.py:988
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:955
+#: models.py:989
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:968
+#: models.py:1002
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:969
+#: models.py:1003
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:1028
+#: models.py:1062
msgid "Operation year"
msgstr "Année de l'opération"
-#: models.py:1030
+#: models.py:1064
msgid "Document code"
msgstr "Code du document"
-#: models.py:1042
+#: models.py:1076
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:1043
+#: models.py:1077
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:1046
+#: models.py:1080
msgid "Can view all Operation sources"
msgstr "Peut voir toutes les Documentations d'opération"
-#: models.py:1048
+#: models.py:1082
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Documentation d'opération"
-#: models.py:1050
+#: models.py:1084
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Documentation d'opération"
-#: models.py:1052
+#: models.py:1086
msgid "Can change own Operation source"
msgstr "Peut modifier sa propre Documentation d'opération"
-#: models.py:1054
+#: models.py:1088
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Documentation d'opération"
-#: models.py:1079 models.py:1200
+#: models.py:1112 models.py:1233
msgid "Treatment request"
msgstr "Demande de traitement"
-#: models.py:1080 models.py:1205
+#: models.py:1113 models.py:1238
msgid "Treatment"
msgstr "Traitement"
-#: models.py:1082
+#: models.py:1115
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:1084
+#: models.py:1117
msgid "Code"
msgstr "Code"
-#: models.py:1087
+#: models.py:1120
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:1088
+#: models.py:1121
msgid "Indexed"
msgstr "Indexé"
-#: models.py:1092
+#: models.py:1125
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:1160 models.py:1246
+#: models.py:1193 models.py:1279
#: templates/ishtar/blocks/window_tables/administrativacts.html:6
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Ref."
msgstr "Réf."
-#: models.py:1173
+#: models.py:1206
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:1179
+#: models.py:1212
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:1187
+#: models.py:1220
msgid "Signatory"
msgstr "Signataire"
-#: models.py:1215
+#: models.py:1248
msgid "Departments"
msgstr "Départements"
-#: models.py:1216
+#: models.py:1249
msgid "Cached values get from associated departments"
msgstr "Valeur en cache des départements associés"
-#: models.py:1219
+#: models.py:1252
msgid "Cached values get from associated towns"
msgstr "Valeur en cache des communes associées"
-#: models.py:1226 templates/ishtar/sheet_operation.html:179
-#: templates/ishtar/sheet_operation.html:221
+#: models.py:1259 templates/ishtar/sheet_operation.html:188
+#: templates/ishtar/sheet_operation.html:230
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:1340
+#: models.py:1373
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:1408
+#: models.py:1441
msgid "External ID"
-msgstr "ID externe"
+msgstr "Identifiant"
-#: models.py:1411
+#: models.py:1444
msgid "External ID is set automatically"
-msgstr "L'identifiant externe est configuré automatiquement"
+msgstr "L'identifiant est attribué automatiquement"
-#: models.py:1412
+#: models.py:1445
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:1607
+#: models.py:1640
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:1615
+#: models.py:1648
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:1616
+#: models.py:1649
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:1650
+#: models.py:1683
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:1651
+#: models.py:1684
msgid "Effective"
msgstr "Effectif"
-#: models.py:1652
+#: models.py:1685
msgid "Active"
msgstr "Actif"
-#: models.py:1653
+#: models.py:1686
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:1654
+#: models.py:1687
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:1655
+#: models.py:1688
msgid "Closed"
msgstr "Clos"
-#: models.py:1656
+#: models.py:1689
msgid "Documented and closed"
msgstr "Documenté et clos"
-#: models.py:2090
+#: models.py:2123
msgid "Is preventive"
msgstr "Préventif"
-#: models.py:2093
+#: models.py:2126
msgid "Operation type old"
msgstr "Type d'opération - ancien"
-#: models.py:2094
+#: models.py:2127
msgid "Operation types old"
msgstr "Types d'opération - ancien"
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
-#: templates/ishtar/sheet_operation.html:240
-#: templates/ishtar/sheet_operation.html:304
+#: templates/ishtar/sheet_operation.html:249
+#: templates/ishtar/sheet_operation.html:313
msgid "Type"
msgstr "Type"
@@ -1198,12 +1198,12 @@ msgstr "État"
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:463
#: templates/ishtar/dashboards/dashboard_operation.html:687
-#: templates/ishtar/sheet_operation.html:240
-#: templates/ishtar/sheet_operation.html:250
-#: templates/ishtar/sheet_operation.html:267
-#: templates/ishtar/sheet_operation.html:277
-#: templates/ishtar/sheet_operation.html:287
-#: templates/ishtar/sheet_operation.html:304
+#: templates/ishtar/sheet_operation.html:249
+#: templates/ishtar/sheet_operation.html:259
+#: templates/ishtar/sheet_operation.html:276
+#: templates/ishtar/sheet_operation.html:286
+#: templates/ishtar/sheet_operation.html:296
+#: templates/ishtar/sheet_operation.html:313
msgid "Number"
msgstr "Nombre"
@@ -1452,62 +1452,62 @@ msgstr "Code d'opération Patriarche non renseigné !"
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_operation.html:175
+#: templates/ishtar/sheet_operation.html:184
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_operation.html:183
+#: templates/ishtar/sheet_operation.html:192
msgid "Document from this operation"
msgstr "Documents de cette opération"
-#: templates/ishtar/sheet_operation.html:189
-#: templates/ishtar/sheet_operation.html:232
+#: templates/ishtar/sheet_operation.html:198
+#: templates/ishtar/sheet_operation.html:241
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:194
+#: templates/ishtar/sheet_operation.html:203
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:199
+#: templates/ishtar/sheet_operation.html:208
msgid "Documents from associated context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_operation.html:204
-#: templates/ishtar/sheet_operation.html:259
+#: templates/ishtar/sheet_operation.html:213
+#: templates/ishtar/sheet_operation.html:268
#: templates/ishtar/sheet_site.html:72
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:209
+#: templates/ishtar/sheet_operation.html:218
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_operation.html:214
+#: templates/ishtar/sheet_operation.html:223
msgid "Associated containers"
msgstr "Contenants associés"
-#: templates/ishtar/sheet_operation.html:218
+#: templates/ishtar/sheet_operation.html:227
msgid "Statistics"
msgstr "Statistiques"
-#: templates/ishtar/sheet_operation.html:219
+#: templates/ishtar/sheet_operation.html:228
msgid "These numbers are updated hourly"
msgstr "Ces chiffres sont mis à jour toutes les heures"
-#: templates/ishtar/sheet_operation.html:267
+#: templates/ishtar/sheet_operation.html:276
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_operation.html:277
+#: templates/ishtar/sheet_operation.html:286
msgid "Object type"
msgstr "Type d'objet"
-#: templates/ishtar/sheet_operation.html:296
+#: templates/ishtar/sheet_operation.html:305
msgid "Sources"
msgstr "Documents"
-#: templates/ishtar/sheet_operation.html:314
+#: templates/ishtar/sheet_operation.html:323
msgid "Finds by context records"
msgstr "Mobilier par Unités d'Enregistrement"
@@ -1523,66 +1523,71 @@ msgstr "Opération associée"
msgid "This act is indexed!"
msgstr "Cet acte est indexé !"
-#: tests.py:508
+#: tests.py:509
msgid "New objects will be created."
msgstr "De nouveaux objets vont être créés."
-#: tests.py:538
+#: tests.py:539
msgid "This line have been already imported."
msgstr "Cette ligne a déjà été importée."
-#: tests.py:574
+#: tests.py:575
msgid ""
"The following error(s) has been encountered while parsing the source file:"
msgstr ""
"Le(s) erreur(s) suivante(s) ont été rencontrées lors de l'analyse du fichier "
"source :"
-#: views.py:251
+#: views.py:254
msgid "New operation"
msgstr "Ajouter une opération"
-#: views.py:300
+#: views.py:304
msgid "Operation modification"
msgstr "Modifier une opération"
-#: views.py:328
+#: views.py:315
+msgid "You don't have sufficient permissions to do this action."
+msgstr ""
+"Vous n'avez pas les permissions suffisantes pour effectuer cette action."
+
+#: views.py:340
msgid "Operation closing"
msgstr "Clôturer une opération"
-#: views.py:339
+#: views.py:351
msgid "Operation deletion"
msgstr "Supprimer une opération"
-#: views.py:404
+#: views.py:418
msgid "Site deletion"
msgstr "Suppression du site"
-#: views.py:411
+#: views.py:425
msgid "Operation: source search"
msgstr "Opération : rechercher une documentation associée"
-#: views.py:419
+#: views.py:433
msgid "Operation: source creation"
msgstr "Opération : ajouter une documentation associée"
-#: views.py:431
+#: views.py:445
msgid "Operation: source modification"
msgstr "Opération : modifier une documentation associée"
-#: views.py:446
+#: views.py:460
msgid "Operation: source deletion"
msgstr "Opération : supprimer une documentation associée"
-#: views.py:465
+#: views.py:479
msgid "Operation: new administrative act"
msgstr "Opération : ajouter un acte administratif"
-#: views.py:475
+#: views.py:489
msgid "Operation: administrative act modification"
msgstr "Opération : modification d'un acte administratif"
-#: views.py:499
+#: views.py:513
msgid "Operation: administrative act deletion"
msgstr "Opération : supprimer un acte administratif"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index b0ec89e0e..f451964c8 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -10,181 +10,184 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2018-05-31 06:38+0000\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
-=======
"PO-Revision-Date: 2018-06-04 03:34+0000\n"
"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
->>>>>>> Update translations
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 4.4.5\n"
-#: forms.py:41 forms.py:110 ishtar_menu.py:40 models.py:70 models.py:209
+#: forms.py:42 forms.py:111 ishtar_menu.py:40 models.py:73 models.py:220
#: templates/ishtar/sheet_warehouse.html:4
msgid "Warehouse"
-msgstr "Dépôt"
+msgstr "Lieu de conservation"
-#: forms.py:50 forms.py:55 models.py:532
+#: forms.py:51 forms.py:56 models.py:543
msgid "Division"
msgstr "Division"
-#: forms.py:57 models.py:235
+#: forms.py:58 models.py:246
msgid "Order"
msgstr "Ordre"
-#: forms.py:71
+#: forms.py:72
msgid "There are identical divisions."
msgstr "Il y a des divisions identiques"
-#: forms.py:76 models.py:58
+#: forms.py:77 models.py:63
msgid "Divisions"
msgstr "Divisions"
-#: forms.py:77
+#: forms.py:78
msgid "Warehouse - 020 - Divisions"
msgstr "Lieu de conservation - 020 - Divisions"
-#: forms.py:82 forms.py:248
+#: forms.py:83 forms.py:257
msgid "Full text search"
msgstr "Recherche en texte intégral"
-#: forms.py:84 forms.py:116 models.py:50 models.py:206
+#: forms.py:85 forms.py:117 models.py:55 models.py:217
msgid "Name"
msgstr "Nom"
-#: forms.py:85 forms.py:118 models.py:39 models.py:52
+#: forms.py:86 forms.py:119 models.py:39 models.py:57
msgid "Warehouse type"
-msgstr "Type de dépôt"
+msgstr "Type de lieu de conservation"
-#: forms.py:86 forms.py:135
+#: forms.py:87 forms.py:136
msgid "Town"
msgstr "Commune"
-#: forms.py:98 views.py:100
+#: forms.py:99 views.py:100
msgid "Warehouse search"
-msgstr "Rechercher un dépôt"
+msgstr "Rechercher un lieu de conservation"
-#: forms.py:111
+#: forms.py:112
msgid "Warehouse - 010 - General"
msgstr "Lieu de conservation - 010 - Général"
-#: forms.py:121 models.py:55
+#: forms.py:122 models.py:60
msgid "Person in charge"
msgstr "Responsable"
-#: forms.py:127 forms.py:195 models.py:56 models.py:301
+#: forms.py:128 forms.py:204 models.py:61 models.py:312
msgid "Comment"
-msgstr "Commentaires"
+msgstr "Commentaire"
-#: forms.py:129
+#: forms.py:130
msgid "Address"
msgstr "Adresse"
-#: forms.py:131
+#: forms.py:132
msgid "Address complement"
msgstr "Complément d'adresse"
-#: forms.py:133
+#: forms.py:134
msgid "Postal code"
msgstr "Code postal"
-#: forms.py:136
+#: forms.py:137
msgid "Country"
msgstr "Pays"
-#: forms.py:138
+#: forms.py:139
msgid "Phone"
msgstr "Téléphone"
-#: forms.py:139
+#: forms.py:140
msgid "Mobile phone"
msgstr "Téléphone mobile"
-#: forms.py:164 forms.py:165
+#: forms.py:167 models.py:66
+msgid "Images"
+msgstr "Images"
+
+#: forms.py:168
+msgid "Warehouse - 025 - Images"
+msgstr "Lieu de conservation - 025 - Images"
+
+#: forms.py:173 forms.py:174
msgid "Would you like to delete this warehouse?"
-msgstr "Voulez-vous supprimer ce dépôt ?"
+msgstr "Voulez-vous supprimer ce lieu de conservation?"
-#: forms.py:169 models.py:313 models.py:529
+#: forms.py:178 models.py:324 models.py:540
#: templates/ishtar/sheet_container.html:4
msgid "Container"
msgstr "Contenant"
-#: forms.py:170
+#: forms.py:179
msgid "Container - 010 - General"
msgstr "Contenant - 010 - Général"
-#: forms.py:176 forms.py:252 models.py:250
+#: forms.py:185 forms.py:261 models.py:261
msgid "Ref."
msgstr "Réf."
-#: forms.py:177 models.py:307
+#: forms.py:186 models.py:318
msgid "Old reference"
msgstr "Ancienne référence"
-#: forms.py:179 forms.py:251 models.py:253 models.py:299
+#: forms.py:188 forms.py:260 models.py:264 models.py:310
msgid "Container type"
msgstr "Type de contenant"
-#: forms.py:181
+#: forms.py:190
msgid "Current location (warehouse)"
-msgstr "Lieu actuel (dépôt)"
+msgstr "Localisation actuelle (lieu de conservation)"
-#: forms.py:187 models.py:296
+#: forms.py:196 models.py:307
msgid "Responsible warehouse"
-msgstr "Dépôt responsable"
+msgstr "Lieu de conservation responsable"
-#: forms.py:193
+#: forms.py:202
msgid "Image"
msgstr "Image"
-#: forms.py:220
+#: forms.py:229
msgid "ID"
msgstr "Identifiant"
-#: forms.py:242
+#: forms.py:251
msgid "This ID already exists for this warehouse."
-msgstr "Cet identifiant existe déjà pour ce dépôt."
+msgstr "Cet identifiant existe déjà pour ce lieu de conservation."
-#: forms.py:263 forms.py:269 views.py:142
+#: forms.py:272 forms.py:278 views.py:144
msgid "Container search"
msgstr "Rechercher un contenant"
-#: forms.py:265 forms.py:271
+#: forms.py:274 forms.py:280
msgid "You should select a container."
msgstr "Vous devez sélectionner un contenant."
-#: forms.py:266
+#: forms.py:275
msgid "Add a new container"
msgstr "Ajouter un nouveau contenant"
-#: forms.py:276 ishtar_menu.py:36 views.py:95
+#: forms.py:285 ishtar_menu.py:36 views.py:95
msgid "Packaging"
msgstr "Conditionnement"
-#: forms.py:282
+#: forms.py:291
msgid "Packager"
msgstr "Personne assurant le conditionnement"
-#: forms.py:288
+#: forms.py:297
msgid "Date"
msgstr "Date"
-#: forms.py:292
+#: forms.py:301
msgid "Packaged finds"
msgstr "Mobilier conditionné"
-#: forms.py:296
+#: forms.py:305
msgid "Container - 020 - Localisation"
msgstr "Contenant - 020 - Localisation"
-#: forms.py:298 models.py:302
+#: forms.py:307 models.py:313
msgid "Localisation"
msgstr "Localisation"
-#: forms.py:322 forms.py:323
+#: forms.py:331 forms.py:332
msgid "Would you like to delete this container?"
msgstr "Voulez-vous supprimer ce contenant ?"
@@ -208,96 +211,96 @@ msgstr "Modification"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:57 models.py:314 templates/ishtar/sheet_warehouse.html:37
+#: ishtar_menu.py:57 models.py:325 templates/ishtar/sheet_warehouse.html:37
#: templates/ishtar/sheet_warehouse.html:68
msgid "Containers"
msgstr "Contenants"
#: models.py:40
msgid "Warehouse types"
-msgstr "Types de dépôt"
+msgstr "Types de lieu de conservation"
-#: models.py:61 models.py:308
+#: models.py:68 models.py:319
msgid "External ID"
-msgstr "ID externe"
+msgstr "Identifiant"
-#: models.py:63 models.py:310
+#: models.py:70 models.py:321
msgid "External ID is set automatically"
-msgstr "L'ID externe est attribué automatiquement"
+msgstr "L'identifiant est attribué automatiquement"
-#: models.py:71
+#: models.py:74
msgid "Warehouses"
-msgstr "Dépôts"
+msgstr "Lieux de conservation"
-#: models.py:208
+#: models.py:219
msgid "Description"
msgstr "Description"
-#: models.py:213 models.py:214
+#: models.py:224 models.py:225
msgid "Collection"
msgstr "Collection"
-#: models.py:223
+#: models.py:234
msgid "Warehouse division type"
-msgstr "Type de division de dépôt"
+msgstr "Type de division de lieu de conservation"
-#: models.py:224
+#: models.py:235
msgid "Warehouse division types"
-msgstr "Types de division de dépôt"
+msgstr "Types de division de lieu de conservation"
-#: models.py:246
+#: models.py:257
msgid "Length (mm)"
msgstr "Longueur (mm)"
-#: models.py:247
+#: models.py:258
msgid "Width (mm)"
msgstr "Largeur (mm)"
-#: models.py:248
+#: models.py:259
msgid "Height (mm)"
msgstr "Hauteur (mm)"
-#: models.py:249
+#: models.py:260
msgid "Volume (l)"
msgstr "Volume (l)"
-#: models.py:254
+#: models.py:265
msgid "Container types"
msgstr "Types de contenant"
-#: models.py:285
+#: models.py:296
msgid "Location - index"
-msgstr "Lieu - index"
+msgstr "Localisation - index"
-#: models.py:286
+#: models.py:297
msgid "Precise localisation"
msgstr "Localisation précise"
-#: models.py:287
+#: models.py:298
msgid "Type"
msgstr "Type"
-#: models.py:293
+#: models.py:304
msgid "Location (warehouse)"
-msgstr "Lieu (dépôt)"
+msgstr "Localisation (lieu de conservation)"
-#: models.py:300
+#: models.py:311
msgid "Container ref."
msgstr "Réf. du contenant"
-#: models.py:304
+#: models.py:315
msgid "Cached location"
-msgstr "Lieu - en cache"
+msgstr "Localisation - en cache"
-#: models.py:533
+#: models.py:544
msgid "Reference"
msgstr "Référence"
-#: models.py:536
+#: models.py:547
msgid "Container localisation"
msgstr "Localisation de contenant"
-#: models.py:537
+#: models.py:548
msgid "Container localisations"
msgstr "Localisations de contenant"
@@ -331,7 +334,7 @@ msgstr "Nombre de mobilier accueilli"
#: templates/ishtar/sheet_warehouse.html:58
msgid "Finds by location in the warehouse"
-msgstr "Mobilier par lieu dans le dépôt"
+msgstr "Mobilier par localisation dans le lieu de conservation"
#: templates/ishtar/sheet_warehouse.html:70
msgid "Number of containers"
@@ -339,44 +342,44 @@ msgstr "Nombre de contenants"
#: templates/ishtar/sheet_warehouse.html:75
msgid "Containers by location in the warehouse"
-msgstr "Contenants par lieu dans le dépôt"
+msgstr "Contenants par localisation dans le lieu de conservation"
#: templates/ishtar/wizard/wizard_containerlocalisation.html:7
msgid ""
"No division set for this warehouse. Define at least one division to localise "
"containers in this warehouse."
msgstr ""
-"Pas de division configurée pour ce dépôt. Définissez au moins une division "
-"pour localiser les contenants dans ce dépôt."
+"Pas de division configurée pour ce lieu de conservation. Définissez au moins "
+"une division pour localiser les contenants dans ce lieu de conservation."
#: templates/ishtar/wizard/wizard_warehouse_divisions.html:7
msgid ""
"Containers with localisation are associated to this warehouse. You cannot "
"change divisions."
msgstr ""
-"Des contenants localisés sont associés à ce dépôt. Vous ne pouvez pas "
-"modifier les divisions."
+"Des contenants localisés sont associés à ce lieu de conservation. Vous ne "
+"pouvez pas modifier les divisions."
-#: views.py:112
+#: views.py:113
msgid "Warehouse creation"
-msgstr "Ajouter un dépôt"
+msgstr "Ajouter un lieu de conservation"
-#: views.py:121
+#: views.py:123
msgid "Warehouse modification"
-msgstr "Modifier un dépôt"
+msgstr "Modifier un lieu de conservation"
-#: views.py:137
+#: views.py:139
msgid "Warehouse deletion"
-msgstr "Supprimer un dépôt"
+msgstr "Supprimer un lieu de conservation"
-#: views.py:153
+#: views.py:155
msgid "Container creation"
msgstr "Ajouter un contenant"
-#: views.py:162
+#: views.py:164
msgid "Container modification"
msgstr "Modifier un contenant"
-#: views.py:177
+#: views.py:179
msgid "Container deletion"
msgstr "Supprimer un contenant"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index 7d2d52f48..d14af4ebe 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -11,11 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2018-05-31 06:46+0000\n"
-=======
"PO-Revision-Date: 2018-06-04 03:46+0000\n"
->>>>>>> Update translations
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -34,66 +30,116 @@ msgstr "courriel"
msgid "Related item"
msgstr "Élément associé"
-#: admin.py:72
+#: admin.py:73
msgid "CSV file"
msgstr "Fichier CSV"
-#: admin.py:73
+#: admin.py:74
msgid "Only unicode encoding is managed - convert your file first"
msgstr "Seul l'unicode est géré - convertissez votre fichier d'abord"
-#: admin.py:78
+#: admin.py:98
msgid "Export selected as CSV file"
msgstr "Exporter la sélection en fichier CSV"
-#: admin.py:201 admin.py:220 models.py:813
+#: admin.py:206 templates/navbar.html:31
+msgid "Profile"
+msgstr "Profil"
+
+#: admin.py:207 forms_common.py:765 forms_common.py:785 forms_common.py:786
+#: models.py:2651
+msgid "Profiles"
+msgstr "Profils"
+
+#: admin.py:229 admin.py:248 models.py:838 models.py:3461
msgid "Parent"
msgstr "Parent"
-#: admin.py:208
+#: admin.py:236
msgid "Center"
msgstr "Centre"
-#: admin.py:210 models.py:2953
+#: admin.py:238 models.py:3341
msgid "Limit"
msgstr "Limite"
-#: admin.py:213 models.py:2963
+#: admin.py:241 models.py:3351
msgid "Town children"
msgstr "Communes enfants"
-#: admin.py:221
+#: admin.py:249
msgid "Parents"
msgstr "Parents"
-#: admin.py:365
+#: admin.py:397
msgid "The CSV file should at least have a slug/txt_idx column"
msgstr "Le fichier CSV doit avoir au minimum une colonne slug/txt_idx"
-#: admin.py:422
+#: admin.py:454
#, python-format
msgid "%d item(s) created."
msgstr "%d élément(s) créés."
-#: admin.py:426
+#: admin.py:458
#, python-format
msgid "%d item(s) updated."
msgstr "%d élément(s) mis à jour."
-#: admin.py:430
+#: admin.py:462
msgid "These parents are missing: {}"
msgstr "Ces parents sont manquants : {}"
-#: admin.py:646 models.py:1712
+#: admin.py:560
+msgid "{} importer type(s) duplicated: {}."
+msgstr "{} type(s) d''importeur dupliqué(s) : {}."
+
+#: admin.py:571 admin.py:626
+msgid "Duplicate"
+msgstr "Dupliquer"
+
+#: admin.py:615
+msgid "{} importer column(s) duplicated: {}."
+msgstr "{} colonne(s) dupliquée(s) : {}."
+
+#: admin.py:640
+msgid "{} importer column(s) right-shifted."
+msgstr "{} colonne(s) décalée(s) à droite."
+
+#: admin.py:651
+msgid "Shift right"
+msgstr "Décaler à droite"
+
+#: admin.py:676
+msgid "{} importer column(s) left-shifted."
+msgstr "{} colonne(s) décalée(s) à gauche."
+
+#: admin.py:682
+msgid "{} importer column(s) not left-shifted: no place available."
+msgstr ""
+"{} colonne(s) n''ont pas été décalée(s) à gauche : pas de place disponible."
+
+#: admin.py:694
+msgid "Shift left"
+msgstr "Décaler à gauche"
+
+#: admin.py:839
+msgid "Display selected"
+msgstr "Afficher les éléments sélectionnés"
+
+#: admin.py:840
+msgid "Hide selected"
+msgstr "Cacher les éléments sélectionnés"
+
+#: admin.py:864 models.py:1785
msgid "Form"
msgstr "Formulaire"
-#: admin.py:648 models.py:1737 models_imports.py:126
+#: admin.py:866 models.py:1810 models_imports.py:126
#: templates/ishtar/dashboards/dashboard_main.html:39
msgid "Users"
msgstr "Utilisateurs"
-#: admin.py:668 models.py:1781
+#: admin.py:886 models.py:1885
msgid "Field"
msgstr "Champ"
@@ -119,7 +165,7 @@ msgstr "Ishtar- Opération"
#: apps.py:40
msgid "Ishtar - Warehouse"
-msgstr "Ishtar - Dépôt"
+msgstr "Ishtar - Lieu de conservation"
#: apps.py:45
msgid "Ishtar - Common"
@@ -192,7 +238,7 @@ msgstr ""
msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d"
-#: data_importer.py:729 views.py:1946
+#: data_importer.py:729 views.py:2011
msgid "No data provided"
msgstr "Aucune donnée fournie"
@@ -225,7 +271,7 @@ msgstr ""
"L'élément {} avec les valeurs {} n'existe pas dans la base de données. Créez-"
"le d'abord ou corrigez votre fichier source."
-#: data_importer.py:1234 views.py:2024 views.py:2034
+#: data_importer.py:1234 views.py:2089 views.py:2099
msgid "Not imported"
msgstr "Non importé"
@@ -251,74 +297,74 @@ msgstr "* la requête correspond à plus de 10 résultats *"
msgid " or "
msgstr "ou"
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "line"
msgstr "ligne"
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "col"
msgstr "colonne"
-#: data_importer.py:1849
+#: data_importer.py:1869
msgid "error"
msgstr "erreur"
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "field"
msgstr "champ"
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "source"
msgstr "source"
-#: data_importer.py:1855
+#: data_importer.py:1875
msgid "result"
msgstr "résultat"
-#: data_importer.py:1871
+#: data_importer.py:1891
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr "\"%(value)s\" n'est pas dans %(values)s"
-#: forms.py:76
+#: forms.py:78
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
-#: forms.py:92 forms_common.py:725
+#: forms.py:94 forms_common.py:792
msgid "Confirm"
msgstr "Confirmer"
-#: forms.py:97
+#: forms.py:99
msgid "Are you sure you want to delete?"
msgstr "Êtes-vous sûr de vouloir supprimer ?"
-#: forms.py:216
+#: forms.py:301
msgid "There are identical items."
msgstr "Il y a des éléments identiques."
-#: forms.py:343 forms.py:344
+#: forms.py:432 forms.py:433
msgid "Closing date"
msgstr "Date de clôture"
-#: forms.py:356
+#: forms.py:445
msgid "You should select an item."
msgstr "Vous devez sélectionner un élément."
-#: forms.py:357
+#: forms.py:446
msgid "Add a new item"
msgstr "Ajouter un nouvel élément"
-#: forms.py:473 models.py:2021
+#: forms.py:562 models.py:2139
msgid "Template"
msgstr "Patron"
-#: forms_common.py:42 forms_common.py:60 forms_common.py:272
-#: forms_common.py:503 models.py:2152 models.py:2970
+#: forms_common.py:49 forms_common.py:67 forms_common.py:312
+#: forms_common.py:543 models.py:2270 models.py:3358
#: templates/blocks/JQueryAdvancedTown.html:19
msgid "Town"
msgstr "Commune"
-#: forms_common.py:44
+#: forms_common.py:51
msgid ""
"<p>Type name, department code of the town you would like to select. The "
"search is insensitive to case.</p>\n"
@@ -335,12 +381,17 @@ msgstr ""
"<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
"commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
-#: forms_common.py:69 forms_common.py:975 ishtar_menu.py:48 models.py:2457
-#: models.py:2656 models.py:2760 templates/ishtar/sheet_person.html:4
+#: forms_common.py:76 forms_common.py:1144 ishtar_menu.py:48 models.py:2573
+#: models.py:2802 models.py:2889 models.py:3010
+#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr "Personne"
-#: forms_common.py:140
+#: forms_common.py:117
+msgid "Associated images (web link to a zip file)"
+msgstr "Images associées (lien web vers un fichier zip)"
+
+#: forms_common.py:152
msgid ""
"This import type have no unicity type defined. Conservative import is not "
"possible."
@@ -348,9 +399,6 @@ msgstr ""
"Cet import n'a pas de clé d'unicité paramétrée. L'import conservateur n'est "
"pas possible."
-<<<<<<< HEAD
-#: forms_common.py:158
-=======
#: forms_common.py:157
msgid "You put either a file or a download link for images but not both."
msgstr ""
@@ -362,252 +410,284 @@ msgid "Invalid link or no file is available for this link."
msgstr "Lien invalide ou aucun fichier n'est disponible sur ce lien."
#: forms_common.py:198
->>>>>>> Update translations
msgid "Target"
msgstr "Cible"
-#: forms_common.py:159
+#: forms_common.py:199
msgid "Remember"
msgstr "Enregistrer"
-#: forms_common.py:177
+#: forms_common.py:217
msgid "Set to NULL"
msgstr "Mettre à la valeur NULL"
-#: forms_common.py:184
+#: forms_common.py:224
msgid "this import only"
msgstr "cet import seulement"
-#: forms_common.py:185
+#: forms_common.py:225
msgid "me"
msgstr "moi"
-#: forms_common.py:191
+#: forms_common.py:231
msgid "the current group: {}"
msgstr "le groupe actuel {}"
-#: forms_common.py:194
+#: forms_common.py:234
msgid "all users"
msgstr "tous les utilisateurs"
-#: forms_common.py:260 forms_common.py:422 forms_common.py:551
-#: ishtar_menu.py:76 models.py:2335 models.py:2431
+#: forms_common.py:300 forms_common.py:462 forms_common.py:592
+#: ishtar_menu.py:76 models.py:2453 models.py:2547
#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr "Organisation"
-#: forms_common.py:263 forms_common.py:302 forms_common.py:417
-#: forms_common.py:473 forms_common.py:546 models.py:964 models.py:977
-#: models.py:1538 models.py:1711 models.py:2017 models.py:2329 models.py:2443
-#: models.py:2901 models.py:2949 models.py:3167 models_imports.py:97
-#: models_imports.py:122 models_imports.py:431 models_imports.py:523
-#: models_imports.py:809 templates/ishtar/import_step_by_step.html:102
+#: forms_common.py:303 forms_common.py:342 forms_common.py:457
+#: forms_common.py:513 forms_common.py:587 forms_common.py:774
+#: forms_common.py:807 forms_common.py:1202 models.py:1011 models.py:1034
+#: models.py:1609 models.py:1784 models.py:2135 models.py:2447 models.py:2559
+#: models.py:2795 models.py:3159 models.py:3337 models.py:3570
+#: models_imports.py:97 models_imports.py:122 models_imports.py:431
+#: models_imports.py:523 models_imports.py:809
+#: templates/ishtar/import_step_by_step.html:102
#: templates/ishtar/import_step_by_step.html:270
#: templates/ishtar/import_table.html:27
#: templates/ishtar/sheet_organization.html:23
msgid "Name"
msgstr "Nom"
-#: forms_common.py:264 models.py:2305 models_imports.py:616
+#: forms_common.py:304 models.py:2423 models_imports.py:616
#: models_imports.py:617
msgid "Organization type"
msgstr "Type d'organisation"
-#: forms_common.py:266 forms_common.py:497 models.py:2147
+#: forms_common.py:306 forms_common.py:537 models.py:2265
#: templates/ishtar/blocks/sheet_address_section.html:3
msgid "Address"
msgstr "Adresse"
-#: forms_common.py:268 forms_common.py:500 models.py:2148
+#: forms_common.py:308 forms_common.py:540 models.py:2266
msgid "Address complement"
msgstr "Complément d'adresse"
-#: forms_common.py:270 forms_common.py:501 models.py:2150
+#: forms_common.py:310 forms_common.py:541 models.py:2268
msgid "Postal code"
msgstr "Code postal"
-#: forms_common.py:273 forms_common.py:504 models.py:2153
+#: forms_common.py:313 forms_common.py:544 models.py:2271
msgid "Country"
msgstr "Pays"
-#: forms_common.py:275 forms_common.py:419 forms_common.py:477
-#: forms_common.py:548 forms_common.py:673 models.py:2180
+#: forms_common.py:315 forms_common.py:459 forms_common.py:517
+#: forms_common.py:589 forms_common.py:714 models.py:2298
msgid "Email"
msgstr "Courriel"
-#: forms_common.py:276 forms_common.py:480 models.py:2165
-#: templates/ishtar/sheet_person.html:24
+#: forms_common.py:316 forms_common.py:520 models.py:2283
+#: templates/ishtar/sheet_person.html:27
#: templates/ishtar/wizard/wizard_person.html:33
msgid "Phone"
msgstr "Téléphone"
-#: forms_common.py:277 forms_common.py:489 models.py:2177
-#: templates/ishtar/sheet_person.html:42
+#: forms_common.py:317 forms_common.py:529 models.py:2295
+#: templates/ishtar/sheet_person.html:45
#: templates/ishtar/wizard/wizard_person.html:54
msgid "Mobile phone"
msgstr "Téléphone portable"
-#: forms_common.py:300 forms_common.py:415 forms_common.py:543
-#: forms_common.py:933
+#: forms_common.py:340 forms_common.py:455 forms_common.py:584
+#: forms_common.py:1102
msgid "Full text search"
msgstr "Recherche en texte intégral"
-#: forms_common.py:303 forms_common.py:420 forms_common.py:549 models.py:2331
-#: models.py:2828 models.py:2910 models_imports.py:662
+#: forms_common.py:343 forms_common.py:460 forms_common.py:590
+#: forms_common.py:771 forms_common.py:1201 models.py:1043 models.py:2449
+#: models.py:3077 models.py:3170 models_imports.py:662
+#: templates/ishtar/blocks/window_image.html:43
#: templates/ishtar/blocks/window_tables/documents.html:8
#: templates/ishtar/import_table.html:28
#: templates/ishtar/sheet_organization.html:25
msgid "Type"
msgstr "Type"
-#: forms_common.py:313 views.py:161
+#: forms_common.py:353 views.py:162
msgid "Organization search"
msgstr "Rechercher une organisation"
-#: forms_common.py:337
+#: forms_common.py:377
msgid "At least two items have to be selected."
msgstr "Au moins deux éléments doivent être sélectionnés."
-#: forms_common.py:355
+#: forms_common.py:395
msgid "Merge all items into"
msgstr "Fusionner tous les éléments dans"
-#: forms_common.py:389
+#: forms_common.py:429
msgid "Organization to merge"
msgstr "Organisation à fusionner"
-#: forms_common.py:418 forms_common.py:471 forms_common.py:547 models.py:2441
+#: forms_common.py:458 forms_common.py:511 forms_common.py:588 models.py:2557
#: templates/ishtar/sheet_organization.html:24
msgid "Surname"
msgstr "Prénom"
-#: forms_common.py:435 forms_common.py:532 views.py:126
+#: forms_common.py:475 forms_common.py:572 views.py:127
msgid "Person search"
msgstr "Rechercher une personne"
-#: forms_common.py:448
+#: forms_common.py:488
msgid "Person to merge"
msgstr "Personne à fusionner"
-#: forms_common.py:465 templates/ishtar/wizard/wizard_person.html:19
+#: forms_common.py:505 templates/ishtar/wizard/wizard_person.html:19
msgid "Identity"
msgstr "Identité"
-#: forms_common.py:468 forms_common.py:895 forms_common.py:942 models.py:2435
-#: models.py:2437 models.py:2825 models_imports.py:618
+#: forms_common.py:508 forms_common.py:1064 forms_common.py:1111 models.py:2551
+#: models.py:2553 models.py:3074 models_imports.py:618
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr "Titre"
-#: forms_common.py:469 models.py:2439
+#: forms_common.py:509 models.py:2555
msgid "Salutation"
msgstr "Formule d'appel"
-#: forms_common.py:475 models.py:2445
+#: forms_common.py:515 models.py:2561
msgid "Raw name"
msgstr "Nom brut"
-#: forms_common.py:478 models.py:2166
+#: forms_common.py:518 models.py:2284
msgid "Phone description"
msgstr "Type de téléphone"
-#: forms_common.py:481 models.py:2168 models.py:2170
+#: forms_common.py:521 models.py:2286 models.py:2288
msgid "Phone description 2"
msgstr "Type de téléphone 2"
-#: forms_common.py:483
+#: forms_common.py:523
msgid "Phone 2"
msgstr "Téléphone 2"
-#: forms_common.py:485 models.py:2174
+#: forms_common.py:525 models.py:2292
msgid "Phone description 3"
msgstr "Type de téléphone 3"
-#: forms_common.py:487 models.py:2172
+#: forms_common.py:527 models.py:2290
msgid "Phone 3"
msgstr "Téléphone 3"
-#: forms_common.py:492
+#: forms_common.py:532
msgid "Current organization"
msgstr "Organisation actuelle"
-#: forms_common.py:506 models.py:2155
+#: forms_common.py:546 models.py:2273
msgid "Other address: address"
msgstr "Autre adresse : adresse"
-#: forms_common.py:509 models.py:2158
+#: forms_common.py:549 models.py:2276
msgid "Other address: address complement"
msgstr "Autre adresse : complément d'adresse"
-#: forms_common.py:511 models.py:2159
+#: forms_common.py:551 models.py:2277
msgid "Other address: postal code"
msgstr "Autre adresse : code postal"
-#: forms_common.py:513 models.py:2161
+#: forms_common.py:553 models.py:2279
msgid "Other address: town"
msgstr "Autre adresse : ville"
-#: forms_common.py:515 models.py:2163
+#: forms_common.py:555 models.py:2281
msgid "Other address: country"
msgstr "Autre adresse : pays"
-#: forms_common.py:527
+#: forms_common.py:567
msgid "Already has an account"
msgstr "A déjà un compte"
-#: forms_common.py:545
+#: forms_common.py:586
msgid "Username"
msgstr "Nom d'utilisateur"
-#: forms_common.py:564
+#: forms_common.py:605
msgid "Account search"
msgstr "Rechercher un compte"
-#: forms_common.py:611 forms_common.py:651 forms_common.py:655 models.py:2381
+#: forms_common.py:652 forms_common.py:692 forms_common.py:696 models.py:2495
msgid "Person type"
msgstr "Type de personne"
-#: forms_common.py:667 forms_common.py:672 ishtar_menu.py:33
+#: forms_common.py:708 forms_common.py:713 ishtar_menu.py:33
msgid "Account"
msgstr "Compte"
-#: forms_common.py:676 wizards.py:1394
+#: forms_common.py:717 wizards.py:1630
msgid "New password"
msgstr "Nouveau mot de passe"
-#: forms_common.py:679
+#: forms_common.py:720
msgid "New password (confirmation)"
msgstr "Nouveau mot de passe (confirmation)"
-#: forms_common.py:706
+#: forms_common.py:747
msgid "Your password and confirmation password do not match."
msgstr "La vérification du mot de passe a échoué."
-#: forms_common.py:711
+#: forms_common.py:752
msgid "You must provide a correct password."
msgstr "Vous devez fournir un mot de passe correct."
-#: forms_common.py:719
+#: forms_common.py:760
msgid "This username already exists."
msgstr "Ce nom d'utilisateur existe déjà."
-#: forms_common.py:726
+#: forms_common.py:773 models.py:2798 models.py:3468
+msgid "Areas"
+msgstr "Zones"
+
+#: forms_common.py:793
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:735 forms_common.py:749 forms_common.py:750 models.py:2971
+#: forms_common.py:805 models.py:2800 views.py:1803
+msgid "Current profile"
+msgstr "Profil actuel"
+
+#: forms_common.py:808 models.py:2785 models.py:2797
+msgid "Profile type"
+msgstr "Type de profil"
+
+#: forms_common.py:811
+msgid "Duplicate this profile"
+msgstr "Dupliquer ce profil"
+
+#: forms_common.py:813
+msgid "Delete this profile"
+msgstr "Supprimer ce profil"
+
+#: forms_common.py:862
+msgid "A profile with the same name exists."
+msgstr "Un profil avec un nom identique existe"
+
+#: forms_common.py:894
+msgid " (duplicate)"
+msgstr "(copie)"
+
+#: forms_common.py:905 forms_common.py:919 forms_common.py:920 models.py:3359
+#: models.py:3458
msgid "Towns"
msgstr "Communes"
-#: forms_common.py:745
+#: forms_common.py:915
msgid "There are identical towns."
msgstr "Il y a des communes identiques."
-#: forms_common.py:832
+#: forms_common.py:1002
msgid "Only one choice can be checked."
msgstr "Seul un choix peut être coché."
-#: forms_common.py:879
+#: forms_common.py:1049
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
@@ -616,97 +696,99 @@ msgstr ""
"<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).</p>"
-#: forms_common.py:889
+#: forms_common.py:1059
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:890
+#: forms_common.py:1060
msgid "Source - General"
msgstr "Documentation - Général"
-#: forms_common.py:897 forms_common.py:943 models.py:2794 models_imports.py:619
+#: forms_common.py:1066 forms_common.py:1112 models.py:3043
+#: models_imports.py:619
msgid "Source type"
msgstr "Type de document"
-#: forms_common.py:899 forms_common.py:944
+#: forms_common.py:1068 forms_common.py:1113
msgid "Reference"
msgstr "Référence"
-#: forms_common.py:902 forms_common.py:945
+#: forms_common.py:1071 forms_common.py:1114
msgid "Internal reference"
msgstr "Référence interne"
-#: forms_common.py:906 models.py:2839
+#: forms_common.py:1075 models.py:3088
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:907 models.py:2841
+#: forms_common.py:1076 models.py:3090
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:841
+#: forms_common.py:1078 forms_common.py:1210 models.py:3092 models.py:3173
+#: models_imports.py:841 templates/ishtar/blocks/window_image.html:73
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:912 models.py:2846
+#: forms_common.py:1081 models.py:3095
msgid "Receipt date in documentation"
msgstr "Date de réception en documentation"
-#: forms_common.py:914 forms_common.py:947 models.py:448 models.py:2449
-#: models.py:2721 models.py:2853 models_imports.py:469
+#: forms_common.py:1083 forms_common.py:1116 models.py:473 models.py:2565
+#: models.py:2968 models.py:3102 models_imports.py:469
msgid "Comment"
msgstr "Commentaire"
-#: forms_common.py:916 forms_common.py:946 models.py:1543 models.py:2852
-#: models.py:2902 models_imports.py:124 models_imports.py:362
-#: models_imports.py:432
+#: forms_common.py:1085 forms_common.py:1115 forms_common.py:1207
+#: models.py:1614 models.py:3101 models.py:3160 models_imports.py:124
+#: models_imports.py:362 models_imports.py:432
msgid "Description"
msgstr "Description"
-#: forms_common.py:919 models.py:2854
+#: forms_common.py:1088 models.py:3103
msgid "Additional information"
msgstr "Information supplémentaire"
-#: forms_common.py:921 forms_common.py:950 models.py:2856
+#: forms_common.py:1090 forms_common.py:1119 models.py:3105
msgid "Has a duplicate"
msgstr "Existe en doublon"
-#: forms_common.py:924 models.py:2920
+#: forms_common.py:1093 forms_common.py:1199 models.py:3180
msgid "Image"
msgstr "Image"
-#: forms_common.py:939 forms_common.py:968 forms_common.py:1003 models.py:2766
-#: templates/ishtar/wizard/wizard_person_deletion.html:139
+#: forms_common.py:1108 forms_common.py:1137 forms_common.py:1172
+#: models.py:3015 templates/ishtar/wizard/wizard_person_deletion.html:139
msgid "Author"
msgstr "Auteur"
-#: forms_common.py:949
+#: forms_common.py:1118
msgid "Additional informations"
msgstr "Informations supplémentaires"
-#: forms_common.py:960
+#: forms_common.py:1129
msgid "Would you like to delete this documentation?"
msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:976 models.py:2750 models.py:2762 models_imports.py:620
+#: forms_common.py:1145 models.py:2997 models.py:3012 models_imports.py:620
msgid "Author type"
msgstr "Type d'auteur"
-#: forms_common.py:995
+#: forms_common.py:1164
msgid "Author selection"
msgstr "Sélection d'auteur"
-#: forms_common.py:1010
+#: forms_common.py:1179
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:1014 forms_common.py:1015 models.py:2767 models.py:2835
-#: models.py:2905 templates/ishtar/blocks/window_tables/documents.html:9
+#: forms_common.py:1184 forms_common.py:1185 forms_common.py:1204
+#: models.py:3016 models.py:3084 models.py:3165
+#: templates/ishtar/blocks/window_image.html:28
+#: templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
msgstr "Auteurs"
-<<<<<<< HEAD
-=======
#: forms_common.py:1190 models.py:3181
msgid "Images"
msgstr "Images"
@@ -733,7 +815,6 @@ msgstr "Image principale"
msgid "Only one image can be a main image"
msgstr "Une seule image peut être utilisée comme image principale"
->>>>>>> Update translations
#: ishtar_menu.py:29 templates/registration/activation_complete.html:10
msgid "Home"
msgstr "Accueil"
@@ -750,7 +831,7 @@ msgstr "Ajout/modification"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:40 models.py:1796 views.py:1762
+#: ishtar_menu.py:40 models.py:1914 views.py:1827
msgid "Global variables"
msgstr "Variables globales"
@@ -783,40 +864,40 @@ msgstr "Fusion manuelle"
msgid "Imports"
msgstr "Imports"
-#: ishtar_menu.py:113 views.py:1770
+#: ishtar_menu.py:113 views.py:1835
msgid "New import"
msgstr "Nouvel import"
-#: ishtar_menu.py:117 views.py:1789
+#: ishtar_menu.py:117 views.py:1854
msgid "Current imports"
msgstr "Imports en cours"
-#: ishtar_menu.py:121 views.py:2235
+#: ishtar_menu.py:121 views.py:2300
msgid "Old imports"
msgstr "Anciens imports"
-#: models.py:232
+#: models.py:229
msgid "Not a valid item."
msgstr "Élément invalide."
-#: models.py:247
+#: models.py:244
msgid "A selected item is not a valid item."
msgstr "Un élément sélectionné n'est pas valide."
-#: models.py:258
+#: models.py:255
msgid "This item already exists."
msgstr "Cet élément existe déjà."
-#: models.py:440 models.py:2112 models.py:2128 models.py:2720
+#: models.py:465 models.py:1896 models.py:2230 models.py:2246 models.py:2967
#: models_imports.py:358
msgid "Label"
-msgstr "Libellé"
+msgstr "Dénomination"
-#: models.py:442
+#: models.py:467
msgid "Textual ID"
msgstr "Identifiant textuel"
-#: models.py:445
+#: models.py:470
msgid ""
"The slug is the standardized version of the name. It contains only lowercase "
"letters, numbers and hyphens. Each slug must be unique."
@@ -825,12 +906,12 @@ msgstr ""
"lettres en minuscule, des nombres et des tirets (-). Chaque \"slug\" doit "
"être unique dans la typologie."
-#: models.py:449 models.py:1713 models.py:2024 models.py:2723
+#: models.py:474 models.py:1786 models.py:2142 models.py:2970
#: models_imports.py:138 models_imports.py:528
msgid "Available"
msgstr "Disponible"
-#: models.py:828 models.py:980 models_imports.py:549
+#: models.py:853 models.py:1037 models_imports.py:549
#: templates/ishtar/formset_import_match.html:21
#: templates/ishtar/import_step_by_step.html:171
#: templates/ishtar/import_step_by_step.html:199
@@ -839,24 +920,52 @@ msgstr "Disponible"
msgid "Key"
msgstr "Clé"
-#: models.py:834
+#: models.py:859
msgid "Specific key to an import"
msgstr "Clé spécifique à un import"
-#: models.py:965 models.py:986 models.py:1383 models.py:2747 models.py:3070
-#: models.py:3152
+#: models.py:998
+msgid "Generated relation image (SVG)"
+msgstr "Image des relations (SVG généré)"
+
+#: models.py:1012 models.py:1045 models.py:1451 models.py:1898 models.py:2994
+#: models.py:3473 models.py:3555
msgid "Order"
msgstr "Ordre"
-#: models.py:968
+#: models.py:1015
msgid "Json data - Menu"
msgstr "Données JSON - Menu"
-#: models.py:969
+#: models.py:1016
msgid "Json data - Menus"
msgstr "Données JSON - Menus"
-#: models.py:981
+#: models.py:1024
+msgid "Text"
+msgstr "Texte"
+
+#: models.py:1025
+msgid "Long text"
+msgstr "Texte long"
+
+#: models.py:1026 models_imports.py:658
+msgid "Integer"
+msgstr "Entier"
+
+#: models.py:1027 models_imports.py:659
+msgid "Float"
+msgstr "Nombre à virgule"
+
+#: models.py:1028 models_imports.py:661
+msgid "Date"
+msgstr "Date"
+
+#: models.py:1029
+msgid "Choices"
+msgstr "Choix"
+
+#: models.py:1038
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
"explain it. For instance for the key 'my_subkey' with data such as {'my_key':"
@@ -867,143 +976,159 @@ msgstr ""
"{'ma_clef': {'ma_sousclef': 'valeur'}}, sa valeur sera atteinte avec : "
"ma_clef__ma_sousclef."
-#: models.py:985
+#: models.py:1042
msgid "Display"
msgstr "Afficher"
-#: models.py:990
+#: models.py:1051
msgid "Json data - Field"
msgstr "Donnée JSON - Champ"
-#: models.py:991
+#: models.py:1052
msgid "Json data - Fields"
msgstr "Donnée JSON - Champs"
-#: models.py:1002
+#: models.py:1063
msgid "Content types of the field and of the menu do not match"
msgstr "Les types de contenu du champ et du menu ne correspondent pas"
-#: models.py:1062
+#: models.py:1123
msgid "Search vector"
msgstr "Vecteur de recherche"
-#: models.py:1063
+#: models.py:1124
msgid "Auto filled at save"
msgstr "Auto-rempli à la sauvegarde"
-#: models.py:1200
+#: models.py:1261
msgid "Last editor"
msgstr "Dernier éditeur"
-#: models.py:1203
+#: models.py:1264
msgid "Creator"
msgstr "Créateur"
-#: models.py:1384
+#: models.py:1444
+msgid "Above"
+msgstr "Au-dessus"
+
+#: models.py:1445
+msgid "Bellow"
+msgstr "En dessous"
+
+#: models.py:1446
+msgid "Equal"
+msgstr "Égal"
+
+#: models.py:1452
msgid "Symmetrical"
msgstr "Symétrique"
-#: models.py:1385
+#: models.py:1453
msgid "Tiny label"
-msgstr "Libellé court"
+msgstr "Dénomination courte"
-#: models.py:1388
+#: models.py:1456
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:1398
+#: models.py:1459
+msgid "Logical relation"
+msgstr "Relation logique"
+
+#: models.py:1469
msgid "Cannot have symmetrical and an inverse_relation"
msgstr "Ne peut pas être symétrique et avoir une relation inverse"
-#: models.py:1516
+#: models.py:1587
msgid "Euro"
msgstr "Euro"
-#: models.py:1517
+#: models.py:1588
msgid "US dollar"
msgstr "Dollar US"
-#: models.py:1518 views.py:1562 views.py:1623
+#: models.py:1589 views.py:1591 views.py:1652
msgid "Operations"
msgstr "Opérations"
-#: models.py:1519 views.py:1564 views.py:1627
+#: models.py:1590 views.py:1593 views.py:1656
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: models.py:1520
+#: models.py:1591
msgid "Site"
msgstr "Site"
-#: models.py:1520
+#: models.py:1591
msgid "Archaeological entity"
msgstr "Entité (EA)"
-#: models.py:1524
+#: models.py:1595
msgid "Site search"
msgstr "Rechercher un site"
-#: models.py:1525
+#: models.py:1596
msgid "New site"
msgstr "Ajouter un site"
-#: models.py:1526
+#: models.py:1597
msgid "Site modification"
msgstr "Modifier un site"
-#: models.py:1529
+#: models.py:1600
msgid "Archaeological entity search"
msgstr "Rechercher une entité archéologique"
-#: models.py:1530
+#: models.py:1601
msgid "New archaeological entity"
msgstr "Nouvelle entité archéologique"
-#: models.py:1531
+#: models.py:1602
msgid "Archaeological entity modification"
msgstr "Modifier une entité archéologique"
-#: models.py:1539 models.py:2018 models_imports.py:123
+#: models.py:1610 models.py:2136 models_imports.py:123
msgid "Slug"
msgstr "Identifiant texte"
-#: models.py:1540
+#: models.py:1611
msgid "Current active"
msgstr "Actuellement utilisé"
-#: models.py:1542
+#: models.py:1613
msgid "Activate experimental feature"
msgstr "Activer les fonctionnalités expérimentales"
-#: models.py:1544
+#: models.py:1615
msgid "Files module"
msgstr "Module Dossiers"
-#: models.py:1546
+#: models.py:1617
msgid "Archaeological site module"
msgstr "Module Site archéologique"
-#: models.py:1548
+#: models.py:1619
msgid "Archaeological site type"
msgstr "Type de site archéologique"
-#: models.py:1552
+#: models.py:1623
msgid "Context records module"
msgstr "Module Unités d'Enregistrement"
-#: models.py:1554
+#: models.py:1625
msgid "Finds module"
msgstr "Module Mobilier"
-#: models.py:1555
+#: models.py:1626
msgid "Need context records module"
msgstr "Nécessite le module Unités d'Enregistrement"
-#: models.py:1557
+#: models.py:1628
msgid "Find index is based on"
msgstr "Index mobilier basé sur"
-#: models.py:1559
+#: models.py:1630
msgid ""
"To prevent irrelevant indexes, change this parameter only if there is no "
"find in the database"
@@ -1011,35 +1136,35 @@ msgstr ""
"Pour éviter des index non pertinents, ne changer ce paramètre que s'il n'y a "
"pas encore de mobilier dans cette base de données"
-#: models.py:1562
+#: models.py:1633
msgid "Warehouses module"
-msgstr "Module Dépôts"
+msgstr "Module Lieu de conservation"
-#: models.py:1563
+#: models.py:1634
msgid "Need finds module"
msgstr "Nécessite le module mobilier"
-#: models.py:1564
+#: models.py:1635
msgid "Preservation module"
msgstr "Module de conservation"
-#: models.py:1566
+#: models.py:1637
msgid "Mapping module"
msgstr "Module cartographique"
-#: models.py:1567
+#: models.py:1638
msgid "Underwater module"
msgstr "Module sous-marin / subaquatique"
-#: models.py:1569
+#: models.py:1640
msgid "Parcel are mandatory for context records"
msgstr "Parcelles cadastrales obligatoires pour les Unités d'Enregistrement"
-#: models.py:1571
+#: models.py:1642
msgid "Home page"
msgstr "Page d'accueil"
-#: models.py:1572
+#: models.py:1643
#, python-brace-format
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
@@ -1049,109 +1174,109 @@ msgstr ""
"défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être "
"utilisé pour afficher une image au hasard."
-#: models.py:1576
+#: models.py:1647
msgid "File external id"
-msgstr "Identifiant externe de fichier"
+msgstr "Identifiant de fichier"
-#: models.py:1578
+#: models.py:1649
msgid ""
"Formula to manage file external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de dossiers. À manipuler avec "
-"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
-"l'import de données externes peut alors être destructif."
+"Formule pour gérer les identifiants de dossiers. À manipuler avec précaution."
+" Une formule incorrecte peut rendre l'application inutilisable et l'import "
+"de données externes peut alors être destructif."
-#: models.py:1583
+#: models.py:1654
msgid "Parcel external id"
-msgstr "Identifiant externe de parcelle"
+msgstr "Identifiant de parcelle"
-#: models.py:1586
+#: models.py:1657
msgid ""
"Formula to manage parcel external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de parcelles. À manipuler avec "
+"Formule pour gérer les identifiants de parcelles. À manipuler avec "
"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
"l'import de données externes peut alors être destructif."
-#: models.py:1591
+#: models.py:1662
msgid "Context record external id"
-msgstr "Identifiant externe d'unité d'enregistrement"
+msgstr "Identifiant d'unité d'enregistrement"
-#: models.py:1593
+#: models.py:1664
msgid ""
"Formula to manage context record external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes d'unités d'enregistrement. À "
-"manipuler avec précaution. Une formule incorrecte peut rendre l'application "
+"Formule pour gérer les identifiants d'unités d'enregistrement. À manipuler "
+"avec précaution. Une formule incorrecte peut rendre l'application "
"inutilisable et l'import de données externes peut alors être destructif."
-#: models.py:1598
+#: models.py:1669
msgid "Base find external id"
-msgstr "Identifiant externe de mobilier d'origine"
+msgstr "Identifiant de mobilier d'origine"
-#: models.py:1600
+#: models.py:1671
msgid ""
"Formula to manage base find external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de mobilier d'origine. À "
-"manipuler avec précaution. Une formule incorrecte peut rendre l'application "
-"inutilisable et l'import de données externes peut alors être destructif."
+"Formule pour gérer les identifiants de mobilier d'origine. À manipuler avec "
+"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
+"l'import de données externes peut alors être destructif."
-#: models.py:1605
+#: models.py:1676
msgid "Find external id"
-msgstr "Identifiant externe de mobilier"
+msgstr "Identifiant de mobilier"
-#: models.py:1607
+#: models.py:1678
msgid ""
"Formula to manage find external ID. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
"be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de mobilier. À manipuler avec "
-"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
-"l'import de données externes peut alors être destructif."
+"Formule pour gérer les identifiants de mobilier. À manipuler avec précaution."
+" Une formule incorrecte peut rendre l'application inutilisable et l'import "
+"de données externes peut alors être destructif."
-#: models.py:1612
+#: models.py:1683
msgid "Container external id"
-msgstr "ID externe du contenant"
+msgstr "ID du contenant"
-#: models.py:1614
+#: models.py:1685
msgid ""
"Formula to manage container external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de contenant. À manipuler avec "
+"Formule pour gérer les identifiants de contenant. À manipuler avec "
"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
"l'import de données externes peut alors être destructif."
-#: models.py:1619
+#: models.py:1690
msgid "Warehouse external id"
-msgstr "ID externe du dépôt"
+msgstr "Identifiant du lieu de conservation"
-#: models.py:1621
+#: models.py:1692
msgid ""
"Formula to manage warehouse external ID. Change this with care. With "
"incorrect formula, the application might be unusable and import of external "
"data can be destructive."
msgstr ""
-"Formule pour gérer les identifiants externes de dépôt. À manipuler avec "
-"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
-"l'import de données externes peut alors être destructif."
+"Formule pour gérer les identifiants de lieu de conservation. À manipuler "
+"avec précaution. Une formule incorrecte peut rendre l'application "
+"inutilisable et l'import de données externes peut alors être destructif."
-#: models.py:1626
+#: models.py:1697
msgid "Raw name for person"
msgstr "Nom brut pour une personne"
-#: models.py:1628
+#: models.py:1699
msgid ""
"Formula to manage person raw_name. Change this with care. With incorrect "
"formula, the application might be unusable and import of external data can "
@@ -1161,23 +1286,23 @@ msgstr ""
"Une formule incorrecte peut rendre l'application inutilisable et l'import de "
"données externes peut alors être destructif."
-#: models.py:1632
+#: models.py:1703
msgid "Currency"
msgstr "Devise"
-#: models.py:1636
+#: models.py:1707
msgid "Ishtar site profile"
msgstr "Profil d'instance Ishtar"
-#: models.py:1637
+#: models.py:1708
msgid "Ishtar site profiles"
msgstr "Profils d'instance Ishtar"
-#: models.py:1715
+#: models.py:1788
msgid "Enable this form"
msgstr "Activer ce formulaire"
-#: models.py:1716
+#: models.py:1789
msgid ""
"Disable with caution: disabling a form with mandatory fields may lead to "
"database errors."
@@ -1185,11 +1310,11 @@ msgstr ""
"Désactiver avec précaution : désactiver un formulaire avec des champs "
"obligatoires peut entraîner des erreurs dans la base de données."
-#: models.py:1719
+#: models.py:1792
msgid "Apply to all"
msgstr "S'applique à tous"
-#: models.py:1720
+#: models.py:1793
msgid ""
"Apply this form to all users. If set to True, selecting user and user type "
"is useless."
@@ -1197,35 +1322,48 @@ msgstr ""
"Activer ce formulaire pour tous les utilisateurs. Si mis à Vrai, "
"sélectionner des utilisateurs ou des types d'utilisateurs est inutile."
-#: models.py:1726
+#: models.py:1799
msgid "Custom form"
msgstr "Formulaire personnalisé"
-#: models.py:1727
+#: models.py:1800
msgid "Custom forms"
msgstr "Formulaires personnalisés"
-#: models.py:1743
+#: models.py:1816
msgid "User types"
msgstr "Types d'utilisateur"
-#: models.py:1784
+#: models.py:1888
msgid "Excluded field"
msgstr "Champ exclus"
-#: models.py:1785
+#: models.py:1889
msgid "Excluded fields"
msgstr "Champs exclus"
-#: models.py:1789
+#: models.py:1899 templates/blocks/form_flex_snippet.html:18
+#: templates/blocks/table_form_snippet.html:9
+msgid "Help"
+msgstr "Aide"
+
+#: models.py:1902
+msgid "Custom form - Json data field"
+msgstr "Formulaire personnalisé - Champ de donnée Json"
+
+#: models.py:1903
+msgid "Custom form - Json data fields"
+msgstr "Formulaire personnalisé - Champs de donnée Json"
+
+#: models.py:1907
msgid "Variable name"
msgstr "Nom de la variable"
-#: models.py:1790
+#: models.py:1908
msgid "Description of the variable"
msgstr "Description de la variable"
-#: models.py:1792 models_imports.py:550
+#: models.py:1910 models_imports.py:550
#: templates/ishtar/formset_import_match.html:22
#: templates/ishtar/import_step_by_step.html:172
#: templates/ishtar/import_step_by_step.html:200
@@ -1233,337 +1371,357 @@ msgstr "Description de la variable"
msgid "Value"
msgstr "Valeur"
-#: models.py:1795
+#: models.py:1913
msgid "Global variable"
msgstr "Variable globale"
-#: models.py:1922 models.py:1952
+#: models.py:2040 models.py:2070
msgid "Total"
msgstr "Total"
-#: models.py:1929 models.py:2113 models.py:2129
+#: models.py:2047 models.py:2231 models.py:2247
#: templates/ishtar/dashboards/dashboard_main_detail.html:211
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:5
-#: templates/ishtar/sheet_person.html:27
+#: templates/ishtar/sheet_person.html:30
msgid "Number"
msgstr "Nombre"
-#: models.py:2016
+#: models.py:2134
msgid "Administrative Act"
msgstr "Acte administratif"
-#: models.py:2023
+#: models.py:2141
msgid "Associated object"
msgstr "Objet associé"
-#: models.py:2028
+#: models.py:2146
msgid "Document template"
msgstr "Patron de document"
-#: models.py:2029
+#: models.py:2147
msgid "Document templates"
msgstr "Patrons de document"
-#: models.py:2117 models.py:2130 models.py:3190 models_imports.py:835
+#: models.py:2235 models.py:2248 models.py:3593 models_imports.py:835
msgid "State"
msgstr "État"
-#: models.py:2135 models.py:2957 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:2253 models.py:3345 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr "Département"
-#: models.py:2136
+#: models.py:2254
msgid "Departments"
msgstr "Départements"
-#: models.py:2176
+#: models.py:2294
msgid "Raw phone"
msgstr "Téléphone brut"
-#: models.py:2182
+#: models.py:2300
msgid "Alternative address is prefered"
msgstr "L'adresse alternative est préférée"
-#: models.py:2221
+#: models.py:2339
msgid "Tel: "
msgstr "Tél :"
-#: models.py:2225
+#: models.py:2343
msgid "Mobile: "
msgstr "Mobile :"
-#: models.py:2229
+#: models.py:2347
msgid "Email: "
msgstr "Courriel :"
-#: models.py:2234
+#: models.py:2352
msgid "Merge key"
msgstr "Clé de fusion"
-#: models.py:2306
+#: models.py:2424
msgid "Organization types"
msgstr "Types d'organisation"
-#: models.py:2336
+#: models.py:2454
msgid "Organizations"
msgstr "Organisations"
-#: models.py:2377
-msgid "Groups"
-msgstr "Groupes"
-
-#: models.py:2382
+#: models.py:2496
msgid "Person types"
msgstr "Types de personne"
-#: models.py:2395 models_imports.py:652
+#: models.py:2509 models_imports.py:652
msgid "Title type"
msgstr "Type de titre"
-#: models.py:2396
+#: models.py:2510
msgid "Title types"
msgstr "Types de titre"
-#: models.py:2407
+#: models.py:2521
msgid "Mr"
msgstr "M."
-#: models.py:2408
+#: models.py:2522
msgid "Miss"
msgstr "Mlle"
-#: models.py:2409
+#: models.py:2523
msgid "Mr and Mrs"
msgstr "M. et Mme"
-#: models.py:2410
+#: models.py:2524
msgid "Mrs"
msgstr "Mme"
-#: models.py:2411
+#: models.py:2525
msgid "Doctor"
msgstr "Dr."
-#: models.py:2447
+#: models.py:2563
msgid "Contact type"
msgstr "Type de contact"
-#: models.py:2450 models.py:2514
+#: models.py:2566 models.py:2645
msgid "Types"
msgstr "Types"
-#: models.py:2453
+#: models.py:2569
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:2458
+#: models.py:2574
msgid "Persons"
msgstr "Personnes"
-#: models.py:2659
+#: models.py:2781
+msgid "Groups"
+msgstr "Groupes"
+
+#: models.py:2786
+msgid "Profile types"
+msgstr "Types de profil"
+
+#: models.py:2805
+msgid "User profile"
+msgstr "Profil d'utilisateur"
+
+#: models.py:2806
+msgid "User profiles"
+msgstr "Profils d'utilisateurs"
+
+#: models.py:2841
+msgid " - duplicate"
+msgstr "- copie"
+
+#: models.py:2892
msgid "Advanced shortcut menu"
msgstr "Menu de raccourci (avancé)"
-#: models.py:2662
+#: models.py:2895
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:2663
+#: models.py:2896
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:2751
+#: models.py:2998
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:2795
+#: models.py:3044
msgid "Source types"
msgstr "Types de document"
-#: models.py:2805 models_imports.py:651
+#: models.py:3054 models_imports.py:651
msgid "Support type"
msgstr "Type de support"
-#: models.py:2806
+#: models.py:3055
msgid "Support types"
msgstr "Types de support"
-#: models.py:2815
+#: models.py:3064
msgid "Format type"
msgstr "Type de format"
-#: models.py:2816
+#: models.py:3065
msgid "Format types"
msgstr "Types de format"
-#: models.py:2826
+#: models.py:3075
msgid "External ID"
-msgstr "Identifiant externe"
+msgstr "Identifiant"
-#: models.py:2829
+#: models.py:3078
msgid "Support"
msgstr "Support"
-#: models.py:2831 models_imports.py:621
+#: models.py:3080 models_imports.py:621
msgid "Format"
msgstr "Format"
-#: models.py:2833
+#: models.py:3082
msgid "Scale"
msgstr "Échelle"
-#: models.py:2847
+#: models.py:3096
msgid "Item number"
msgstr "Numéro d'élément"
-#: models.py:2848 models.py:2914
-msgid "Ref."
-msgstr "Réf."
-
-#: models.py:2851 models.py:2917
-msgid "Internal ref."
-msgstr "Réf. interne"
+#: models.py:3136
+msgid "URL"
+msgstr "URL"
-#: models.py:2888
+#: models.py:3138
msgid "License type"
msgstr "Type de licence"
-#: models.py:2889
+#: models.py:3139
msgid "License types"
msgstr "Types de licence"
-#: models.py:2895
+#: models.py:3145
msgid "Image type"
msgstr "Type d'image"
-#: models.py:2896
+#: models.py:3146
msgid "Image types"
msgstr "Types d'images"
-#: models.py:2903
+#: models.py:3161
+msgid "Symbolic links"
+msgstr "Liens symboliques"
+
+#: models.py:3163
msgid "License"
msgstr "Licence"
-#: models.py:2907
+#: models.py:3167
msgid "Authors (raw)"
msgstr "Auteurs (brut)"
-#: models.py:2921
-msgid "Images"
-msgstr "Images"
-
-#: models.py:2950
+#: models.py:3338
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:2951
+#: models.py:3339
msgid "Localisation"
msgstr "Localisation"
-#: models.py:2959
+#: models.py:3347
msgid "Year of creation"
msgstr "Année de création"
-#: models.py:2960
+#: models.py:3348
msgid ""
"Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
"Remplir ce champ est nécessaire pour distinguer les anciennes communes des "
"nouvelles communes."
-#: models.py:2965
+#: models.py:3353
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:3071
+#: models.py:3462
+msgid "Only four level of parent are managed."
+msgstr "Seulement quatre niveaux de parents sont gérés."
+
+#: models.py:3467
+msgid "Area"
+msgstr "Zone"
+
+#: models.py:3474
msgid "Is preventive"
msgstr "Est du préventif"
-#: models.py:3072
+#: models.py:3475
msgid "Is judiciary"
msgstr "Est judiciaire"
-#: models.py:3075 models_imports.py:622
+#: models.py:3478 models_imports.py:622
msgid "Operation type"
msgstr "Type d'opération"
-#: models.py:3076
+#: models.py:3479
msgid "Operation types"
msgstr "Types d'opération"
-#: models.py:3115
+#: models.py:3518
msgid "Judiciary"
msgstr "Judiciaire"
-#: models.py:3117
+#: models.py:3520
msgid "Preventive"
msgstr "Préventif"
-#: models.py:3119
+#: models.py:3522
msgid "Research"
msgstr "Programmé"
-#: models.py:3154
+#: models.py:3557
msgid "Authority name"
msgstr "Registre"
-#: models.py:3155
+#: models.py:3558
msgid "Authority SRID"
msgstr "SRID"
-#: models.py:3158 models_imports.py:650
+#: models.py:3561 models_imports.py:650
msgid "Spatial reference system"
msgstr "Système de référence spatiale"
-#: models.py:3159
+#: models.py:3562
msgid "Spatial reference systems"
msgstr "Systèmes de référence spatiale"
-#: models.py:3166
+#: models.py:3569
msgid "Filename"
msgstr "Nom de fichier"
-#: models.py:3171
+#: models.py:3574
msgid "Administration script"
msgstr "Script d'administration"
-#: models.py:3172
+#: models.py:3575
msgid "Administration scripts"
msgstr "Scripts d'administration"
-#: models.py:3179
+#: models.py:3582
msgid "Scheduled"
msgstr "Planifié"
-#: models.py:3180
+#: models.py:3583
msgid "In progress"
msgstr "En cours"
-#: models.py:3181 models_imports.py:774
+#: models.py:3584 models_imports.py:774
msgid "Finished with errors"
msgstr "Terminé avec des erreurs"
-#: models.py:3182 models_imports.py:775
+#: models.py:3585 models_imports.py:775
msgid "Finished"
msgstr "Terminé"
-#: models.py:3195
+#: models.py:3598
msgid "Result"
msgstr "Résultat"
-#: models.py:3198
+#: models.py:3601
msgid "Administration task"
msgstr "Tâche d'administration"
-#: models.py:3199
+#: models.py:3602
msgid "Administration tasks"
msgstr "Tâches d'administration"
-#: models.py:3203
+#: models.py:3606
msgid "Unknown"
msgstr "Inconnu"
-#: models.py:3218
+#: models.py:3621
msgid ""
"ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
"administrator."
@@ -1571,7 +1729,7 @@ msgstr ""
"ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. "
"Contactez l'administrateur."
-#: models.py:3227
+#: models.py:3630
msgid ""
"Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
"relative paths, it can be a security issue and this is not allowed. Only put "
@@ -1582,11 +1740,11 @@ msgstr ""
"problème de sécurité et cela n'est pas permis. Seul un chemin complet est "
"permis."
-#: models.py:3238
+#: models.py:3641
msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
msgstr "ISHTAR_SCRIPT_DIR: « {} » n'est pas un répertoire valable."
-#: models.py:3254
+#: models.py:3657
msgid ""
"Script \"{}\" is not available in your script directory. Check your "
"configuration."
@@ -1661,7 +1819,7 @@ msgstr "Requis"
#: models_imports.py:366
msgid "Export field name"
-msgstr "Exporter le nom du champ"
+msgstr "Nom du champ à exporter"
#: models_imports.py:367
msgid ""
@@ -1723,11 +1881,11 @@ msgstr "Importeur - Cible"
msgid "Importer - Targets"
msgstr "Importeur - Cibles"
-#: models_imports.py:511 views.py:607
+#: models_imports.py:511 views.py:611
msgid "True"
msgstr "Oui"
-#: models_imports.py:512 views.py:609
+#: models_imports.py:512 views.py:613
msgid "False"
msgstr "Non"
@@ -1741,11 +1899,11 @@ msgstr "Tous les utilisateurs peuvent le modifier"
#: models_imports.py:531
msgid "Importer - Target key group"
-msgstr "Importeur - groupe de clé de rapprochement"
+msgstr "Importeur - Groupe de clé de rapprochement"
#: models_imports.py:532
msgid "Importer - Target key groups"
-msgstr "Importeur - groupes de clé de rapprochement"
+msgstr "Importeur - Groupes de clé de rapprochement"
#: models_imports.py:551
msgid "Is set"
@@ -1835,22 +1993,10 @@ msgstr "Type d'identification"
msgid "Context record relation type"
msgstr "Type de relations entre Unités d'Enregistrement"
-#: models_imports.py:658
-msgid "Integer"
-msgstr "Entier"
-
-#: models_imports.py:659
-msgid "Float"
-msgstr "Nombre à virgule"
-
#: models_imports.py:660
msgid "String"
msgstr "Chaîne de caractères"
-#: models_imports.py:661
-msgid "Date"
-msgstr "Date"
-
#: models_imports.py:663
#: templates/ishtar/dashboards/dashboard_main_detail.html:196
msgid "Year"
@@ -2056,7 +2202,8 @@ msgstr "Archiver"
msgid "Unarchive"
msgstr "Désarchiver"
-#: models_imports.py:974 templates/ishtar/form_delete.html:11 widgets.py:258
+#: models_imports.py:974 templates/ishtar/form_delete.html:11 widgets.py:349
+#: widgets.py:381
msgid "Delete"
msgstr "Supprimer"
@@ -2124,12 +2271,12 @@ msgid "View on site"
msgstr "Voir sur le site"
#: templates/admin/change_form.html:24 templates/admin/change_form.html:27
-#: views.py:2000 views.py:2005
+#: views.py:2065 views.py:2070
msgid "Previous"
msgstr "Précédent"
#: templates/admin/change_form.html:32 templates/admin/change_form.html:35
-#: views.py:2008 views.py:2011
+#: views.py:2073 views.py:2076
msgid "Next"
msgstr "Suivant"
@@ -2175,7 +2322,7 @@ msgstr "Éléments courants"
#: templates/base.html:69 templates/blocks/bs_form_snippet.html:49
#: templates/ishtar/manage_basket.html:4 templates/welcome.html:11
#: templates/welcome.html:12 templates/welcome.html:13
-#: templates/welcome.html:14
+#: templates/welcome.html:14 wizards.py:468
msgid ":"
msgstr " :"
@@ -2320,11 +2467,6 @@ msgstr "."
msgid "Show / hide advanced search"
msgstr "Afficher/cacher la recherche avancée"
-#: templates/blocks/form_flex_snippet.html:18
-#: templates/blocks/table_form_snippet.html:9
-msgid "Help"
-msgstr "Aide"
-
#: templates/ishtar/blocks/advanced_shortcut_menu.html:6
#: templates/ishtar/blocks/shortcut_menu.html:6
#: templates/ishtar/blocks/shortcut_menu.html:11
@@ -2407,8 +2549,6 @@ msgstr "Modification"
msgid "Internal ID"
msgstr "ID interne"
-<<<<<<< HEAD
-=======
#: templates/ishtar/blocks/sheet_json.html:3
msgid "Data"
msgstr "Données"
@@ -2417,7 +2557,6 @@ msgstr "Données"
msgid "Licenses"
msgstr "Licences"
->>>>>>> Update translations
#: templates/ishtar/blocks/window_nav.html:17
msgid ""
"Are you sure to restore to this version? All changes made since this version "
@@ -2574,7 +2713,7 @@ msgstr "Tous ces éléments vont être supprimés avec cet import."
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: templates/ishtar/import_delete.html:20 wizards.py:394
+#: templates/ishtar/import_delete.html:20 wizards.py:438
msgid "Yes"
msgstr "Oui"
@@ -2612,7 +2751,7 @@ msgstr "Ligne"
msgid "Go"
msgstr "Aller"
-#: templates/ishtar/import_step_by_step.html:63 views.py:1850
+#: templates/ishtar/import_step_by_step.html:63 views.py:1915
msgid "Import step by step"
msgstr "Import pas à pas"
@@ -2622,7 +2761,7 @@ msgstr "ligne"
#: templates/ishtar/import_step_by_step.html:67
msgid "This line have been already imported."
-msgstr "Cette ligne a été déjà été importée."
+msgstr "Cette ligne a déjà été importée"
#: templates/ishtar/import_step_by_step.html:73
msgid ""
@@ -2851,57 +2990,57 @@ msgstr "Organisation de l'aménageur des dossiers"
msgid "Planning service of archaeological files"
msgstr "Service instructeur des dossiers"
-#: templates/ishtar/sheet_person.html:26
+#: templates/ishtar/sheet_person.html:29
#: templates/ishtar/wizard/wizard_person.html:38
msgid "Phone type"
msgstr "Type de téléphone"
-#: templates/ishtar/sheet_person.html:49
+#: templates/ishtar/sheet_person.html:52
#: templates/ishtar/wizard/wizard_person.html:64
msgid "Business address"
msgstr "Adresse professionnelle"
-#: templates/ishtar/sheet_person.html:58
+#: templates/ishtar/sheet_person.html:61
#: templates/ishtar/wizard/wizard_person.html:77
msgid "Other address"
msgstr "Autre adresse"
-#: templates/ishtar/sheet_person.html:67
+#: templates/ishtar/sheet_person.html:70
msgid "Associated organization"
msgstr "Organisation associée"
-#: templates/ishtar/sheet_person.html:79
+#: templates/ishtar/sheet_person.html:82
msgid "Associated operations as scientist"
msgstr "Opérations associées en tant que responsable scientifique"
-#: templates/ishtar/sheet_person.html:83
+#: templates/ishtar/sheet_person.html:86
msgid "Associated operations as responsible"
msgstr "Opérations associées en tant que responsable"
-#: templates/ishtar/sheet_person.html:88
+#: templates/ishtar/sheet_person.html:91
#: templates/ishtar/wizard/wizard_person_deletion.html:6
msgid "In charge of archaeological files"
msgstr "Responsable des dossiers"
-#: templates/ishtar/sheet_person.html:93
+#: templates/ishtar/sheet_person.html:96
#: templates/ishtar/wizard/wizard_person_deletion.html:15
msgid "General contractor of archaeological files"
msgstr "Aménageur des dossiers"
-#: templates/ishtar/sheet_person.html:98
+#: templates/ishtar/sheet_person.html:101
#: templates/ishtar/wizard/wizard_person_deletion.html:24
msgid "Responsible for planning service of archaeological files"
msgstr "Responsable pour le service instructeur des dossiers"
-#: templates/ishtar/sheet_person.html:104
+#: templates/ishtar/sheet_person.html:107
msgid "Documents associated to operations"
msgstr "Documents des opérations associées"
-#: templates/ishtar/sheet_person.html:109
+#: templates/ishtar/sheet_person.html:112
msgid "Documents associated to context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_person.html:114
+#: templates/ishtar/sheet_person.html:117
msgid "Documents associated to finds"
msgstr "Documents du mobilier associé"
@@ -3027,7 +3166,7 @@ msgstr "Actes administratifs : signataire"
#: templates/ishtar/wizard/wizard_person_deletion.html:96
msgid "In charge of warehouses"
-msgstr "Responsable des dépots"
+msgstr "Responsable des lieux de conservation"
#: templates/ishtar/wizard/wizard_person_deletion.html:104
msgid "Treatments of items"
@@ -3051,17 +3190,17 @@ msgstr "Possède des parcelles"
#: templates/navbar.html:12
msgid "Toggle navigation"
-msgstr "Changer la navigation"
+msgstr "Basculer la navigation"
-#: templates/navbar.html:28
-msgid "Log out"
-msgstr "Déconnexion"
-
-#: templates/navbar.html:31
+#: templates/navbar.html:34
msgid "Change password"
msgstr "Changement de mot de passe"
-#: templates/navbar.html:37 templates/registration/activate.html:10
+#: templates/navbar.html:37
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: templates/navbar.html:43 templates/registration/activate.html:10
#: templates/registration/login.html:7 templates/registration/login.html:34
#: templates/registration/password_reset_complete.html:8
msgid "Log in"
@@ -3211,31 +3350,31 @@ msgstr "tickets"
msgid "where the magic happens."
msgstr "c'est là que la magie opère."
-#: templates/widgets/image_input.html:14
+#: templates/widgets/image_input.html:19
msgid "delete"
msgstr "supprimer"
-#: templatetags/window_tables.py:99 widgets.py:780
+#: templatetags/window_tables.py:99 widgets.py:950
msgid "No results"
msgstr "Pas de résultats"
-#: templatetags/window_tables.py:100 widgets.py:781
+#: templatetags/window_tables.py:100 widgets.py:951
msgid "Loading..."
msgstr "Chargement..."
-#: utils.py:147
+#: utils.py:179
msgid " (...)"
msgstr " (...)"
-#: utils.py:209
+#: utils.py:243
msgid "Information"
msgstr "Information"
-#: utils.py:210
+#: utils.py:244
msgid "Load another random image?"
msgstr "Charger une autre image au hasard ?"
-#: views.py:102
+#: views.py:103
msgid ""
"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
"your admin to do it)."
@@ -3244,7 +3383,7 @@ msgstr ""
"default ». Changez-le sur la page d'administration (ou demandez à un "
"administrateur de le faire)."
-#: views.py:107
+#: views.py:108
msgid ""
"The slug of your current profile is set to \"default\". Change it on the "
"administration page (or ask your admin to do it)."
@@ -3252,140 +3391,153 @@ msgstr ""
"PROJECT_SLUG a été laissé à la valeur « default ». Changez-le dans le "
"fichier local_settings (ou demandez à un administrateur de le faire)."
-#: views.py:133
+#: views.py:134
msgid "New person"
msgstr "Ajouter une personne"
-#: views.py:141
+#: views.py:142
msgid "Person modification"
msgstr "Modifier une personne"
-#: views.py:156
+#: views.py:157
msgid "Person deletion"
msgstr "Supprimer une personne"
-#: views.py:167
+#: views.py:168
msgid "New organization"
msgstr "Ajouter une organisation"
-#: views.py:174
+#: views.py:175
msgid "Organization modification"
msgstr "Modifier une organisation"
-#: views.py:190
+#: views.py:191
msgid "Organization deletion"
msgstr "Supprimer une organisation"
-#: views.py:200
+#: views.py:202
msgid "Account management"
msgstr "Gérer les comptes"
-#: views.py:206
+#: views.py:208
msgid "Account deletion"
msgstr "Supprimer un compte"
-#: views.py:270
+#: views.py:272
msgid "Archaeological file"
msgstr "Dossier"
-#: views.py:271
+#: views.py:273
msgid "Operation"
msgstr "Opération"
-#: views.py:273
+#: views.py:275
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: views.py:275
+#: views.py:277
msgid "Find"
msgstr "Mobilier"
-#: views.py:277
+#: views.py:279
msgid "Treatment request"
msgstr "Demande de traitement"
-#: views.py:278
+#: views.py:280
msgid "Treatment"
msgstr "Traitement"
-#: views.py:1504 views.py:1544
+#: views.py:1528 views.py:1573
msgid "Operation not permitted."
msgstr "Opération non permise."
-#: views.py:1506
+#: views.py:1530
#, python-format
msgid "New %s"
msgstr "Nouveau %s"
-#: views.py:1561 views.py:1619
+#: views.py:1590 views.py:1648
msgid "Archaeological files"
msgstr "Dossiers"
-#: views.py:1566 views.py:1630
+#: views.py:1595 views.py:1659
msgid "Finds"
msgstr "Mobilier"
-#: views.py:1568 views.py:1635
+#: views.py:1597 views.py:1664
msgid "Treatment requests"
msgstr "Demandes de traitement"
-#: views.py:1569 views.py:1641
+#: views.py:1598 views.py:1670
msgid "Treatments"
msgstr "Traitements"
-#: views.py:2190
+#: views.py:2255
msgid "Col. "
msgstr "Col."
-#: views.py:2196 views.py:2208
+#: views.py:2261 views.py:2273
msgid "* empty *"
msgstr "* vide *"
-#: views.py:2249
+#: views.py:2314
msgid "Link unmatched items"
msgstr "Associer les éléments non rapprochés"
-#: views.py:2270
+#: views.py:2335
msgid "Delete import"
msgstr "Supprimer un import"
-#: views.py:2309
+#: views.py:2374
msgid "Merge persons"
msgstr "Fusionner des personnes"
-#: views.py:2333
+#: views.py:2398
msgid "Select the main person"
msgstr "Choisir la personne principale"
-#: views.py:2342
+#: views.py:2407
msgid "Merge organization"
msgstr "Fusionner des organisations"
-#: views.py:2352
+#: views.py:2417
msgid "Select the main organization"
msgstr "Sélectionner l'organisation principale"
-#: views.py:2392 views.py:2408
+#: views.py:2457 views.py:2473
msgid "Corporation manager"
msgstr "Représentant de la personne morale"
-#: widgets.py:355 widgets.py:489 widgets.py:604
+#: widgets.py:174
+msgid "The character \" is not accepted."
+msgstr "Le caractère \" n'est pas accepté"
+
+#: widgets.py:525 widgets.py:659 widgets.py:774
msgid "Search..."
msgstr "Recherche..."
-#: widgets.py:424
+#: widgets.py:594
msgid "Previous value:"
msgstr "Valeur précédente :"
-#: widgets.py:782
+#: widgets.py:952
msgid "Remove"
msgstr "Enlever"
-#: wizards.py:396
+#: wizards.py:76
+msgid "You don't have sufficient permissions to do this action."
+msgstr ""
+"Vous n'avez pas les permissions suffisantes pour effectuer cette action."
+
+#: wizards.py:440
msgid "No"
msgstr "Non"
-#: wizards.py:1459
+#: wizards.py:476
+msgid "Deleted"
+msgstr "Supprimé"
+
+#: wizards.py:1746
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr "[%(app_name)s] Création/modification du compte"