summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-25 14:04:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-25 14:04:55 +0200
commitc8583b83fee43b9068dc4a3345a5abca8b81e7e9 (patch)
treefd0d991638f2fc22e5065f873eaea9955f28a607
parent247ac765cb478ceefca96249641015bd10661d32 (diff)
downloadIshtar-c8583b83fee43b9068dc4a3345a5abca8b81e7e9.tar.bz2
Ishtar-c8583b83fee43b9068dc4a3345a5abca8b81e7e9.zip
Update french translations
-rw-r--r--archaeological_context_records/locale/django.pot349
-rw-r--r--archaeological_files/locale/django.pot310
-rw-r--r--archaeological_files_pdl/locale/django.pot65
-rw-r--r--archaeological_finds/locale/django.pot494
-rw-r--r--archaeological_operations/forms.py4
-rw-r--r--archaeological_operations/locale/django.pot608
-rw-r--r--ishtar_common/locale/django.pot891
-rw-r--r--translations/fr/archaeological_context_records.po371
-rw-r--r--translations/fr/archaeological_files.po320
-rw-r--r--translations/fr/archaeological_files_pdl.po67
-rw-r--r--translations/fr/archaeological_finds.po508
-rw-r--r--translations/fr/archaeological_operations.po622
-rw-r--r--translations/fr/archaeological_warehouse.po2
-rw-r--r--translations/fr/ishtar_common.po927
14 files changed, 2968 insertions, 2570 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index 8f8f1cdb1..35050a176 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -7,199 +7,211 @@
msgid ""
msgstr ""
-#: forms.py:45 forms.py:112 models.py:124
-#: templates/ishtar/sheet_contextrecord.html:72
+#: forms.py:46 forms.py:123 models.py:130
+#: templates/ishtar/sheet_contextrecord.html:57
msgid "ID"
msgstr ""
-#: forms.py:49
+#: forms.py:51
msgid "Code PATRIARCHE"
msgstr ""
-#: forms.py:50
+#: forms.py:52
msgid "Operation's year"
msgstr ""
-#: forms.py:52
+#: forms.py:54
msgid "Operation's number (index by year)"
msgstr ""
-#: forms.py:54
+#: forms.py:56
msgid "Archaelogical site"
msgstr ""
-#: forms.py:59 forms.py:178 models.py:48
+#: forms.py:62
+msgid "Search within operation relations"
+msgstr ""
+
+#: forms.py:64 forms.py:189 models.py:48
msgid "Period"
msgstr ""
-#: forms.py:60
+#: forms.py:65
msgid "Unit type"
msgstr ""
-#: forms.py:61
-msgid "Parcel (section/number)"
+#: forms.py:66
+msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:63
+#: forms.py:68
msgid "Search within relations"
msgstr ""
-#: forms.py:87 forms.py:274 views.py:111
+#: forms.py:98 forms.py:288 views.py:118
msgid "Context record search"
msgstr ""
-#: forms.py:101
+#: forms.py:112
msgid "You should at least select one context record."
msgstr ""
-#: forms.py:107
+#: forms.py:118
msgid "General"
msgstr ""
-#: forms.py:111 models.py:117 models.py:120
-#: templates/ishtar/sheet_contextrecord.html:76
+#: forms.py:122 models.py:117 models.py:126
+#: templates/ishtar/sheet_contextrecord.html:61
msgid "Parcel"
msgstr ""
-#: forms.py:114 models.py:125 templates/ishtar/sheet_contextrecord.html:42
-#: templates/ishtar/sheet_contextrecord.html:75
+#: forms.py:125 models.py:131 templates/ishtar/sheet_contextrecord.html:26
+#: templates/ishtar/sheet_contextrecord.html:60
msgid "Description"
msgstr ""
-#: forms.py:116 models.py:130
-msgid "Length (cm)"
+#: forms.py:127 models.py:136
+msgid "Length (m)"
msgstr ""
-#: forms.py:117 models.py:131
-msgid "Width (cm)"
+#: forms.py:128 models.py:137
+msgid "Width (m)"
msgstr ""
-#: forms.py:118 models.py:132
-msgid "Thickness (cm)"
+#: forms.py:129 models.py:138
+msgid "Thickness (m)"
msgstr ""
-#: forms.py:119 models.py:134
-msgid "Depth (cm)"
+#: forms.py:130 models.py:140
+msgid "Depth (m)"
msgstr ""
-#: forms.py:120 models.py:140
+#: forms.py:131 models.py:148
msgid "Unit"
msgstr ""
-#: forms.py:122 models.py:136
+#: forms.py:133 models.py:142
msgid "Location"
msgstr ""
-#: forms.py:167
+#: forms.py:178
msgid "This ID already exists for this operation."
msgstr ""
-#: forms.py:173 forms.py:197 models.py:59
+#: forms.py:184 forms.py:208 models.py:59
msgid "Dating"
msgstr ""
-#: forms.py:179 models.py:49
+#: forms.py:190 models.py:49
msgid "Start date"
msgstr ""
-#: forms.py:180 models.py:50 models.py:129
+#: forms.py:191 models.py:50 models.py:135
msgid "End date"
msgstr ""
-#: forms.py:181 models.py:53
+#: forms.py:192 models.py:53
msgid "Quality"
msgstr ""
-#: forms.py:182 models.py:35 models.py:51
+#: forms.py:193 models.py:35 models.py:51
msgid "Dating type"
msgstr ""
-#: forms.py:206 ishtar_menu.py:29 models.py:321
+#: forms.py:217 ishtar_menu.py:29 models.py:354
msgid "Context record"
msgstr ""
-#: forms.py:226
+#: forms.py:237
msgid "Relations"
msgstr ""
-#: forms.py:230 forms.py:237 models.py:145
-#: templates/ishtar/sheet_contextrecord.html:52
+#: forms.py:241 forms.py:251 models.py:153
+#: templates/ishtar/sheet_contextrecord.html:37
msgid "Interpretation"
msgstr ""
-#: forms.py:233 models.py:142
+#: forms.py:245
+msgid "Comments on dating"
+msgstr ""
+
+#: forms.py:247 models.py:150
msgid "Has furniture?"
msgstr ""
-#: forms.py:235 models.py:144
+#: forms.py:249 models.py:152
msgid "Filling"
msgstr ""
-#: forms.py:239 models.py:165
+#: forms.py:253 models.py:173
msgid "Activity"
msgstr ""
-#: forms.py:241 models.py:163
+#: forms.py:255 models.py:171
msgid "Identification"
msgstr ""
-#: forms.py:243 models.py:148
+#: forms.py:257 models.py:156
msgid "TAQ"
msgstr ""
-#: forms.py:244 models.py:152
+#: forms.py:258 models.py:160
msgid "Estimated TAQ"
msgstr ""
-#: forms.py:246 models.py:155
+#: forms.py:260 models.py:163
msgid "TPQ"
msgstr ""
-#: forms.py:247 models.py:159
+#: forms.py:261 models.py:167
msgid "Estimated TPQ"
msgstr ""
-#: forms.py:260
+#: forms.py:274
msgid "Operation search"
msgstr ""
-#: forms.py:262
+#: forms.py:276
msgid "You should select an operation."
msgstr ""
-#: forms.py:267
+#: forms.py:281
msgid "Would you like to delete this context record?"
msgstr ""
-#: forms.py:276
+#: forms.py:290
msgid "You should select a context record."
msgstr ""
-#: forms.py:281
-msgid "Town of the operation"
+#: forms.py:295
+msgid "Year of the operation"
msgstr ""
-#: forms.py:283
-msgid "Year of the operation"
+#: forms.py:297
+msgid "Numeric reference"
msgstr ""
-#: forms.py:285
+#: forms.py:303
+msgid "Town of the operation"
+msgstr ""
+
+#: forms.py:305
msgid "Period of the context record"
msgstr ""
-#: forms.py:287
+#: forms.py:307
msgid "Unit type of the context record"
msgstr ""
-#: forms.py:300
+#: forms.py:320
msgid "Documentation search"
msgstr ""
-#: forms.py:302
+#: forms.py:322
msgid "You should select a document."
msgstr ""
-#: ishtar_menu.py:31
+#: ishtar_menu.py:31 ishtar_menu.py:50
msgid "Search"
msgstr ""
@@ -207,11 +219,11 @@ msgstr ""
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:39 ishtar_menu.py:56
+#: ishtar_menu.py:39 ishtar_menu.py:61
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:43 ishtar_menu.py:62
+#: ishtar_menu.py:43 ishtar_menu.py:67
msgid "Deletion"
msgstr ""
@@ -219,7 +231,7 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: ishtar_menu.py:50
+#: ishtar_menu.py:55
msgid "Add"
msgstr ""
@@ -275,334 +287,325 @@ msgstr ""
msgid "Identification Types"
msgstr ""
-#: models.py:118
+#: models.py:123
msgid "External ID"
msgstr ""
-#: models.py:122 wizards.py:68
+#: models.py:125
+msgid "External ID is set automatically"
+msgstr ""
+
+#: models.py:128 wizards.py:68
msgid "Operation"
msgstr ""
-#: models.py:126
+#: models.py:132
msgid "Comment"
msgstr ""
-#: models.py:127
+#: models.py:133
msgid "Date d'ouverture"
msgstr ""
-#: models.py:137
+#: models.py:143
msgid "A short description of the location of the context record"
msgstr ""
-#: models.py:149
+#: models.py:146
+msgid "Comment on datings"
+msgstr ""
+
+#: models.py:157
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
msgstr ""
-#: models.py:153
+#: models.py:161
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr ""
-#: models.py:156
+#: models.py:164
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
msgstr ""
-#: models.py:160
+#: models.py:168
msgid "Estimation of a \"Terminus Post Quem\""
msgstr ""
-#: models.py:171 models.py:172 templates/ishtar/sheet_contextrecord.html:6
+#: models.py:176
+msgid "Point"
+msgstr ""
+
+#: models.py:177
+msgid "Polygon"
+msgstr ""
+
+#: models.py:181 models.py:182 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr ""
-#: models.py:174
+#: models.py:184
msgid "Can view all Context Records"
msgstr ""
-#: models.py:176
+#: models.py:186
msgid "Can view own Context Record"
msgstr ""
-#: models.py:178
+#: models.py:188
msgid "Can add own Context Record"
msgstr ""
-#: models.py:180
+#: models.py:190
msgid "Can change own Context Record"
msgstr ""
-#: models.py:182
+#: models.py:192
msgid "Can delete own Context Record"
msgstr ""
-#: models.py:191
+#: models.py:201
msgctxt "short"
msgid "Context record"
msgstr ""
-#: models.py:290
+#: models.py:320
msgid "Inverse relation"
msgstr ""
-#: models.py:294 templates/ishtar/sheet_contextrecord.html:71
+#: models.py:324 templates/ishtar/sheet_contextrecord.html:56
msgid "Relation type"
msgstr ""
-#: models.py:295
+#: models.py:325
msgid "Relation types"
msgstr ""
-#: models.py:308
+#: models.py:338
msgid "Record relation"
msgstr ""
-#: models.py:309
+#: models.py:339
msgid "Record relations"
msgstr ""
-#: models.py:318
+#: models.py:351
msgid "Context record documentation"
msgstr ""
-#: models.py:319
+#: models.py:352
msgid "Context record documentations"
msgstr ""
-#: views.py:121
+#: views.py:128
msgid "New context record"
msgstr ""
-#: views.py:131
+#: views.py:138
msgid "Context record modification"
msgstr ""
-#: views.py:145
+#: views.py:152
msgid "Context record deletion"
msgstr ""
-#: views.py:153
+#: views.py:157
+msgid "Context record: source search"
+msgstr ""
+
+#: views.py:165
msgid "Context record: new source"
msgstr ""
-#: views.py:161
+#: views.py:173
msgid "Context record: source modification"
msgstr ""
-#: views.py:167
+#: views.py:188
msgid "Context record: source deletion"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:13
-msgid "Previous version"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:17
-msgid "Are you sure to rollback to this version?"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Next version"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "Export as:"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "OpenOffice.org file"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "PDF file"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:23
-msgid "Modify"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:26
+#: templates/ishtar/sheet_contextrecord.html:9
msgid "Complete ID:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:28
-#: templates/ishtar/sheet_contextrecord.html:101
+#: templates/ishtar/sheet_contextrecord.html:11
+#: templates/ishtar/sheet_contextrecord.html:86
msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:29
+#: templates/ishtar/sheet_contextrecord.html:12
msgid "Temporary ID:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:32
+#: templates/ishtar/sheet_contextrecord.html:15
msgid "Creation date:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:33
+#: templates/ishtar/sheet_contextrecord.html:16
msgid "Created by:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:35
-#: templates/ishtar/sheet_contextrecord.html:114
+#: templates/ishtar/sheet_contextrecord.html:18
+#: templates/ishtar/sheet_contextrecord.html:98
msgid "Type:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:37
+#: templates/ishtar/sheet_contextrecord.html:20
msgid "Chronology:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:38
+#: templates/ishtar/sheet_contextrecord.html:22
msgid "Place:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:39
+#: templates/ishtar/sheet_contextrecord.html:23
msgid "Parcel:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:44
+#: templates/ishtar/sheet_contextrecord.html:28
msgid "Description:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:45
-#: templates/ishtar/sheet_contextrecord.html:117
+#: templates/ishtar/sheet_contextrecord.html:29
msgid "Comment:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:46
-msgid "Length (cm):"
+#: templates/ishtar/sheet_contextrecord.html:30
+msgid "Length (m):"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:47
-msgid "Width (cm):"
+#: templates/ishtar/sheet_contextrecord.html:31
+msgid "Width (m):"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:48
-msgid "Depth (cm):"
+#: templates/ishtar/sheet_contextrecord.html:32
+msgid "Depth (m):"
+msgstr ""
+
+#: templates/ishtar/sheet_contextrecord.html:33
+msgid "Thickness (m):"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:54
+#: templates/ishtar/sheet_contextrecord.html:39
msgid "Activity:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:55
+#: templates/ishtar/sheet_contextrecord.html:40
msgid "Identification:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:56
+#: templates/ishtar/sheet_contextrecord.html:41
msgid "Interpretation:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:60
+#: templates/ishtar/sheet_contextrecord.html:45
msgid "Datations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:61
+#: templates/ishtar/sheet_contextrecord.html:46
msgid "TAQ:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:62
+#: templates/ishtar/sheet_contextrecord.html:47
msgid "Estimated TAQ:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:63
+#: templates/ishtar/sheet_contextrecord.html:48
msgid "TPQ:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:64
+#: templates/ishtar/sheet_contextrecord.html:49
msgid "Estimated TPQ:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:68
+#: templates/ishtar/sheet_contextrecord.html:53
msgid "In relation with"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:73
+#: templates/ishtar/sheet_contextrecord.html:58
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:59
msgid "Chronology"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:87
-msgid "Details"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:95
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "Operation summary"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:96
+#: templates/ishtar/sheet_contextrecord.html:81
msgid "Year:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:99
+#: templates/ishtar/sheet_contextrecord.html:84
msgid "Patriarche OA code:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:89
msgid "Head scientist:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:106
+#: templates/ishtar/sheet_contextrecord.html:90
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:108
+#: templates/ishtar/sheet_contextrecord.html:92
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:110
+#: templates/ishtar/sheet_contextrecord.html:94
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:111
+#: templates/ishtar/sheet_contextrecord.html:95
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:112
+#: templates/ishtar/sheet_contextrecord.html:96
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:115
+#: templates/ishtar/sheet_contextrecord.html:99
msgid "Remains:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:116
+#: templates/ishtar/sheet_contextrecord.html:100
msgid "Periods:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:118
+#: templates/ishtar/sheet_contextrecord.html:103
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:119
+#: templates/ishtar/sheet_contextrecord.html:104
msgid "Towns:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:120
+#: templates/ishtar/sheet_contextrecord.html:105
msgid "Related operation:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:123
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "No operation linked to this context unit!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:126
+#: templates/ishtar/sheet_contextrecord.html:111
msgid "Document from this context record"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:131
+#: templates/ishtar/sheet_contextrecord.html:116
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:136
+#: templates/ishtar/sheet_contextrecord.html:121
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_contextrecordsource.html:6
+#: templates/ishtar/sheet_contextrecordsource.html:4
msgid "Context record source"
msgstr ""
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index 2aa42c669..a1af3680f 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -8,32 +8,32 @@
msgid ""
msgstr ""
-#: forms.py:51 forms.py:209 forms.py:253 forms.py:394 forms.py:421
-#: models.py:75 templates/ishtar/sheet_file.html:150
+#: forms.py:51 forms.py:210 forms.py:254 forms.py:395 forms.py:422
+#: models.py:76 templates/ishtar/sheet_file.html:133
msgid "Year"
msgstr ""
-#: forms.py:52 forms.py:214 forms.py:255 models.py:78
+#: forms.py:52 forms.py:215 forms.py:256 models.py:79
msgid "Numeric reference"
msgstr ""
-#: forms.py:54 forms.py:216
+#: forms.py:54 forms.py:217
msgid "Other reference"
msgstr ""
-#: forms.py:56 forms.py:429
-msgid "Parcel (section/number)"
+#: forms.py:56 forms.py:430
+msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:59 forms.py:405 forms.py:432 models.py:518
+#: forms.py:59 forms.py:406 forms.py:433 models.py:512
msgid "Department"
msgstr ""
-#: forms.py:60 forms.py:441
+#: forms.py:60 forms.py:442
msgid "File name"
msgstr ""
-#: forms.py:61 forms.py:155 forms.py:220 models.py:84
+#: forms.py:61 forms.py:156 forms.py:221 models.py:87
msgid "File type"
msgstr ""
@@ -41,214 +41,214 @@ msgstr ""
msgid "Is active?"
msgstr ""
-#: forms.py:63 forms.py:157 forms.py:317
+#: forms.py:63 forms.py:158 forms.py:318
msgid "Saisine type"
msgstr ""
-#: forms.py:64 forms.py:307 models.py:57 models.py:115
+#: forms.py:64 forms.py:308 models.py:58 models.py:118
msgid "Permit type"
msgstr ""
-#: forms.py:66 forms.py:310 models.py:116
+#: forms.py:66 forms.py:311 models.py:119
msgid "Permit reference"
msgstr ""
-#: forms.py:67 forms.py:226 forms.py:364 models.py:145
-#: templates/ishtar/sheet_file.html:111
+#: forms.py:67 forms.py:227 forms.py:365 models.py:148
+#: templates/ishtar/sheet_file.html:94
msgid "Comment"
msgstr ""
-#: forms.py:69 templates/ishtar/sheet_file.html:127
+#: forms.py:69 templates/ishtar/sheet_file.html:110
msgid "In charge"
msgstr ""
-#: forms.py:76 forms.py:285 forms.py:443 models.py:91
+#: forms.py:76 forms.py:286 forms.py:444 models.py:94
msgid "General contractor"
msgstr ""
-#: forms.py:83 forms.py:452
+#: forms.py:83 forms.py:453
msgid "Organization of general contractor"
msgstr ""
-#: forms.py:90 forms.py:475
+#: forms.py:90 forms.py:476
msgid "Created by"
msgstr ""
-#: forms.py:97 forms.py:483
+#: forms.py:97 forms.py:484
msgid "Modified by"
msgstr ""
-#: forms.py:126
+#: forms.py:127
msgid "Archaeological file search"
msgstr ""
-#: forms.py:140
+#: forms.py:141
msgid "You should select a file."
msgstr ""
-#: forms.py:143 forms.py:218 models.py:124
+#: forms.py:144 forms.py:219 models.py:127
msgid "Creation date"
msgstr ""
-#: forms.py:144 forms.py:320 models.py:126
+#: forms.py:145 forms.py:321 models.py:129
msgid "Reception date"
msgstr ""
-#: forms.py:149
+#: forms.py:150
msgid "Slicing"
msgstr ""
-#: forms.py:151
+#: forms.py:152
msgid "Department detail"
msgstr ""
-#: forms.py:153
+#: forms.py:154
msgid "Date get from"
msgstr ""
-#: forms.py:159
+#: forms.py:160
msgid "Date after"
msgstr ""
-#: forms.py:161
+#: forms.py:162
msgid "Date before"
msgstr ""
-#: forms.py:198 templates/ishtar/sheet_file.html:31
+#: forms.py:199 templates/ishtar/sheet_file.html:14
msgid "General"
msgstr ""
-#: forms.py:203 models.py:86
+#: forms.py:204 models.py:89
msgid "Person in charge"
msgstr ""
-#: forms.py:217 models.py:83
+#: forms.py:218 models.py:86
msgid "Name"
msgstr ""
-#: forms.py:222 models.py:128
+#: forms.py:223 models.py:131
msgid "Related file"
msgstr ""
-#: forms.py:230 models.py:136
+#: forms.py:231 models.py:139
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:233 models.py:142
+#: forms.py:234 models.py:145
msgid "Main address"
msgstr ""
-#: forms.py:234
+#: forms.py:235
msgid "Main address - complement"
msgstr ""
-#: forms.py:246
+#: forms.py:247
#, python-format
msgid "<br/>(last recorded: %s)"
msgstr ""
-#: forms.py:268
+#: forms.py:269
msgid "Another file with this numeric id exists."
msgstr ""
-#: forms.py:279
+#: forms.py:280
msgid "Preventive informations"
msgstr ""
-#: forms.py:297 models.py:103
+#: forms.py:298 models.py:106
msgid "Responsible for town planning service"
msgstr ""
-#: forms.py:313 models.py:139
+#: forms.py:314 models.py:142
msgid "Total developed surface (m2)"
msgstr ""
-#: forms.py:332 templates/ishtar/sheet_file.html:101
+#: forms.py:333 templates/ishtar/sheet_file.html:84
#: templates/ishtar/dashboards/dashboard_file.html:42
msgid "Research archaeology"
msgstr ""
-#: forms.py:340 models.py:148 templates/ishtar/sheet_file.html:102
+#: forms.py:341 models.py:151 templates/ishtar/sheet_file.html:85
msgid "Departments"
msgstr ""
-#: forms.py:351 models.py:157
+#: forms.py:352 models.py:160
msgid "Scientist in charge"
msgstr ""
-#: forms.py:353 models.py:151 templates/ishtar/sheet_file.html:104
+#: forms.py:354 models.py:154 templates/ishtar/sheet_file.html:87
msgid "Requested operation type"
msgstr ""
-#: forms.py:355
+#: forms.py:356
msgid "Lead organization"
msgstr ""
-#: forms.py:371 models.py:161 templates/ishtar/sheet_file.html:109
+#: forms.py:372 models.py:164 templates/ishtar/sheet_file.html:92
msgid "Classified area"
msgstr ""
-#: forms.py:373 models.py:163 templates/ishtar/sheet_file.html:110
+#: forms.py:374 models.py:166 templates/ishtar/sheet_file.html:93
msgid "Protected area"
msgstr ""
-#: forms.py:385
+#: forms.py:386
msgid "Would you like to close this archaeological file?"
msgstr ""
-#: forms.py:390
+#: forms.py:391
msgid "Would you like to delete this archaelogical file ?"
msgstr ""
-#: forms.py:395 forms.py:422
+#: forms.py:396 forms.py:423 forms.py:546
msgid "Index"
msgstr ""
-#: forms.py:399 forms.py:426 forms.py:531
+#: forms.py:400 forms.py:427 forms.py:533
msgid "Act type"
msgstr ""
-#: forms.py:400
+#: forms.py:401
msgid "Object (full text search)"
msgstr ""
-#: forms.py:427
+#: forms.py:428
msgid "Indexed?"
msgstr ""
-#: forms.py:433
+#: forms.py:434
msgid "Object"
msgstr ""
-#: forms.py:437
+#: forms.py:438
msgid "Signature date after"
msgstr ""
-#: forms.py:439
+#: forms.py:440
msgid "Signature date before"
msgstr ""
-#: forms.py:460
+#: forms.py:461
msgid "File numeric reference"
msgstr ""
-#: forms.py:461
+#: forms.py:462
msgid "File year"
msgstr ""
-#: forms.py:463
+#: forms.py:464
msgid "File other reference"
msgstr ""
-#: forms.py:465
+#: forms.py:466
msgid "File in charge"
msgstr ""
-#: forms.py:473
+#: forms.py:474
msgid "File permit reference"
msgstr ""
-#: ishtar_menu.py:33 models.py:185 templates/ishtar/sheet_file.html:6
+#: ishtar_menu.py:33 models.py:188 templates/ishtar/sheet_file.html:4
msgid "Archaeological file"
msgstr ""
@@ -292,168 +292,172 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:87 models.py:186
+#: ishtar_menu.py:87 models.py:189
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr ""
-#: models.py:41
+#: models.py:42
msgid "Archaeological file type"
msgstr ""
-#: models.py:42
+#: models.py:43
msgid "Archaeological file types"
msgstr ""
-#: models.py:58
+#: models.py:59
msgid "Permit types"
msgstr ""
-#: models.py:63
+#: models.py:64
msgid "Delay (in days)"
msgstr ""
-#: models.py:79
+#: models.py:80
msgid "Internal reference"
msgstr ""
-#: models.py:81
+#: models.py:82
msgid "External ID"
msgstr ""
-#: models.py:94
+#: models.py:85
+msgid "External ID is set automatically"
+msgstr ""
+
+#: models.py:97
msgid "General contractor (raw)"
msgstr ""
-#: models.py:98
+#: models.py:101
msgid "General contractor organization"
msgstr ""
-#: models.py:106
+#: models.py:109
msgid "Town planning service (raw)"
msgstr ""
-#: models.py:112
+#: models.py:115
msgid "Town planning service organization"
msgstr ""
-#: models.py:118
+#: models.py:121
msgid "Closing date"
msgstr ""
-#: models.py:119
+#: models.py:122
msgid "Town"
msgstr ""
-#: models.py:121
+#: models.py:124
msgid "Towns"
msgstr ""
-#: models.py:134
+#: models.py:137
msgid "Instruction deadline"
msgstr ""
-#: models.py:140
+#: models.py:143
msgid "Locality"
msgstr ""
-#: models.py:143
+#: models.py:146
msgid "Main address - postal code"
msgstr ""
-#: models.py:153 templates/ishtar/sheet_file.html:105
+#: models.py:156 templates/ishtar/sheet_file.html:88
msgid "Organization"
msgstr ""
-#: models.py:158
+#: models.py:161
msgid "Research archaeology comment"
msgstr ""
-#: models.py:172
+#: models.py:175
msgid "Cached name"
msgstr ""
-#: models.py:173
+#: models.py:176
msgid "Imported line"
msgstr ""
-#: models.py:188
+#: models.py:191
msgid "Can view all Archaelogical files"
msgstr ""
-#: models.py:189
+#: models.py:192
msgid "Can view own Archaelogical file"
msgstr ""
-#: models.py:190
+#: models.py:193
msgid "Can add own Archaelogical file"
msgstr ""
-#: models.py:192
+#: models.py:195
msgid "Can change own Archaelogical file"
msgstr ""
-#: models.py:194
+#: models.py:197
msgid "Can delete own Archaelogical file"
msgstr ""
-#: models.py:195
+#: models.py:198
msgid "Can close File"
msgstr ""
-#: models.py:201
+#: models.py:204
msgid "FILE"
msgstr ""
-#: models.py:370
+#: models.py:373
msgid "Multi-town"
msgstr ""
-#: models.py:376
+#: models.py:379
msgid "No town"
msgstr ""
-#: models.py:517
+#: models.py:511
msgid "File"
msgstr ""
-#: views.py:155
+#: views.py:159
msgid "File search"
msgstr ""
-#: views.py:164
+#: views.py:168
msgid "New file"
msgstr ""
-#: views.py:183
+#: views.py:187
msgid "File modification"
msgstr ""
-#: views.py:206
+#: views.py:210
msgid "File closing"
msgstr ""
-#: views.py:211
+#: views.py:215
msgid "File deletion"
msgstr ""
-#: views.py:218
+#: views.py:222
msgid "File: search administrative act"
msgstr ""
-#: views.py:227
+#: views.py:231
msgid "File: new administrative act"
msgstr ""
-#: views.py:237
+#: views.py:241
msgid "File: administrative act modification"
msgstr ""
-#: views.py:246
+#: views.py:265
msgid "File: administrative act deletion"
msgstr ""
-#: wizards.py:124 templates/ishtar/sheet_file.html:122
+#: wizards.py:124 templates/ishtar/sheet_file.html:105
msgid "Associated operations"
msgstr ""
@@ -473,157 +477,125 @@ msgstr ""
msgid "Generate"
msgstr ""
-#: templates/ishtar/sheet_file.html:13
-msgid "Previous version"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:17
-msgid "Are you sure to rollback to this version?"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:18
-msgid "Next version"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:22
-msgid "Export as:"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:22
-msgid "OpenOffice.org file"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:22
-msgid "PDF file"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:24
-msgid "Modify"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:27
-msgid "Add an associated archaeological operation"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:38
+#: templates/ishtar/sheet_file.html:21
msgid "Edition date:"
msgstr ""
-#: templates/ishtar/sheet_file.html:52
+#: templates/ishtar/sheet_file.html:35
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_file.html:52
+#: templates/ishtar/sheet_file.html:35
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_file.html:53
+#: templates/ishtar/sheet_file.html:36
msgid "Closed file"
msgstr ""
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:38
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:38
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_file.html:60
+#: templates/ishtar/sheet_file.html:43
msgid "Related file:"
msgstr ""
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:47
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_file.html:65
+#: templates/ishtar/sheet_file.html:48
msgid "Towns:"
msgstr ""
-#: templates/ishtar/sheet_file.html:66
+#: templates/ishtar/sheet_file.html:49
msgid "Departments:"
msgstr ""
-#: templates/ishtar/sheet_file.html:68
+#: templates/ishtar/sheet_file.html:51
msgid "Main address:"
msgstr ""
-#: templates/ishtar/sheet_file.html:69
+#: templates/ishtar/sheet_file.html:52
msgid "Complement:"
msgstr ""
-#: templates/ishtar/sheet_file.html:70
+#: templates/ishtar/sheet_file.html:53
msgid "Postal code:"
msgstr ""
-#: templates/ishtar/sheet_file.html:72
+#: templates/ishtar/sheet_file.html:55
msgid "Surface:"
msgstr ""
-#: templates/ishtar/sheet_file.html:77
+#: templates/ishtar/sheet_file.html:60
msgid "Preventive archaelogical file"
msgstr ""
-#: templates/ishtar/sheet_file.html:78
+#: templates/ishtar/sheet_file.html:61
msgid "Developed surface:"
msgstr ""
-#: templates/ishtar/sheet_file.html:102 templates/ishtar/sheet_file.html:103
-#: templates/ishtar/sheet_file.html:104 templates/ishtar/sheet_file.html:105
-#: templates/ishtar/sheet_file.html:111
+#: templates/ishtar/sheet_file.html:85 templates/ishtar/sheet_file.html:86
+#: templates/ishtar/sheet_file.html:87 templates/ishtar/sheet_file.html:88
+#: templates/ishtar/sheet_file.html:94
#: templates/ishtar/dashboards/dashboard_file.html:14
msgid ":"
msgstr ""
-#: templates/ishtar/sheet_file.html:103
+#: templates/ishtar/sheet_file.html:86
msgid "Head scientist"
msgstr ""
-#: templates/ishtar/sheet_file.html:115
+#: templates/ishtar/sheet_file.html:98
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_file.html:118
+#: templates/ishtar/sheet_file.html:101
msgid "Administrative acts"
msgstr ""
-#: templates/ishtar/sheet_file.html:124 templates/ishtar/sheet_file.html:151
+#: templates/ishtar/sheet_file.html:107 templates/ishtar/sheet_file.html:134
msgid "Ref."
msgstr ""
-#: templates/ishtar/sheet_file.html:126 templates/ishtar/sheet_file.html:152
+#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:135
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_file.html:128
+#: templates/ishtar/sheet_file.html:111
msgid "Start date"
msgstr ""
-#: templates/ishtar/sheet_file.html:129
+#: templates/ishtar/sheet_file.html:112
msgid "Excavation end date"
msgstr ""
-#: templates/ishtar/sheet_file.html:140
-msgid "Details"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:143
+#: templates/ishtar/sheet_file.html:126
msgid "No operation associated to this archaelogical file"
msgstr ""
-#: templates/ishtar/sheet_file.html:148
+#: templates/ishtar/sheet_file.html:131
msgid "Admninistrative acts linked to associated operations"
msgstr ""
-#: templates/ishtar/sheet_file.html:153
+#: templates/ishtar/sheet_file.html:136
msgid "Date"
msgstr ""
-#: templates/ishtar/sheet_file.html:163
+#: templates/ishtar/sheet_file.html:146
msgid "No administrative act linked to operations"
msgstr ""
+#: templates/ishtar/blocks/window_file_nav.html:10
+msgid "Add an operation for this file"
+msgstr ""
+
#: templates/ishtar/dashboards/dashboard_file.html:10
msgid "Global informations"
msgstr ""
diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot
index ebafd55d6..a4f73fea5 100644
--- a/archaeological_files_pdl/locale/django.pot
+++ b/archaeological_files_pdl/locale/django.pot
@@ -7,117 +7,117 @@
msgid ""
msgstr ""
-#: forms.py:39
+#: forms.py:41
msgid "General"
msgstr ""
-#: forms.py:41
+#: forms.py:43
msgid "File type"
msgstr ""
-#: forms.py:42 forms.py:399
+#: forms.py:44 forms.py:401
msgid "Year"
msgstr ""
-#: forms.py:46
+#: forms.py:48
msgid "Creation date"
msgstr ""
-#: forms.py:49
+#: forms.py:51
msgid "Reception date"
msgstr ""
-#: forms.py:60
+#: forms.py:62
msgid "Reception date cannot be after today."
msgstr ""
-#: forms.py:68
+#: forms.py:70
msgid "Permit type"
msgstr ""
-#: forms.py:70
+#: forms.py:72
msgid "Saisine type"
msgstr ""
-#: forms.py:83
+#: forms.py:85
msgid "Planning"
msgstr ""
-#: forms.py:86
+#: forms.py:88
msgid "Planning name"
msgstr ""
-#: forms.py:89 forms.py:119
-#: templates/ishtar/wizard/wizard_preventiveplanning.html:28
+#: forms.py:91 forms.py:121
+#: templates/ishtar/wizard/wizard_preventiveplanning.html:31
msgid "Towns"
msgstr ""
-#: forms.py:91 forms.py:121
-#: templates/ishtar/wizard/wizard_preventiveplanning.html:35
+#: forms.py:93 forms.py:123
+#: templates/ishtar/wizard/wizard_preventiveplanning.html:41
msgid "Departments"
msgstr ""
-#: forms.py:92 forms.py:122
+#: forms.py:94 forms.py:124
msgid "Locality"
msgstr ""
-#: forms.py:95 forms.py:125
+#: forms.py:97 forms.py:127
msgid "Address (number/street)"
msgstr ""
-#: forms.py:96 forms.py:126
+#: forms.py:98 forms.py:128
msgid "Number/street"
msgstr ""
-#: forms.py:98 forms.py:128
+#: forms.py:100 forms.py:130
msgid "Postal code"
msgstr ""
-#: forms.py:103
+#: forms.py:105
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:108
+#: forms.py:110
msgid "Total developed surface (m2)"
msgstr ""
-#: forms.py:115
+#: forms.py:117
msgid "Address"
msgstr ""
-#: forms.py:229 forms.py:233 forms.py:263 forms.py:266
+#: forms.py:231 forms.py:235 forms.py:265 forms.py:268
msgid "General contractor"
msgstr ""
-#: forms.py:248 forms.py:360
+#: forms.py:250 forms.py:362
msgid "In charge"
msgstr ""
-#: forms.py:338
+#: forms.py:340
msgid "Town planning service"
msgstr ""
-#: forms.py:342
+#: forms.py:344
msgid "File reference"
msgstr ""
-#: forms.py:345
+#: forms.py:347
msgid "Planning service"
msgstr ""
-#: forms.py:379
+#: forms.py:381
msgid "Person in charge"
msgstr ""
-#: forms.py:391
+#: forms.py:393
msgid "Related file"
msgstr ""
-#: forms.py:395
+#: forms.py:397
msgid "Comment"
msgstr ""
-#: forms.py:402
+#: forms.py:404
msgid "Numeric reference"
msgstr ""
@@ -137,11 +137,6 @@ msgstr ""
msgid "The following files have the same numeric index as this file:"
msgstr ""
-#: templates/ishtar/wizard/file_confirm_wizard.html:11
-#: templates/ishtar/wizard/file_confirm_wizard.html:22
-msgid "Details"
-msgstr ""
-
#: templates/ishtar/wizard/file_confirm_wizard.html:19
msgid ""
"The following files are in the same town and have parcels in common with "
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 27ee951e2..b7a64ec92 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -8,663 +8,749 @@
msgid ""
msgstr ""
-#: forms.py:46 forms.py:50 wizards.py:62
+#: forms.py:49 forms.py:53 wizards.py:62
msgid "Context record"
msgstr ""
-#: forms.py:79 ishtar_menu.py:31 models.py:348 models.py:597 models.py:694
-#: templates/ishtar/sheet_find.html:6 templates/ishtar/sheet_findbasket.html:6
+#: forms.py:82 ishtar_menu.py:31 models.py:384 models.py:649 models.py:747
+#: models.py:891 templates/ishtar/sheet_find.html:5
msgid "Find"
msgstr ""
-#: forms.py:88 forms.py:187 forms.py:346 models.py:105 models.py:290
+#: forms.py:93 forms.py:208 forms.py:412 models.py:113 models.py:317
msgid "Free ID"
msgstr ""
-#: forms.py:90 models.py:331
+#: forms.py:95 models.py:365
msgid "Previous ID"
msgstr ""
-#: forms.py:91 forms.py:208 forms.py:286 models.py:108 models.py:291
-#: models.py:619
+#: forms.py:96 forms.py:237 forms.py:577 models.py:117 models.py:318
+#: models.py:681
msgid "Description"
msgstr ""
-#: forms.py:94 forms.py:210 models.py:119
+#: forms.py:99 forms.py:239 models.py:128
msgid "Batch/object"
msgstr ""
-#: forms.py:96 models.py:317
+#: forms.py:101 models.py:346
msgid "Is complete?"
msgstr ""
-#: forms.py:99 forms.py:201 forms.py:350 models.py:47
+#: forms.py:104 forms.py:228 forms.py:416 models.py:48
msgid "Material type"
msgstr ""
-#: forms.py:100 forms.py:205 models.py:57 models.py:295
+#: forms.py:105 forms.py:232 models.py:58 models.py:322
msgid "Conservatory state"
msgstr ""
-#: forms.py:103 models.py:82 models.py:320
+#: forms.py:108 models.py:324
+msgid "Conservatory comment"
+msgstr ""
+
+#: forms.py:111 models.py:90 models.py:349
msgid "Object types"
msgstr ""
-#: forms.py:105 forms.py:204 models.py:64
+#: forms.py:113 forms.py:231 models.py:65
msgid "Preservation type"
msgstr ""
-#: forms.py:108 forms.py:207 models.py:322
+#: forms.py:116 forms.py:234 models.py:351
msgid "Integrity"
msgstr ""
-#: forms.py:110 models.py:323
+#: forms.py:119 forms.py:235 models.py:353
+msgid "Remarkability"
+msgstr ""
+
+#: forms.py:121 models.py:355
msgid "Length (cm)"
msgstr ""
-#: forms.py:111 models.py:324
+#: forms.py:122 models.py:356
msgid "Width (cm)"
msgstr ""
-#: forms.py:112 models.py:325
+#: forms.py:123 models.py:357
msgid "Height (cm)"
msgstr ""
-#: forms.py:113 models.py:326
+#: forms.py:124 models.py:358
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:114 forms.py:351 models.py:300
+#: forms.py:125 forms.py:417 models.py:329
msgid "Volume (l)"
msgstr ""
-#: forms.py:115 forms.py:352 models.py:301
+#: forms.py:126 forms.py:418 models.py:330
msgid "Weight (g)"
msgstr ""
-#: forms.py:116 forms.py:353 models.py:304
+#: forms.py:128 models.py:359
+msgid "Dimensions comment"
+msgstr ""
+
+#: forms.py:129 forms.py:419 models.py:333
msgid "Find number"
msgstr ""
-#: forms.py:117 models.py:327
+#: forms.py:130 models.py:361
msgid "Mark"
msgstr ""
-#: forms.py:118 forms.py:212 models.py:333
+#: forms.py:131 forms.py:241 models.py:367
msgid "Check"
msgstr ""
-#: forms.py:120 models.py:335
+#: forms.py:133 models.py:369
msgid "Check date"
msgstr ""
-#: forms.py:121 models.py:109 models.py:328 models.py:620
+#: forms.py:134 models.py:118 models.py:362 models.py:682
msgid "Comment"
msgstr ""
-#: forms.py:124 models.py:329
+#: forms.py:137 models.py:363
msgid "Comment on dating"
msgstr ""
-#: forms.py:126
+#: forms.py:138 models.py:371
+msgid "Estimated value"
+msgstr ""
+
+#: forms.py:140
msgid "Image"
msgstr ""
-#: forms.py:127
+#: forms.py:141
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
"p>"
msgstr ""
-#: forms.py:153 forms.py:181 models.py:312
+#: forms.py:174 forms.py:202 models.py:341
msgid "Dating"
msgstr ""
-#: forms.py:158 forms.py:199
+#: forms.py:179 forms.py:226
msgid "Period"
msgstr ""
-#: forms.py:159 forms.py:288 models.py:630 models.py:699
-#: templates/ishtar/sheet_find.html:72 templates/ishtar/sheet_find.html:95
+#: forms.py:180 forms.py:579 models.py:695 models.py:760 models.py:896
+#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:104
msgid "Start date"
msgstr ""
-#: forms.py:161 forms.py:290 models.py:631 models.py:700
-#: templates/ishtar/sheet_find.html:73 templates/ishtar/sheet_find.html:96
+#: forms.py:182 forms.py:581 models.py:696 models.py:761 models.py:897
+#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:105
msgid "End date"
msgstr ""
-#: forms.py:162
+#: forms.py:183
msgid "Quality"
msgstr ""
-#: forms.py:164
+#: forms.py:185
msgid "Dating type"
msgstr ""
-#: forms.py:166
+#: forms.py:187
msgid "Precise dating"
msgstr ""
-#: forms.py:185 models.py:124
+#: forms.py:206 models.py:136
msgid "Short ID"
msgstr ""
-#: forms.py:186 models.py:127
+#: forms.py:207 models.py:139
msgid "Complete ID"
msgstr ""
-#: forms.py:190
+#: forms.py:211
msgid "Year"
msgstr ""
-#: forms.py:192
+#: forms.py:214
msgid "Code PATRIARCHE"
msgstr ""
-#: forms.py:194
+#: forms.py:218
msgid "Archaelogical site"
msgstr ""
-#: forms.py:202 models.py:81
+#: forms.py:224
+msgid "Search within operation relations"
+msgstr ""
+
+#: forms.py:229 models.py:89
msgid "Object type"
msgstr ""
-#: forms.py:213
+#: forms.py:242
msgid "Has an image?"
msgstr ""
-#: forms.py:242 forms.py:255 views.py:112
+#: forms.py:284 forms.py:297 views.py:120
msgid "Find search"
msgstr ""
-#: forms.py:269
-msgid "Base treatment"
-msgstr ""
-
-#: forms.py:273 models.py:609 models.py:622
-msgid "Treatment type"
-msgstr ""
-
-#: forms.py:275 models.py:628 models.py:697
-#: templates/ishtar/sheet_find.html:70 templates/ishtar/sheet_find.html:94
-msgid "Person"
-msgstr ""
-
-#: forms.py:281 models.py:623
-msgid "Location"
-msgstr ""
-
-#: forms.py:302
+#: forms.py:311
msgid "Upstream finds"
msgstr ""
-#: forms.py:304 models.py:349
+#: forms.py:313 models.py:385
msgid "Finds"
msgstr ""
-#: forms.py:314
+#: forms.py:323
msgid "You should at least select one archaeological find."
msgstr ""
-#: forms.py:343
+#: forms.py:409
msgid "Resulting find"
msgstr ""
-#: forms.py:348
+#: forms.py:414
msgid "Precise description"
msgstr ""
-#: forms.py:362
+#: forms.py:428
msgid "Resulting finds"
msgstr ""
-#: forms.py:367
+#: forms.py:433
msgid "Would you like to delete this find?"
msgstr ""
-#: forms.py:371
+#: forms.py:437
msgid "Upstream find"
msgstr ""
-#: forms.py:378
+#: forms.py:448
msgid "Archaeological find search"
msgstr ""
-#: forms.py:380
+#: forms.py:450
msgid "You should select an archaeological find."
msgstr ""
-#: forms.py:385
+#: forms.py:455
msgid "Year of the operation"
msgstr ""
-#: forms.py:387
+#: forms.py:457
+msgid "Numeric reference"
+msgstr ""
+
+#: forms.py:464
msgid "Period of the archaelogical find"
msgstr ""
-#: forms.py:389
+#: forms.py:466
msgid "Material type of the archaelogical find"
msgstr ""
-#: forms.py:391
+#: forms.py:468
msgid "Description of the archaelogical find"
msgstr ""
-#: forms.py:403
+#: forms.py:480
msgid "Documentation search"
msgstr ""
-#: forms.py:405
+#: forms.py:482
msgid "You should select a document."
msgstr ""
-#: forms.py:422
+#: forms.py:499
msgid "Another basket already exist with this name."
msgstr ""
-#: forms.py:432 ishtar_menu.py:59
+#: forms.py:509 ishtar_menu.py:60
msgid "Basket"
msgstr ""
-#: ishtar_menu.py:35
+#: forms.py:559
+msgid "Base treatment"
+msgstr ""
+
+#: forms.py:564 models.py:671 models.py:684 models.py:759
+msgid "Treatment type"
+msgstr ""
+
+#: forms.py:566 models.py:693 models.py:764
+#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:102
+msgid "Doer"
+msgstr ""
+
+#: forms.py:572 models.py:686 models.py:762
+msgid "Location"
+msgstr ""
+
+#: forms.py:592
+msgid "Leave it blank if you want to select a single item"
+msgstr ""
+
+#: forms.py:599
+msgid "This treatment type is not available."
+msgstr ""
+
+#: forms.py:603
+msgid "This treatment needs a basket."
+msgstr ""
+
+#: ishtar_menu.py:35 ishtar_menu.py:83
msgid "Search"
msgstr ""
-#: ishtar_menu.py:40 ishtar_menu.py:62 ishtar_menu.py:82
+#: ishtar_menu.py:40 ishtar_menu.py:63 ishtar_menu.py:88
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:45 ishtar_menu.py:87
+#: ishtar_menu.py:45 ishtar_menu.py:93
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:54 ishtar_menu.py:73 ishtar_menu.py:92
+#: ishtar_menu.py:55 ishtar_menu.py:74 ishtar_menu.py:98
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:67
+#: ishtar_menu.py:68
msgid "Manage items"
msgstr ""
-#: ishtar_menu.py:79
+#: ishtar_menu.py:80
msgid "Documentation"
msgstr ""
-#: models.py:40
+#: models.py:41
msgid "Code"
msgstr ""
-#: models.py:41
+#: models.py:42
msgid "Recommendation"
msgstr ""
-#: models.py:44
+#: models.py:45
msgid "Parent material"
msgstr ""
-#: models.py:48 models.py:293
+#: models.py:49 models.py:320
msgid "Material types"
msgstr ""
-#: models.py:54
+#: models.py:55
msgid "Parent conservatory state"
msgstr ""
-#: models.py:58
+#: models.py:59
msgid "Conservatory states"
msgstr ""
-#: models.py:65
+#: models.py:66
msgid "Preservation types"
msgstr ""
-#: models.py:71 models.py:72
+#: models.py:72
msgid "Integrity type"
msgstr ""
-#: models.py:78
+#: models.py:73
+msgid "Integrity types"
+msgstr ""
+
+#: models.py:79
+msgid "Remarkability type"
+msgstr ""
+
+#: models.py:80
+msgid "Remarkability types"
+msgstr ""
+
+#: models.py:86
msgid "Parent"
msgstr ""
-#: models.py:97
+#: models.py:105
msgid "Unknow"
msgstr ""
-#: models.py:98
+#: models.py:106
msgid "Object"
msgstr ""
-#: models.py:99
+#: models.py:107
msgid "Batch"
msgstr ""
-#: models.py:106 models.py:287 models.py:615
+#: models.py:114 models.py:313 models.py:677
msgid "External ID"
msgstr ""
-#: models.py:111
+#: models.py:116 models.py:315
+msgid "External ID is set automatically"
+msgstr ""
+
+#: models.py:120
msgid "Topographic localisation"
msgstr ""
-#: models.py:112
+#: models.py:121
msgid "Special interest"
msgstr ""
-#: models.py:116
+#: models.py:125
msgid "Context Record"
msgstr ""
-#: models.py:117
+#: models.py:126
msgid "Discovery date"
msgstr ""
-#: models.py:125 models.py:128
+#: models.py:131
+msgid "Material index"
+msgstr ""
+
+#: models.py:132
+msgid "Point"
+msgstr ""
+
+#: models.py:133
+msgid "Line"
+msgstr ""
+
+#: models.py:134
+msgid "Polygon"
+msgstr ""
+
+#: models.py:137 models.py:140
msgid "Cached value - do not edit"
msgstr ""
-#: models.py:133 models.py:285
+#: models.py:145 models.py:311
msgid "Base find"
msgstr ""
-#: models.py:134
+#: models.py:146
msgid "Base finds"
msgstr ""
-#: models.py:136
+#: models.py:148
msgid "Can view all Base finds"
msgstr ""
-#: models.py:137
+#: models.py:149
msgid "Can view own Base find"
msgstr ""
-#: models.py:138
+#: models.py:150
msgid "Can add own Base find"
msgstr ""
-#: models.py:139
+#: models.py:151
msgid "Can change own Base find"
msgstr ""
-#: models.py:140
+#: models.py:152
msgid "Can delete own Base find"
msgstr ""
-#: models.py:235
+#: models.py:261
msgid "g"
msgstr ""
-#: models.py:236
+#: models.py:262
msgid "kg"
msgstr ""
-#: models.py:238
+#: models.py:264
msgid "Not checked"
msgstr ""
-#: models.py:239
+#: models.py:265
msgid "Checked but incorrect"
msgstr ""
-#: models.py:240
+#: models.py:266
msgid "Checked and correct"
msgstr ""
-#: models.py:275
+#: models.py:301
msgid "Base find - Short ID"
msgstr ""
-#: models.py:276
+#: models.py:302
msgid "Base find - Complete ID"
msgstr ""
-#: models.py:277
+#: models.py:303
msgid "Base find - Comment"
msgstr ""
-#: models.py:278
+#: models.py:304
msgid "Base find - Description"
msgstr ""
-#: models.py:279
+#: models.py:305
msgid "Base find - Topographic localisation"
msgstr ""
-#: models.py:281
+#: models.py:307
msgid "Base find - Special interest"
msgstr ""
-#: models.py:282
+#: models.py:308
msgid "Base find - Discovery date"
msgstr ""
-#: models.py:289
+#: models.py:316 models.py:753
msgid "Order"
msgstr ""
-#: models.py:298
+#: models.py:327
msgid "Type of preservation to consider"
msgstr ""
-#: models.py:302
+#: models.py:331
msgid "Weight unit"
msgstr ""
-#: models.py:308 templates/ishtar/sheet_find.html:66
+#: models.py:337 templates/ishtar/sheet_find.html:73
msgid "Upstream treatment"
msgstr ""
-#: models.py:311 templates/ishtar/sheet_find.html:90
+#: models.py:340 templates/ishtar/sheet_find.html:98
msgid "Downstream treatment"
msgstr ""
-#: models.py:315 models.py:617 templates/ishtar/sheet_find.html:71
+#: models.py:344 models.py:679 models.py:763
+#: templates/ishtar/sheet_find.html:78 templates/ishtar/sheet_find.html:103
msgid "Container"
msgstr ""
-#: models.py:351
+#: models.py:387
msgid "Can view all Finds"
msgstr ""
-#: models.py:352
+#: models.py:388
msgid "Can view own Find"
msgstr ""
-#: models.py:353
+#: models.py:389
msgid "Can add own Find"
msgstr ""
-#: models.py:354
+#: models.py:390
msgid "Can change own Find"
msgstr ""
-#: models.py:355
+#: models.py:391
msgid "Can delete own Find"
msgstr ""
-#: models.py:360
+#: models.py:396
msgid "FIND"
msgstr ""
-#: models.py:595
+#: models.py:647
msgid "Find documentation"
msgstr ""
-#: models.py:596
+#: models.py:648
msgid "Find documentations"
msgstr ""
-#: models.py:606
+#: models.py:658
msgid "Virtual"
msgstr ""
-#: models.py:610
+#: models.py:660
+msgid "Upstream is many"
+msgstr ""
+
+#: models.py:662
+msgid "Check this if for this treatment from many finds you'll get one."
+msgstr ""
+
+#: models.py:665
+msgid "Downstream is many"
+msgstr ""
+
+#: models.py:667
+msgid "Check this if for this treatment from one find you'll get many."
+msgstr ""
+
+#: models.py:672
msgid "Treatment types"
msgstr ""
-#: models.py:625
+#: models.py:688
+msgid "Location where the treatment is done. Target warehouse for a move."
+msgstr ""
+
+#: models.py:690
msgid "Other location"
msgstr ""
-#: models.py:635 models.py:686
+#: models.py:700 models.py:749 models.py:883
msgid "Treatment"
msgstr ""
-#: models.py:636
+#: models.py:701 templates/ishtar/sheet_find.html:69
msgid "Treatments"
msgstr ""
-#: models.py:638
+#: models.py:703
msgid "Can view all Treatments"
msgstr ""
-#: models.py:639
+#: models.py:704
msgid "Can view own Treatment"
msgstr ""
-#: models.py:640
+#: models.py:705
msgid "Can add own Treatment"
msgstr ""
-#: models.py:641
+#: models.py:706
msgid "Can change own Treatment"
msgstr ""
-#: models.py:642
+#: models.py:707
msgid "Can delete own Treatment"
msgstr ""
-#: models.py:648
+#: models.py:713
msgid "by"
msgstr ""
-#: models.py:683
+#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:76
+#: templates/ishtar/sheet_find.html:101
+msgid "Related finds"
+msgstr ""
+
+#: models.py:869
+msgid "Is upstream"
+msgstr ""
+
+#: models.py:880
msgid "Treatment documentation"
msgstr ""
-#: models.py:684
+#: models.py:881
msgid "Treament documentations"
msgstr ""
-#: models.py:696
+#: models.py:893
msgid "Administrative act"
msgstr ""
-#: models.py:703
+#: models.py:894
+msgid "Person"
+msgstr ""
+
+#: models.py:900
msgid "Property"
msgstr ""
-#: models.py:704
+#: models.py:901
msgid "Properties"
msgstr ""
-#: views.py:107
+#: views.py:115
msgid "New find"
msgstr ""
-#: views.py:121
+#: views.py:129
msgid "Find modification"
msgstr ""
-#: views.py:136
+#: views.py:144
msgid "Find deletion"
msgstr ""
-#: views.py:145
+#: views.py:149
+msgid "Find: source search"
+msgstr ""
+
+#: views.py:157
msgid "Find: new source"
msgstr ""
-#: views.py:153
+#: views.py:165
msgid "Find: source modification"
msgstr ""
-#: views.py:159
+#: views.py:180
msgid "Find: source deletion"
msgstr ""
-#: views.py:173
+#: views.py:194
msgid "New basket"
msgstr ""
-#: views.py:192
+#: views.py:213
msgid "Manage items in basket"
msgstr ""
-#: views.py:212
+#: views.py:233
msgid "Manage basket"
msgstr ""
-#: views.py:300
+#: views.py:321
msgid "Delete basket"
msgstr ""
-#: wizards.py:61
-msgid "Operation"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:14
-msgid "Previous version"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:18
-msgid "Are you sure to rollback to this version?"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:19
-msgid "Next version"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "Export as:"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "OpenOffice.org file"
+#: views.py:359
+msgid "New treatment"
msgstr ""
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "PDF file"
+#: wizards.py:61
+msgid "Operation"
msgstr ""
-#: templates/ishtar/sheet_find.html:25
-#: templates/ishtar/sheet_findbasket.html:12
-msgid "Modify"
+#: templates/ishtar/sheet_find.html:75 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:166
+msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_find.html:68 templates/ishtar/sheet_find.html:92
-#: templates/ishtar/sheet_find.html:141
-msgid "Type"
+#: templates/ishtar/sheet_find.html:93
+msgid "Export as CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:69 templates/ishtar/sheet_find.html:93
-msgid "Related find"
+#: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:118
+msgid "CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:110
+#: templates/ishtar/sheet_find.html:123
msgid "Associated base finds"
msgstr ""
-#: templates/ishtar/sheet_find.html:136 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:161 templates/ishtar/sheet_find.html:163
msgid "Documents"
msgstr ""
-#: templates/ishtar/sheet_find.html:140
+#: templates/ishtar/sheet_find.html:165
msgid "Title"
msgstr ""
-#: templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:167
msgid "Authors"
msgstr ""
-#: templates/ishtar/sheet_find.html:143 templates/ishtar/sheet_find.html:150
+#: templates/ishtar/sheet_find.html:168
msgid "Link"
msgstr ""
-#: templates/ishtar/sheet_findsource.html:6
+#: templates/ishtar/sheet_findbasket.html:4
+msgid "Find basket"
+msgstr ""
+
+#: templates/ishtar/sheet_findsource.html:4
msgid "Find source"
msgstr ""
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index d2303a43b..d524fdbc5 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -841,8 +841,8 @@ class OperationFormGeneral(forms.Form):
if 'pk' in cleaned_data and cleaned_data['pk']:
ops = ops.exclude(pk=cleaned_data['pk'])
if ops.count():
- msg = _(u"Ce code Patriarche a déjà été affecté à une "
- u"autre opération")
+ msg = u"Ce code Patriarche a déjà été affecté à une "\
+ u"autre opération"
raise forms.ValidationError(msg)
# manage unique operation ID
year = self.cleaned_data.get("year")
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index f25ff50fc..86e6febcb 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -8,12 +8,12 @@
msgid ""
msgstr ""
-#: forms.py:66 forms.py:344 forms.py:914 forms.py:936 forms.py:940
-#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8
+#: forms.py:66 forms.py:368 forms.py:952 forms.py:974 forms.py:978
+#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr ""
-#: forms.py:69 forms.py:185 forms.py:890 models.py:770
+#: forms.py:69 forms.py:202 forms.py:928 models.py:801
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -22,88 +22,92 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:71 forms.py:433 forms.py:704 forms.py:1148 models.py:158
-#: models.py:587 models.py:768
+#: forms.py:71 forms.py:457 forms.py:731 forms.py:1192 models.py:194
+#: models.py:618 models.py:799
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
msgstr ""
-#: forms.py:74 models.py:771
+#: forms.py:74 models.py:802
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Section"
msgstr ""
-#: forms.py:77 models.py:772
+#: forms.py:77 models.py:804
msgid "Parcel number"
msgstr ""
-#: forms.py:107
-msgid "Town section and parcel number fields are required."
+#: forms.py:79 models.py:806 models.py:823 models.py:872
+msgid "Public domain"
msgstr ""
-#: forms.py:150
+#: forms.py:123
+msgid "Town section is required."
+msgstr ""
+
+#: forms.py:167
msgid "Current parcels"
msgstr ""
-#: forms.py:152
+#: forms.py:169
msgid "Deleted parcels"
msgstr ""
-#: forms.py:188
+#: forms.py:205
msgid "Full text input"
msgstr ""
-#: forms.py:190
+#: forms.py:207
msgid "example: \"2013: XD:1 to 13,24,33 to 39, YD:24\" or \"AB:24,AC:42\""
msgstr ""
-#: forms.py:338
+#: forms.py:362
msgid "There are identical parcels."
msgstr ""
-#: forms.py:353
+#: forms.py:377
msgid "Relation type"
msgstr ""
-#: forms.py:356 ishtar_menu.py:30 models.py:237 models.py:488 models.py:513
-#: models.py:528 models.py:579 models.py:767 wizards.py:338 wizards.py:349
-#: templates/ishtar/sheet_operation.html:6
+#: forms.py:380 ishtar_menu.py:30 models.py:276 models.py:518 models.py:543
+#: models.py:559 models.py:610 models.py:798 wizards.py:338 wizards.py:349
+#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr ""
-#: forms.py:375
+#: forms.py:399
msgid ":"
msgstr ""
-#: forms.py:383 forms.py:559 forms.py:1119
+#: forms.py:407 forms.py:585 forms.py:1157
msgid "You should select an operation."
msgstr ""
-#: forms.py:387
+#: forms.py:411
msgid "You should select a relation type."
msgstr ""
-#: forms.py:417
+#: forms.py:441
msgid "Current relations"
msgstr ""
-#: forms.py:419
+#: forms.py:443
msgid "Deleted relations"
msgstr ""
-#: forms.py:423 templates/ishtar/sheet_operation.html:115
+#: forms.py:447 templates/ishtar/sheet_operation.html:114
msgid "Relations"
msgstr ""
-#: forms.py:434
+#: forms.py:458 forms.py:1163
msgid "Numeric reference"
msgstr ""
-#: forms.py:439 forms.py:1158
-msgid "Parcel (section/number)"
+#: forms.py:464 forms.py:1203
+msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:442 forms.py:1161 models.py:489
+#: forms.py:467 forms.py:1206 models.py:519
#: templates/ishtar/dashboards/dashboard_operation.html:273
#: templates/ishtar/dashboards/dashboard_operation.html:286
#: templates/ishtar/dashboards/dashboard_operation.html:453
@@ -111,389 +115,404 @@ msgstr ""
msgid "Department"
msgstr ""
-#: forms.py:443 forms.py:1000 models.py:77
+#: forms.py:468 forms.py:1038 models.py:78
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Name"
msgstr ""
-#: forms.py:445 forms.py:626 forms.py:702 forms.py:1124 models.py:166
+#: forms.py:470 forms.py:652 forms.py:729 forms.py:1169 models.py:202
msgid "Operation type"
msgstr ""
-#: forms.py:447
+#: forms.py:472
msgid "Is open?"
msgstr ""
-#: forms.py:456 forms.py:728 models.py:155
+#: forms.py:481 forms.py:758 models.py:191
msgid "In charge"
msgstr ""
-#: forms.py:463 models.py:573
+#: forms.py:488 models.py:604
msgid "Scientist in charge"
msgstr ""
-#: forms.py:465 forms.py:628 forms.py:719 models.py:153
+#: forms.py:490 forms.py:654 forms.py:749 models.py:189
msgid "Operator"
msgstr ""
-#: forms.py:472 forms.py:1005 models.py:81 models.py:168
+#: forms.py:497 forms.py:1043 models.py:82 models.py:204
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Remains"
msgstr ""
-#: forms.py:473 forms.py:984 forms.py:1002 models.py:79 models.py:173
+#: forms.py:498 forms.py:1022 forms.py:1040 models.py:80 models.py:209
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Periods"
msgstr ""
-#: forms.py:474
+#: forms.py:499
msgid "Started before"
msgstr ""
-#: forms.py:476
+#: forms.py:501
msgid "Started after"
msgstr ""
-#: forms.py:478
+#: forms.py:503
msgid "Ended before"
msgstr ""
-#: forms.py:480
+#: forms.py:505
msgid "Ended after"
msgstr ""
-#: forms.py:483
+#: forms.py:508
msgid "Search within relations"
msgstr ""
-#: forms.py:485 forms.py:770 models.py:219
+#: forms.py:510 forms.py:797 models.py:255
msgid "Comment"
msgstr ""
-#: forms.py:486
+#: forms.py:511
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:487 forms.py:772 models.py:231
+#: forms.py:512 forms.py:799 models.py:267
msgid "Record quality"
msgstr ""
-#: forms.py:488 forms.py:751 models.py:185
+#: forms.py:513 forms.py:781 models.py:221
msgid "Report processing"
msgstr ""
-#: forms.py:490 forms.py:775 models.py:226
+#: forms.py:515 forms.py:802 models.py:262
msgid "Virtual operation"
msgstr ""
-#: forms.py:492 forms.py:1045
+#: forms.py:517 forms.py:1083
msgid "Archaelogical site"
msgstr ""
-#: forms.py:498 forms.py:1165
+#: forms.py:523 forms.py:1210
msgid "Created by"
msgstr ""
-#: forms.py:504 forms.py:1171
+#: forms.py:529 forms.py:1216
msgid "Modified by"
msgstr ""
-#: forms.py:546 forms.py:1117 views.py:231
+#: forms.py:572 forms.py:1155 views.py:247
msgid "Operation search"
msgstr ""
-#: forms.py:590
+#: forms.py:616
msgid "Associated file"
msgstr ""
-#: forms.py:594 forms.py:838 models.py:584 wizards.py:76
+#: forms.py:620 forms.py:876 models.py:615 wizards.py:76
msgid "Archaelogical file"
msgstr ""
-#: forms.py:601 forms.py:603 models.py:233
+#: forms.py:627 forms.py:629 models.py:269
msgid "Abstract"
msgstr ""
-#: forms.py:606
+#: forms.py:632
msgid "months"
msgstr ""
-#: forms.py:606
+#: forms.py:632
msgid "years"
msgstr ""
-#: forms.py:608 models.py:139
+#: forms.py:634 models.py:175
msgid "Creation date"
msgstr ""
-#: forms.py:609
+#: forms.py:635
msgid "Start of field work"
msgstr ""
-#: forms.py:611
+#: forms.py:637
msgid "All"
msgstr ""
-#: forms.py:612
+#: forms.py:638
msgid "Preventive"
msgstr ""
-#: forms.py:613
+#: forms.py:639
msgid "Research"
msgstr ""
-#: forms.py:617
+#: forms.py:643
msgid "Slicing"
msgstr ""
-#: forms.py:620
+#: forms.py:646
msgid "Department detail"
msgstr ""
-#: forms.py:622
+#: forms.py:648
msgid "Date get from"
msgstr ""
-#: forms.py:624
+#: forms.py:650
msgid "Preventive/Research"
msgstr ""
-#: forms.py:630
+#: forms.py:656
msgid "Date after"
msgstr ""
-#: forms.py:632
+#: forms.py:658
msgid "Date before"
msgstr ""
-#: forms.py:634
+#: forms.py:660
msgid "With reports"
msgstr ""
-#: forms.py:635
+#: forms.py:661
msgid "With finds"
msgstr ""
-#: forms.py:687 forms.py:1218 templates/ishtar/sheet_administrativeact.html:11
-#: templates/ishtar/sheet_operation.html:32
+#: forms.py:713 forms.py:1264 templates/ishtar/sheet_administrativeact.html:13
+#: templates/ishtar/sheet_operation.html:30
msgid "General"
msgstr ""
-#: forms.py:700 models.py:218
+#: forms.py:727 models.py:254
msgid "Generic name"
msgstr ""
-#: forms.py:709
+#: forms.py:736 models.py:223
+msgid "Old code"
+msgstr ""
+
+#: forms.py:739
msgid "Head scientist"
msgstr ""
-#: forms.py:725 models.py:217
+#: forms.py:755 models.py:253
msgid "Operator reference"
msgstr ""
-#: forms.py:737
+#: forms.py:767
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:744 models.py:49 models.py:142 models.py:938
+#: forms.py:774 models.py:50 models.py:178 models.py:988
msgid "Start date"
msgstr ""
-#: forms.py:746 models.py:144
+#: forms.py:776 models.py:180
msgid "Excavation end date"
msgstr ""
-#: forms.py:749 models.py:145
+#: forms.py:779 models.py:181
msgid "Report delivery date"
msgstr ""
-#: forms.py:802
+#: forms.py:829
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
-#: forms.py:807
+#: forms.py:834
msgid "The excavation end date cannot be before the start date."
msgstr ""
-#: forms.py:824
+#: forms.py:862
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:828
+#: forms.py:866
msgid "Bad operation code"
msgstr ""
-#: forms.py:834 models.py:159 models.py:366
+#: forms.py:872 models.py:195 models.py:405
msgid "Operation code"
msgstr ""
-#: forms.py:860
+#: forms.py:898
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:861 models.py:171
+#: forms.py:899 models.py:207
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (euros)"
msgstr ""
-#: forms.py:862 models.py:176
+#: forms.py:900 models.py:212
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:864 models.py:179
+#: forms.py:902 models.py:215
msgid "Optional man-days"
msgstr ""
-#: forms.py:866 models.py:182
+#: forms.py:904 models.py:218
msgid "Effective man-days"
msgstr ""
-#: forms.py:876
+#: forms.py:914
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:879 models.py:201
+#: forms.py:917 models.py:237
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:881 models.py:204
+#: forms.py:919 models.py:240
msgid "Prescription on large area"
msgstr ""
-#: forms.py:884 models.py:206
+#: forms.py:922 models.py:242
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:888 forms.py:910 models.py:170 models.py:597
+#: forms.py:926 forms.py:948 models.py:206 models.py:628
msgid "Towns"
msgstr ""
-#: forms.py:917 models.py:779 models.py:936
+#: forms.py:955 models.py:814 models.py:986
msgid "Parcel"
msgstr ""
-#: forms.py:969 models.py:43
+#: forms.py:1007 models.py:44
msgid "Remain types"
msgstr ""
-#: forms.py:973 models.py:42
+#: forms.py:1011 models.py:43
msgid "Remain type"
msgstr ""
-#: forms.py:988
+#: forms.py:1026
msgid "Period"
msgstr ""
-#: forms.py:999 models.py:76
+#: forms.py:1037 models.py:77
msgid "Reference"
msgstr ""
-#: forms.py:1024
+#: forms.py:1062
msgid "This reference already exists."
msgstr ""
-#: forms.py:1041 models.py:85
+#: forms.py:1079 models.py:86
msgid "Archaeological site"
msgstr ""
-#: forms.py:1056 models.py:86 models.py:223
-#: templates/ishtar/sheet_operation.html:126
+#: forms.py:1094 models.py:87 models.py:259
+#: templates/ishtar/sheet_operation.html:125
msgid "Archaeological sites"
msgstr ""
-#: forms.py:1060
+#: forms.py:1098
msgid "Associated archaelogical sites"
msgstr ""
-#: forms.py:1066 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1104 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr ""
-#: forms.py:1071
+#: forms.py:1109
msgid "Would you like to close this operation?"
msgstr ""
-#: forms.py:1076
+#: forms.py:1114
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1085 forms.py:1149 models.py:515 models.py:564
+#: forms.py:1123 forms.py:1193 forms.py:1328 models.py:545 models.py:595
msgid "Index"
msgstr ""
-#: forms.py:1111
+#: forms.py:1149
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1123
-msgid "Operation's town"
+#: forms.py:1161
+msgid "Operation's year"
msgstr ""
-#: forms.py:1126
-msgid "Operation's year"
+#: forms.py:1168
+msgid "Operation's town"
msgstr ""
-#: forms.py:1137
+#: forms.py:1181
msgid "Documentation search"
msgstr ""
-#: forms.py:1139
+#: forms.py:1183
msgid "You should select a document."
msgstr ""
-#: forms.py:1155 forms.py:1221 models.py:539 models.py:558
+#: forms.py:1200 forms.py:1267 models.py:570 models.py:589
msgid "Act type"
msgstr ""
-#: forms.py:1156 forms.py:1309
+#: forms.py:1201 forms.py:1398
msgid "Indexed?"
msgstr ""
-#: forms.py:1162 forms.py:1226 models.py:588
+#: forms.py:1207 forms.py:1272 models.py:619
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Object"
msgstr ""
-#: forms.py:1198 views.py:373
+#: forms.py:1244 views.py:403
msgid "Administrative act search"
msgstr ""
-#: forms.py:1213 forms.py:1267 forms.py:1334
+#: forms.py:1259 forms.py:1356 forms.py:1423
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1229 models.py:585
+#: forms.py:1275 models.py:616
msgid "Signature date"
msgstr ""
-#: forms.py:1244
+#: forms.py:1316
+#, python-format
+msgid ""
+"This index already exist for year: %(year)d - use a value bigger than "
+"%(last_val)d"
+msgstr ""
+
+#: forms.py:1320
+msgid "Bad index"
+msgstr ""
+
+#: forms.py:1333
msgid "Would you like to delete this administrative act?"
msgstr ""
-#: forms.py:1249
+#: forms.py:1338
msgid "Template"
msgstr ""
-#: forms.py:1273 forms.py:1277
+#: forms.py:1362 forms.py:1366
msgid "This document is not intended for this type of act."
msgstr ""
-#: forms.py:1295
+#: forms.py:1384
msgid "Doc generation"
msgstr ""
-#: forms.py:1297
+#: forms.py:1386
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1318 ishtar_menu.py:121 views.py:407
+#: forms.py:1407 ishtar_menu.py:121 views.py:456
msgctxt "admin act register"
msgid "Register"
msgstr ""
@@ -514,12 +533,12 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:58 models.py:604
-#: templates/ishtar/sheet_administrativeact.html:6
+#: ishtar_menu.py:58 models.py:635
+#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:52
+#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:55
msgid "Add"
msgstr ""
@@ -543,367 +562,379 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:136 models.py:238
+#: ishtar_menu.py:136 models.py:277
#: templates/ishtar/dashboards/dashboard_operation.html:9
msgid "Operations"
msgstr ""
-#: models.py:48 models.py:64 models.py:1400
+#: models.py:49 models.py:65 models.py:1450
msgid "Order"
msgstr ""
-#: models.py:50 models.py:939
+#: models.py:51 models.py:989
msgid "End date"
msgstr ""
-#: models.py:51
+#: models.py:52
msgid "Parent period"
msgstr ""
-#: models.py:55
+#: models.py:56
msgid "Type Period"
msgstr ""
-#: models.py:56
+#: models.py:57
msgid "Types Period"
msgstr ""
-#: models.py:67
+#: models.py:68
msgid "Report state"
msgstr ""
-#: models.py:68
+#: models.py:69
msgid "Report states"
msgstr ""
-#: models.py:89
+#: models.py:90
msgid "Can view all Archaeological sites"
msgstr ""
-#: models.py:91
+#: models.py:92
msgid "Can view own Archaeological site"
msgstr ""
-#: models.py:93
+#: models.py:94
msgid "Can add own Archaeological site"
msgstr ""
-#: models.py:95
+#: models.py:96
msgid "Can change own Archaeological site"
msgstr ""
-#: models.py:97
+#: models.py:98
msgid "Can delete own Archaeological site"
msgstr ""
-#: models.py:127
+#: models.py:135
msgid "Not documented"
msgstr ""
-#: models.py:128
+#: models.py:136
msgid "Arbitrary"
msgstr ""
-#: models.py:129
+#: models.py:137
msgid "Reliable"
msgstr ""
-#: models.py:141
+#: models.py:177
msgid "Closing date"
msgstr ""
-#: models.py:148
+#: models.py:184
msgid "In charge scientist"
msgstr ""
-#: models.py:163 models.py:763
+#: models.py:199 models.py:794
msgid "File"
msgstr ""
-#: models.py:167
+#: models.py:203
msgid "Surface (m2)"
msgstr ""
-#: models.py:220
+#: models.py:256
msgid "Cached name"
msgstr ""
-#: models.py:228
+#: models.py:264
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
-#: models.py:240
+#: models.py:270
+msgid "Point"
+msgstr ""
+
+#: models.py:271
+msgid "Multi polygon"
+msgstr ""
+
+#: models.py:279
msgid "Can view all Operations"
msgstr ""
-#: models.py:241
+#: models.py:280
msgid "Can view own Operation"
msgstr ""
-#: models.py:242
+#: models.py:281
msgid "Can add own Operation"
msgstr ""
-#: models.py:243
+#: models.py:282
msgid "Can change own Operation"
msgstr ""
-#: models.py:244
+#: models.py:283
msgid "Can delete own Operation"
msgstr ""
-#: models.py:245
+#: models.py:284
msgid "Can close Operation"
msgstr ""
-#: models.py:268
+#: models.py:307
msgid "OPE"
msgstr ""
-#: models.py:325
+#: models.py:364
msgid "Intercommunal"
msgstr ""
-#: models.py:351 models.py:527
+#: models.py:390 models.py:558
msgid "Archaeological file"
msgstr ""
-#: models.py:352
+#: models.py:391
msgid "Code patriarche"
msgstr ""
-#: models.py:392
+#: models.py:431
msgid "This operation code already exists for this year"
msgstr ""
-#: models.py:459
+#: models.py:489
msgid "Inverse relation"
msgstr ""
-#: models.py:463
+#: models.py:493
msgid "Operation relation type"
msgstr ""
-#: models.py:464
+#: models.py:494
msgid "Operation relation types"
msgstr ""
-#: models.py:477
+#: models.py:507
msgid "Operation record relation"
msgstr ""
-#: models.py:478
+#: models.py:508
msgid "Operation record relations"
msgstr ""
-#: models.py:499
+#: models.py:529
msgid "Operation documentation"
msgstr ""
-#: models.py:500
+#: models.py:530
msgid "Operation documentations"
msgstr ""
-#: models.py:503
+#: models.py:533
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:505
+#: models.py:535
msgid "Can view own Operation source"
msgstr ""
-#: models.py:507
+#: models.py:537
msgid "Can add own Operation source"
msgstr ""
-#: models.py:509
+#: models.py:539
msgid "Can change own Operation source"
msgstr ""
-#: models.py:511
+#: models.py:541
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:530
+#: models.py:561
msgid "Intended to"
msgstr ""
-#: models.py:532
+#: models.py:563
msgid "Code"
msgstr ""
-#: models.py:535
+#: models.py:566
msgid "Associated template"
msgstr ""
-#: models.py:536
+#: models.py:567
msgid "Indexed"
msgstr ""
-#: models.py:540
+#: models.py:571
msgid "Act types"
msgstr ""
-#: models.py:562
+#: models.py:593
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:568
+#: models.py:599
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:576
+#: models.py:607
msgid "Signatory"
msgstr ""
-#: models.py:594
+#: models.py:625
msgid "Departments"
msgstr ""
-#: models.py:595
+#: models.py:626
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:598
+#: models.py:629
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:605 templates/ishtar/sheet_operation.html:134
+#: models.py:636 templates/ishtar/sheet_operation.html:133
msgid "Administrative acts"
msgstr ""
-#: models.py:608
+#: models.py:639
msgid "Can view all Administrative acts"
msgstr ""
-#: models.py:610
+#: models.py:641
msgid "Can view own Administrative act"
msgstr ""
-#: models.py:612
+#: models.py:643
msgid "Can add own Administrative act"
msgstr ""
-#: models.py:614
+#: models.py:645
msgid "Can change own Administrative act"
msgstr ""
-#: models.py:616
+#: models.py:647
msgid "Can delete own Administrative act"
msgstr ""
-#: models.py:625
+#: models.py:656
#: templates/ishtar/blocks/window_tables/administrativacts.html:5
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5
msgid "Ref."
msgstr ""
-#: models.py:708
+#: models.py:739
msgid "This index already exists for this year"
msgstr ""
-#: models.py:774
+#: models.py:807
msgid "External ID"
msgstr ""
-#: models.py:776
+#: models.py:810
+msgid "External ID is set automatically"
+msgstr ""
+
+#: models.py:811
msgid "Address - Locality"
msgstr ""
-#: models.py:934
+#: models.py:984
msgid "Owner"
msgstr ""
-#: models.py:942
+#: models.py:992
msgid "Parcel owner"
msgstr ""
-#: models.py:943
+#: models.py:993
msgid "Parcel owners"
msgstr ""
-#: models.py:969
+#: models.py:1019
msgid "Recorded"
msgstr ""
-#: models.py:970
+#: models.py:1020
msgid "Effective"
msgstr ""
-#: models.py:971
+#: models.py:1021
msgid "Active"
msgstr ""
-#: models.py:972
+#: models.py:1022
msgid "Field completed"
msgstr ""
-#: models.py:973
+#: models.py:1023
msgid "Associated report"
msgstr ""
-#: models.py:974
+#: models.py:1024
msgid "Closed"
msgstr ""
-#: models.py:975
+#: models.py:1025
msgid "Documented and closed"
msgstr ""
-#: models.py:1401
+#: models.py:1451
msgid "Is preventive"
msgstr ""
-#: models.py:1404
+#: models.py:1454
msgid "Operation type old"
msgstr ""
-#: models.py:1405
+#: models.py:1455
msgid "Operation types old"
msgstr ""
-#: views.py:258
+#: views.py:293
msgid "New operation"
msgstr ""
-#: views.py:294
+#: views.py:312
msgid "Operation modification"
msgstr ""
-#: views.py:334
+#: views.py:355
msgid "Operation closing"
msgstr ""
-#: views.py:340
+#: views.py:361
msgid "Operation deletion"
msgstr ""
-#: views.py:345
+#: views.py:366
msgid "Operation: source search"
msgstr ""
-#: views.py:353
+#: views.py:374
msgid "Operation: source creation"
msgstr ""
-#: views.py:361
+#: views.py:382
msgid "Operation: source modification"
msgstr ""
-#: views.py:367
+#: views.py:397
msgid "Operation: source deletion"
msgstr ""
-#: views.py:382
+#: views.py:416
msgid "Operation: new administrative act"
msgstr ""
-#: views.py:392
+#: views.py:426
msgid "Operation: administrative act modification"
msgstr ""
-#: views.py:401
+#: views.py:450
msgid "Operation: administrative act deletion"
msgstr ""
@@ -913,217 +944,210 @@ msgid ""
"the first step."
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "Export as:"
-msgstr ""
-
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "OpenOffice.org file"
-msgstr ""
-
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "PDF file"
-msgstr ""
-
-#: templates/ishtar/sheet_administrativeact.html:12
-#: templates/ishtar/sheet_operation.html:34
+#: templates/ishtar/sheet_administrativeact.html:14
+#: templates/ishtar/sheet_operation.html:32
msgid "Year:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:13
-#: templates/ishtar/sheet_operation.html:35
+#: templates/ishtar/sheet_administrativeact.html:15
+#: templates/ishtar/sheet_operation.html:33
msgid "Numerical reference:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:14
+#: templates/ishtar/sheet_administrativeact.html:16
msgid "Internal reference:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:15
-#: templates/ishtar/sheet_operation.html:55
+#: templates/ishtar/sheet_administrativeact.html:17
+#: templates/ishtar/sheet_operation.html:54
msgid "Type:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:16
+#: templates/ishtar/sheet_administrativeact.html:18
msgid "Object:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:17
+#: templates/ishtar/sheet_administrativeact.html:19
msgid "Signature date:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:18
-#: templates/ishtar/sheet_operation.html:47
+#: templates/ishtar/sheet_administrativeact.html:20
+#: templates/ishtar/sheet_operation.html:46
msgid "In charge:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:19
+#: templates/ishtar/sheet_administrativeact.html:21
msgid "Archaeological preventive operator:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:21
-#: templates/ishtar/sheet_operation.html:73
+#: templates/ishtar/sheet_administrativeact.html:23
+#: templates/ishtar/sheet_operation.html:72
msgid "Associated file:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:22
+#: templates/ishtar/sheet_administrativeact.html:24
msgid "Associated operation:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:24
-#: templates/ishtar/sheet_operation.html:56
+#: templates/ishtar/sheet_administrativeact.html:26
+#: templates/ishtar/sheet_operation.html:55
msgid "Surface:"
msgstr ""
-#: templates/ishtar/sheet_administrativeact.html:25
-#: templates/ishtar/sheet_operation.html:41
+#: templates/ishtar/sheet_administrativeact.html:27
+#: templates/ishtar/sheet_operation.html:40
msgid "Created by:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:14
+#: templates/ishtar/sheet_operation.html:12
msgid "Previous version"
msgstr ""
-#: templates/ishtar/sheet_operation.html:18
+#: templates/ishtar/sheet_operation.html:16
msgid "Are you sure to rollback to this version?"
msgstr ""
-#: templates/ishtar/sheet_operation.html:19
+#: templates/ishtar/sheet_operation.html:17
msgid "Next version"
msgstr ""
-#: templates/ishtar/sheet_operation.html:26
+#: templates/ishtar/sheet_operation.html:22
+msgid "Export as:"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:22
+msgid "OpenOffice.org file"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:22
+msgid "PDF file"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:24
msgid "Modify"
msgstr ""
-#: templates/ishtar/sheet_operation.html:29
+#: templates/ishtar/sheet_operation.html:27
msgid "This operation is virtual."
msgstr ""
-#: templates/ishtar/sheet_operation.html:33
+#: templates/ishtar/sheet_operation.html:31
msgid "Name:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:37
+#: templates/ishtar/sheet_operation.html:35
msgid "Patriarche OA code:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:38
+#: templates/ishtar/sheet_operation.html:36
msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_operation.html:40
-msgid "Edition date:"
+#: templates/ishtar/sheet_operation.html:39
+msgid "Last modification date:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:43
+#: templates/ishtar/sheet_operation.html:42
msgid "Begining date:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:44
+#: templates/ishtar/sheet_operation.html:43
msgid "Excavation end date:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:45
msgid "Head scientist:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:47
msgid "Operator:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:49
+#: templates/ishtar/sheet_operation.html:48
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:49
+#: templates/ishtar/sheet_operation.html:48
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_operation.html:50
+#: templates/ishtar/sheet_operation.html:49
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:50
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:50
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_operation.html:57
+#: templates/ishtar/sheet_operation.html:56
msgid "Cost:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:58
+#: templates/ishtar/sheet_operation.html:57
msgid "Duration:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:58
+#: templates/ishtar/sheet_operation.html:57
msgid "Day"
msgstr ""
-#: templates/ishtar/sheet_operation.html:84
+#: templates/ishtar/sheet_operation.html:83
msgid "Permit type:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:85
+#: templates/ishtar/sheet_operation.html:84
msgid "Permit reference:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:100
+#: templates/ishtar/sheet_operation.html:99
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:101
+#: templates/ishtar/sheet_operation.html:100
msgid "Towns:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:103
msgid "Main address:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:105
+#: templates/ishtar/sheet_operation.html:104
msgid "Complement:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:106
+#: templates/ishtar/sheet_operation.html:105
msgid "Postal code:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:120
-msgid "Details"
-msgstr ""
-
-#: templates/ishtar/sheet_operation.html:130
+#: templates/ishtar/sheet_operation.html:129
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_operation.html:138
+#: templates/ishtar/sheet_operation.html:137
msgid "Document from this operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:142
msgid "Context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:148
+#: templates/ishtar/sheet_operation.html:147
msgid "Documents from associated context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:153
+#: templates/ishtar/sheet_operation.html:152
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:157
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_operationsource.html:6
+#: templates/ishtar/sheet_operationsource.html:4
msgid "Operation source"
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index b3ceeddda..ba75c5e2f 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -20,125 +20,125 @@ msgstr ""
msgid "Related item"
msgstr ""
-#: context_processors.py:37
+#: context_processors.py:38
msgid "Archaeological file"
msgstr ""
-#: context_processors.py:38 models.py:1322
+#: context_processors.py:39 models.py:1434
msgid "Operation"
msgstr ""
-#: context_processors.py:40
+#: context_processors.py:41
msgid "Context record"
msgstr ""
-#: context_processors.py:42
+#: context_processors.py:43
msgid "Find"
msgstr ""
-#: data_importer.py:181
+#: data_importer.py:182
#, python-format
msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
msgstr ""
-#: data_importer.py:198
+#: data_importer.py:199
#, python-format
msgid "\"%(value)s\" not equal to yes or no"
msgstr ""
-#: data_importer.py:210
+#: data_importer.py:211
#, python-format
msgid "\"%(value)s\" is not a float"
msgstr ""
-#: data_importer.py:223 data_importer.py:236 data_importer.py:479
+#: data_importer.py:224 data_importer.py:238 data_importer.py:482
#, python-format
msgid "\"%(value)s\" is not a valid date"
msgstr ""
-#: data_importer.py:248
+#: data_importer.py:251
#, python-format
msgid "\"%(value)s\" is not an integer"
msgstr ""
-#: data_importer.py:299 data_importer.py:540
+#: data_importer.py:302 data_importer.py:545
#, python-format
msgid "Choice for \"%s\" is not available. Which one is relevant?\n"
msgstr ""
-#: data_importer.py:306
+#: data_importer.py:309
#, python-format
msgid "%d. None of the above - create new"
msgstr ""
-#: data_importer.py:309
+#: data_importer.py:312
#, python-format
msgid "%d. None of the above - skip"
msgstr ""
-#: data_importer.py:503
+#: data_importer.py:508
#, python-format
msgid "\"%(value)s\" is not a valid path for the given archive"
msgstr ""
-#: data_importer.py:615
+#: data_importer.py:620
msgid ""
"The given file is not correct. Check the file format. If you use a CSV file: "
"check that column separator and encoding are similar to the ones used by the "
"reference file."
msgstr ""
-#: data_importer.py:619
+#: data_importer.py:624
#, python-format
msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"
msgstr ""
-#: data_importer.py:621
+#: data_importer.py:626
msgid "No data provided"
msgstr ""
-#: data_importer.py:622
+#: data_importer.py:627
msgid "Value is required"
msgstr ""
-#: data_importer.py:623
+#: data_importer.py:628
#, python-format
msgid "At least %d columns must be filled"
msgstr ""
-#: data_importer.py:624
+#: data_importer.py:629
msgid "The regexp doesn't match."
msgstr ""
-#: data_importer.py:1032
+#: data_importer.py:1037
msgid "Not imported"
msgstr ""
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "line"
msgstr ""
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "col"
msgstr ""
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "error"
msgstr ""
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "field"
msgstr ""
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "source"
msgstr ""
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "result"
msgstr ""
-#: data_importer.py:1430
+#: data_importer.py:1463
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr ""
-#: forms.py:71 forms_common.py:441
+#: forms.py:71 forms_common.py:489
msgid "Confirm"
msgstr ""
@@ -163,22 +163,22 @@ msgstr ""
msgid "Closing date"
msgstr ""
-#: forms.py:130
+#: forms.py:137
msgid "You should select an item."
msgstr ""
-#: forms.py:131
+#: forms.py:138
msgid "Add a new item"
msgstr ""
-#: forms.py:174 models.py:1099
+#: forms.py:204 models.py:1211
msgid "Template"
msgstr ""
#: forms_common.py:39 forms_common.py:57 forms_common.py:169
-#: forms_common.py:289 models.py:1165 models.py:2420
+#: forms_common.py:292 models.py:1277 models.py:2555
#: templates/blocks/JQueryAdvancedTown.html:19
-#: templates/ishtar/sheet_organization.html:17
+#: templates/ishtar/sheet_organization.html:13
msgid "Town"
msgstr ""
@@ -192,269 +192,281 @@ msgid ""
"french town Saint-Denis in the Seine-Saint-Denis department.</p>"
msgstr ""
-#: forms_common.py:66 forms_common.py:669 ishtar_menu.py:42 models.py:1320
-#: models.py:2119 models.py:2248 models.py:2302
+#: forms_common.py:66 forms_common.py:717 ishtar_menu.py:47 models.py:1432
+#: models.py:2232 models.py:2379 models.py:2436
#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr ""
-#: forms_common.py:157 forms_common.py:231 ishtar_menu.py:66 models.py:1321
-#: models.py:2036 templates/ishtar/sheet_organization.html:6
+#: forms_common.py:157 forms_common.py:233 forms_common.py:335
+#: ishtar_menu.py:71 models.py:1433 models.py:2149
+#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr ""
-#: forms_common.py:160 forms_common.py:196 forms_common.py:226
-#: forms_common.py:259 models.py:812 models.py:1098 models.py:1366
-#: models.py:1584 models.py:2030 models.py:2106 models.py:2406
-#: templates/ishtar/sheet_organization.html:12
-#: templates/ishtar/sheet_organization.html:25
+#: forms_common.py:160 forms_common.py:196 forms_common.py:228
+#: forms_common.py:262 forms_common.py:330 models.py:886 models.py:1210
+#: models.py:1478 models.py:1696 models.py:2143 models.py:2219 models.py:2541
+#: templates/ishtar/sheet_organization.html:8
+#: templates/ishtar/sheet_organization.html:21
msgid "Name"
msgstr ""
-#: forms_common.py:161 models.py:1307 models.py:1715
+#: forms_common.py:161 models.py:1419 models.py:1827
msgid "Organization type"
msgstr ""
-#: forms_common.py:163 forms_common.py:283 models.py:1160
-#: templates/ishtar/sheet_organization.html:14
+#: forms_common.py:163 forms_common.py:286 models.py:1272
+#: templates/ishtar/sheet_organization.html:10
msgid "Address"
msgstr ""
-#: forms_common.py:165 forms_common.py:286 models.py:1161
-#: templates/ishtar/sheet_organization.html:15
+#: forms_common.py:165 forms_common.py:289 models.py:1273
+#: templates/ishtar/sheet_organization.html:11
msgid "Address complement"
msgstr ""
-#: forms_common.py:167 forms_common.py:287 models.py:1163
-#: templates/ishtar/sheet_organization.html:16
+#: forms_common.py:167 forms_common.py:290 models.py:1275
+#: templates/ishtar/sheet_organization.html:12
msgid "Postal code"
msgstr ""
-#: forms_common.py:170 forms_common.py:290 models.py:1166
+#: forms_common.py:170 forms_common.py:293 models.py:1278
msgid "Country"
msgstr ""
-#: forms_common.py:172 forms_common.py:228 forms_common.py:263
-#: forms_common.py:397 models.py:1193
+#: forms_common.py:172 forms_common.py:230 forms_common.py:266
+#: forms_common.py:332 forms_common.py:445 models.py:1305
msgid "Email"
msgstr ""
-#: forms_common.py:173 forms_common.py:266 models.py:1178
-#: templates/ishtar/sheet_organization.html:18
-#: templates/ishtar/sheet_person.html:19
+#: forms_common.py:173 forms_common.py:269 models.py:1290
+#: templates/ishtar/sheet_organization.html:14
+#: templates/ishtar/sheet_person.html:18
#: templates/ishtar/wizard/wizard_person.html:17
msgid "Phone"
msgstr ""
-#: forms_common.py:174 forms_common.py:275 models.py:1190
-#: templates/ishtar/sheet_organization.html:19
-#: templates/ishtar/sheet_person.html:37
+#: forms_common.py:174 forms_common.py:278 models.py:1302
+#: templates/ishtar/sheet_organization.html:15
+#: templates/ishtar/sheet_person.html:36
#: templates/ishtar/wizard/wizard_person.html:35
msgid "Mobile phone"
msgstr ""
-#: forms_common.py:197 forms_common.py:229 models.py:1741 models.py:2032
-#: models.py:2343 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
-#: templates/sheet_ope.html:126 templates/ishtar/import_list.html:13
-#: templates/ishtar/sheet_organization.html:27
-#: templates/ishtar/sheet_person.html:91
+#: forms_common.py:197 forms_common.py:231 forms_common.py:333 models.py:1854
+#: models.py:2145 models.py:2477 templates/sheet_ope.html:85
+#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
+#: templates/ishtar/import_list.html:13
+#: templates/ishtar/sheet_organization.html:23
#: templates/ishtar/blocks/window_tables/documents.html:6
msgid "Type"
msgstr ""
-#: forms_common.py:206 views.py:128
+#: forms_common.py:206 views.py:130
msgid "Organization search"
msgstr ""
-#: forms_common.py:227 forms_common.py:257 models.py:2104
-#: templates/ishtar/sheet_organization.html:26
+#: forms_common.py:229 forms_common.py:260 forms_common.py:331 models.py:2217
+#: templates/ishtar/sheet_organization.html:22
msgid "Surname"
msgstr ""
-#: forms_common.py:243 views.py:93
+#: forms_common.py:245 forms_common.py:318 views.py:95
msgid "Person search"
msgstr ""
-#: forms_common.py:254 templates/ishtar/sheet_person.html:8
+#: forms_common.py:257 templates/ishtar/sheet_person.html:7
#: templates/ishtar/wizard/wizard_person.html:6
msgid "Identity"
msgstr ""
-#: forms_common.py:256 forms_common.py:595 forms_common.py:636 models.py:2102
-#: models.py:2340 templates/sheet_ope.html:104
-#: templates/ishtar/sheet_person.html:90
+#: forms_common.py:259 forms_common.py:643 forms_common.py:684 models.py:2215
+#: models.py:2474 templates/sheet_ope.html:104
#: templates/ishtar/blocks/window_tables/documents.html:5
msgid "Title"
msgstr ""
-#: forms_common.py:261 models.py:2108
+#: forms_common.py:264 models.py:2221
msgid "Raw name"
msgstr ""
-#: forms_common.py:264 models.py:1179
+#: forms_common.py:267 models.py:1291
msgid "Phone description"
msgstr ""
-#: forms_common.py:267 models.py:1181 models.py:1183
+#: forms_common.py:270 models.py:1293 models.py:1295
msgid "Phone description 2"
msgstr ""
-#: forms_common.py:269
+#: forms_common.py:272
msgid "Phone 2"
msgstr ""
-#: forms_common.py:271 models.py:1187
+#: forms_common.py:274 models.py:1299
msgid "Phone description 3"
msgstr ""
-#: forms_common.py:273 models.py:1185
+#: forms_common.py:276 models.py:1297
msgid "Phone 3"
msgstr ""
-#: forms_common.py:278
+#: forms_common.py:281
msgid "Current organization"
msgstr ""
-#: forms_common.py:292 models.py:1168
+#: forms_common.py:295 models.py:1280
msgid "Other address: address"
msgstr ""
-#: forms_common.py:295 models.py:1171
+#: forms_common.py:298 models.py:1283
msgid "Other address: address complement"
msgstr ""
-#: forms_common.py:297 models.py:1172
+#: forms_common.py:300 models.py:1284
msgid "Other address: postal code"
msgstr ""
-#: forms_common.py:299 models.py:1174
+#: forms_common.py:302 models.py:1286
msgid "Other address: town"
msgstr ""
-#: forms_common.py:301 models.py:1176
+#: forms_common.py:304 models.py:1288
msgid "Other address: country"
msgstr ""
-#: forms_common.py:346 forms_common.py:376 forms_common.py:380 models.py:2084
+#: forms_common.py:314
+msgid "Already has an account"
+msgstr ""
+
+#: forms_common.py:329
+msgid "Username"
+msgstr ""
+
+#: forms_common.py:347
+msgid "Account search"
+msgstr ""
+
+#: forms_common.py:394 forms_common.py:424 forms_common.py:428 models.py:2197
msgid "Person type"
msgstr ""
-#: forms_common.py:391 forms_common.py:396
+#: forms_common.py:439 forms_common.py:444 ishtar_menu.py:32
msgid "Account"
msgstr ""
-#: forms_common.py:400 wizards.py:1158
+#: forms_common.py:448 wizards.py:1170
msgid "New password"
msgstr ""
-#: forms_common.py:403
+#: forms_common.py:451
msgid "New password (confirmation)"
msgstr ""
-#: forms_common.py:422
+#: forms_common.py:470
msgid "Your password and confirmation password do not match."
msgstr ""
-#: forms_common.py:427
+#: forms_common.py:475
msgid "You must provide a correct password."
msgstr ""
-#: forms_common.py:435
+#: forms_common.py:483
msgid "This username already exists."
msgstr ""
-#: forms_common.py:442
+#: forms_common.py:490
msgid "Send the new password by email?"
msgstr ""
-#: forms_common.py:451 forms_common.py:464 models.py:2421
+#: forms_common.py:499 forms_common.py:512 models.py:2556
msgid "Towns"
msgstr ""
-#: forms_common.py:461
+#: forms_common.py:509
msgid "There are identical towns."
msgstr ""
-#: forms_common.py:545
+#: forms_common.py:593
msgid "Only one choice can be checked."
msgstr ""
-#: forms_common.py:593
+#: forms_common.py:641
msgid "Documentation informations"
msgstr ""
-#: forms_common.py:597 forms_common.py:637 models.py:1716 models.py:2323
+#: forms_common.py:645 forms_common.py:685 models.py:1828 models.py:2457
msgid "Source type"
msgstr ""
-#: forms_common.py:599 forms_common.py:638 templates/sheet_ope.html:84
+#: forms_common.py:647 forms_common.py:686 templates/sheet_ope.html:84
msgid "Reference"
msgstr ""
-#: forms_common.py:602 forms_common.py:639
+#: forms_common.py:650 forms_common.py:687
msgid "Internal reference"
msgstr ""
-#: forms_common.py:605 models.py:2354
+#: forms_common.py:653 models.py:2488
msgid "Numerical ressource (web address)"
msgstr ""
-#: forms_common.py:606 models.py:2356
+#: forms_common.py:654 models.py:2490
msgid "Receipt date"
msgstr ""
-#: forms_common.py:608 models.py:1868 models.py:2358
+#: forms_common.py:656 models.py:1981 models.py:2492
msgid "Creation date"
msgstr ""
-#: forms_common.py:611 models.py:2361
+#: forms_common.py:659 models.py:2495
msgid "Receipt date in documentation"
msgstr ""
-#: forms_common.py:613 forms_common.py:641 models.py:282 models.py:490
-#: models.py:1611 models.py:2112 models.py:2368
+#: forms_common.py:661 forms_common.py:689 models.py:287 models.py:516
+#: models.py:1723 models.py:2225 models.py:2502
msgid "Comment"
msgstr ""
-#: forms_common.py:615 forms_common.py:640 models.py:814 models.py:1370
-#: models.py:1543 models.py:1585 models.py:2367 templates/sheet_ope.html:128
+#: forms_common.py:663 forms_common.py:688 models.py:888 models.py:1482
+#: models.py:1655 models.py:1697 models.py:2501 templates/sheet_ope.html:128
msgid "Description"
msgstr ""
-#: forms_common.py:618 models.py:2369
+#: forms_common.py:666 models.py:2503
msgid "Additional information"
msgstr ""
-#: forms_common.py:620 forms_common.py:644 models.py:2371
+#: forms_common.py:668 forms_common.py:692 models.py:2505
msgid "Has a duplicate"
msgstr ""
-#: forms_common.py:633 forms_common.py:662 forms_common.py:695 models.py:2307
+#: forms_common.py:681 forms_common.py:710 forms_common.py:743 models.py:2441
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr ""
-#: forms_common.py:643
+#: forms_common.py:691
msgid "Additional informations"
msgstr ""
-#: forms_common.py:654
+#: forms_common.py:702
msgid "Would you like to delete this documentation?"
msgstr ""
-#: forms_common.py:670 models.py:1717 models.py:2297 models.py:2304
+#: forms_common.py:718 models.py:1829 models.py:2431 models.py:2438
msgid "Author type"
msgstr ""
-#: forms_common.py:688
+#: forms_common.py:736
msgid "Author selection"
msgstr ""
-#: forms_common.py:702
+#: forms_common.py:750
msgid "There are identical authors."
msgstr ""
-#: forms_common.py:706 models.py:2308 models.py:2350
+#: forms_common.py:754 models.py:2442 models.py:2484
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Authors"
@@ -464,52 +476,56 @@ msgstr ""
msgid "Administration"
msgstr ""
-#: ishtar_menu.py:31 views.py:154
-msgid "Account management"
+#: ishtar_menu.py:33
+msgid "Add/modify"
msgstr ""
-#: ishtar_menu.py:34 models.py:894 views.py:1140
+#: ishtar_menu.py:36
+msgid "Deletion"
+msgstr ""
+
+#: ishtar_menu.py:39 models.py:1006 views.py:1232
msgid "Global variables"
msgstr ""
-#: ishtar_menu.py:39
+#: ishtar_menu.py:44
msgid "Directory"
msgstr ""
-#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:3
+#: ishtar_menu.py:50 ishtar_menu.py:74 templates/blocks/JQueryJqGrid.html:3
msgid "Search"
msgstr ""
-#: ishtar_menu.py:49 ishtar_menu.py:74 templates/ishtar/import_list.html:15
+#: ishtar_menu.py:54 ishtar_menu.py:79 templates/ishtar/import_list.html:15
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:53 ishtar_menu.py:79
+#: ishtar_menu.py:58 ishtar_menu.py:84
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:57 ishtar_menu.py:84 templates/ishtar/merge.html:5
+#: ishtar_menu.py:62 ishtar_menu.py:89 templates/ishtar/merge.html:5
msgid "Merge"
msgstr ""
-#: ishtar_menu.py:61 ishtar_menu.py:88 models.py:1905 widgets.py:110
+#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2018 widgets.py:110
#: templates/ishtar/form_delete.html:11
msgid "Delete"
msgstr ""
-#: ishtar_menu.py:96 models.py:1879
+#: ishtar_menu.py:101 models.py:1992
msgid "Imports"
msgstr ""
-#: ishtar_menu.py:99 views.py:1148
+#: ishtar_menu.py:104 views.py:1240
msgid "New import"
msgstr ""
-#: ishtar_menu.py:103 views.py:1162
+#: ishtar_menu.py:108 views.py:1254
msgid "Current imports"
msgstr ""
-#: ishtar_menu.py:107
+#: ishtar_menu.py:112
msgid "Old imports"
msgstr ""
@@ -525,692 +541,770 @@ msgstr ""
msgid "This item already exists."
msgstr ""
-#: models.py:278 models.py:489 models.py:1133 models.py:1145
+#: models.py:283 models.py:515 models.py:1245 models.py:1257
msgid "Label"
msgstr ""
-#: models.py:280
+#: models.py:285
msgid "Textual ID"
msgstr ""
-#: models.py:283 models.py:492 models.py:1102
+#: models.py:288 models.py:518 models.py:1214
msgid "Available"
msgstr ""
-#: models.py:511 models.py:1657
+#: models.py:537 models.py:1769
msgid "Key"
msgstr ""
-#: models.py:517
+#: models.py:543
msgid "Specific key to an import"
msgstr ""
-#: models.py:593
+#: models.py:623
msgid "Last editor"
msgstr ""
-#: models.py:596
+#: models.py:626
msgid "Creator"
msgstr ""
-#: models.py:729 models.py:2432
+#: models.py:766 models.py:2567
msgid "Order"
msgstr ""
-#: models.py:730
+#: models.py:767
msgid "Symmetrical"
msgstr ""
-#: models.py:743
+#: models.py:768
+msgid "Tiny label"
+msgstr ""
+
+#: models.py:782
msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
-#: models.py:813 models.py:1368
+#: models.py:880
+msgid "Euro"
+msgstr ""
+
+#: models.py:881
+msgid "US dollar"
+msgstr ""
+
+#: models.py:887 models.py:1480
msgid "Slug"
msgstr ""
-#: models.py:815
+#: models.py:889
msgid "Files module"
msgstr ""
-#: models.py:816
+#: models.py:890
msgid "Context records module"
msgstr ""
-#: models.py:818
+#: models.py:892
msgid "Finds module"
msgstr ""
-#: models.py:819
+#: models.py:893
msgid "Need context records module"
msgstr ""
-#: models.py:821
+#: models.py:895
msgid "Warehouses module"
msgstr ""
-#: models.py:822
+#: models.py:896
msgid "Need finds module"
msgstr ""
-#: models.py:824
+#: models.py:898
msgid "Home page"
msgstr ""
-#: models.py:825
+#: models.py:899
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax."
msgstr ""
-#: models.py:827
+#: models.py:902
+msgid "File external id"
+msgstr ""
+
+#: models.py:904
+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:909
+msgid "Parcel external id"
+msgstr ""
+
+#: models.py:912
+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:917
+msgid "Context record external id"
+msgstr ""
+
+#: models.py:919
+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:924
+msgid "Base find external id"
+msgstr ""
+
+#: models.py:926
+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:931
+msgid "Find external id"
+msgstr ""
+
+#: models.py:933
+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:937
msgid "Current active"
msgstr ""
-#: models.py:830
+#: models.py:938
+msgid "Currency"
+msgstr ""
+
+#: models.py:942
msgid "Ishtar site profile"
msgstr ""
-#: models.py:831
+#: models.py:943
msgid "Ishtar site profiles"
msgstr ""
-#: models.py:887
+#: models.py:999
msgid "Variable name"
msgstr ""
-#: models.py:888
+#: models.py:1000
msgid "Description of the variable"
msgstr ""
-#: models.py:890 models.py:1658
+#: models.py:1002 models.py:1770
msgid "Value"
msgstr ""
-#: models.py:893
+#: models.py:1005
msgid "Global variable"
msgstr ""
-#: models.py:1003 models.py:1033
+#: models.py:1115 models.py:1145
msgid "Total"
msgstr ""
-#: models.py:1010 models.py:1134 models.py:1146
-#: templates/ishtar/sheet_person.html:22
+#: models.py:1122 models.py:1246 models.py:1258
+#: templates/ishtar/sheet_person.html:21
#: templates/ishtar/dashboards/dashboard_main_detail.html:135
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
#: templates/ishtar/wizard/wizard_person.html:20
msgid "Number"
msgstr ""
-#: models.py:1097
+#: models.py:1209
msgid "Administrative Act"
msgstr ""
-#: models.py:1101
+#: models.py:1213
msgid "Associated object"
msgstr ""
-#: models.py:1105
+#: models.py:1217
msgid "Document template"
msgstr ""
-#: models.py:1106
+#: models.py:1218
msgid "Document templates"
msgstr ""
-#: models.py:1137 models.py:1147 models.py:1863
+#: models.py:1249 models.py:1259 models.py:1976
msgid "State"
msgstr ""
-#: models.py:1151 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1263 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr ""
-#: models.py:1152
+#: models.py:1264
msgid "Departments"
msgstr ""
-#: models.py:1189
+#: models.py:1301
msgid "Raw phone"
msgstr ""
-#: models.py:1195
+#: models.py:1307
msgid "Alternative address is prefered"
msgstr ""
-#: models.py:1234
+#: models.py:1346
msgid "Tel: "
msgstr ""
-#: models.py:1238
+#: models.py:1350
msgid "Mobile: "
msgstr ""
-#: models.py:1242
+#: models.py:1354
msgid "Email: "
msgstr ""
-#: models.py:1247
+#: models.py:1359
msgid "Merge key"
msgstr ""
-#: models.py:1308
+#: models.py:1420
msgid "Organization types"
msgstr ""
-#: models.py:1324
+#: models.py:1436
msgid "Archaeological site"
msgstr ""
-#: models.py:1325
+#: models.py:1437
msgid "Parcels"
msgstr ""
-#: models.py:1327
+#: models.py:1439
msgid "Operation source"
msgstr ""
-#: models.py:1330 views.py:965 views.py:1016
+#: models.py:1442 views.py:1057 views.py:1108
msgid "Archaeological files"
msgstr ""
-#: models.py:1332 views.py:968 views.py:1024
+#: models.py:1444 views.py:1060 views.py:1116
msgid "Context records"
msgstr ""
-#: models.py:1334
+#: models.py:1446
msgid "Context record relations"
msgstr ""
-#: models.py:1336 views.py:970 views.py:1027
+#: models.py:1448 views.py:1062 views.py:1119
msgid "Finds"
msgstr ""
-#: models.py:1372 templates/ishtar/dashboards/dashboard_main.html:26
+#: models.py:1484 templates/ishtar/dashboards/dashboard_main.html:25
msgid "Users"
msgstr ""
-#: models.py:1374
+#: models.py:1486
msgid "Associated model"
msgstr ""
-#: models.py:1377
+#: models.py:1489
msgid "Is template"
msgstr ""
-#: models.py:1378
+#: models.py:1490
msgid "Unicity keys (separator \";\")"
msgstr ""
-#: models.py:1382
+#: models.py:1494
msgid "Importer - Type"
msgstr ""
-#: models.py:1383
+#: models.py:1495
msgid "Importer - Types"
msgstr ""
-#: models.py:1473
+#: models.py:1585
msgid "Importer - Default"
msgstr ""
-#: models.py:1474
+#: models.py:1586
msgid "Importer - Defaults"
msgstr ""
-#: models.py:1509
+#: models.py:1621
msgid "Importer - Default value"
msgstr ""
-#: models.py:1510
+#: models.py:1622
msgid "Importer - Default values"
msgstr ""
-#: models.py:1542
+#: models.py:1654
msgid "Column number"
msgstr ""
-#: models.py:1545
+#: models.py:1657
msgid "Required"
msgstr ""
-#: models.py:1548
+#: models.py:1660
msgid "Importer - Column"
msgstr ""
-#: models.py:1549
+#: models.py:1661
msgid "Importer - Columns"
msgstr ""
-#: models.py:1569
+#: models.py:1681
msgid "Field name"
msgstr ""
-#: models.py:1571 models.py:1605
+#: models.py:1683 models.py:1717
msgid "Force creation of new items"
msgstr ""
-#: models.py:1573 models.py:1607
+#: models.py:1685 models.py:1719
msgid "Concatenate with existing"
msgstr ""
-#: models.py:1575 models.py:1609
+#: models.py:1687 models.py:1721
msgid "Concatenate character"
msgstr ""
-#: models.py:1579
+#: models.py:1691
msgid "Importer - Duplicate field"
msgstr ""
-#: models.py:1580
+#: models.py:1692
msgid "Importer - Duplicate fields"
msgstr ""
-#: models.py:1587
+#: models.py:1699
msgid "Regular expression"
msgstr ""
-#: models.py:1590
+#: models.py:1702
msgid "Importer - Regular expression"
msgstr ""
-#: models.py:1591
+#: models.py:1703
msgid "Importer - Regular expressions"
msgstr ""
-#: models.py:1614
+#: models.py:1726
msgid "Importer - Target"
msgstr ""
-#: models.py:1615
+#: models.py:1727
msgid "Importer - Targets"
msgstr ""
-#: models.py:1639 views.py:325
+#: models.py:1751 views.py:343
msgid "True"
msgstr ""
-#: models.py:1640 views.py:327
+#: models.py:1752 views.py:345
msgid "False"
msgstr ""
-#: models.py:1659
+#: models.py:1771
msgid "Is set"
msgstr ""
-#: models.py:1666
+#: models.py:1778
msgid "Importer - Target key"
msgstr ""
-#: models.py:1667
+#: models.py:1779
msgid "Importer - Targets keys"
msgstr ""
-#: models.py:1718 models.py:2335 models.py:2346
+#: models.py:1830 models.py:2469 models.py:2480
msgid "Format"
msgstr ""
-#: models.py:1719 models.py:2436
+#: models.py:1831 models.py:2571
msgid "Operation type"
msgstr ""
-#: models.py:1720
+#: models.py:1832
msgid "Period"
msgstr ""
-#: models.py:1721
+#: models.py:1833
+msgid "Report state"
+msgstr ""
+
+#: models.py:1834
msgid "Unit"
msgstr ""
-#: models.py:1722
+#: models.py:1835
msgid "Material"
msgstr ""
-#: models.py:1724
+#: models.py:1837
msgid "Conservatory state"
msgstr ""
-#: models.py:1725
+#: models.py:1838
msgid "Preservation type"
msgstr ""
-#: models.py:1726
+#: models.py:1839
msgid "Object type"
msgstr ""
-#: models.py:1728
+#: models.py:1841
msgid "Identification type"
msgstr ""
-#: models.py:1730
+#: models.py:1843
msgid "Context record relation type"
msgstr ""
-#: models.py:1731 models.py:2329
+#: models.py:1844 models.py:2463
msgid "Support type"
msgstr ""
-#: models.py:1737
+#: models.py:1850
msgid "Integer"
msgstr ""
-#: models.py:1738
+#: models.py:1851
msgid "Float"
msgstr ""
-#: models.py:1739
+#: models.py:1852
msgid "String"
msgstr ""
-#: models.py:1740 templates/sheet_ope.html:86
+#: models.py:1853 templates/sheet_ope.html:86
msgid "Date"
msgstr ""
-#: models.py:1742 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
-#: templates/ishtar/sheet_person.html:89
+#: models.py:1855 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
#: templates/ishtar/dashboards/dashboard_main_detail.html:120
msgid "Year"
msgstr ""
-#: models.py:1743
+#: models.py:1856
msgid "String to boolean"
msgstr ""
-#: models.py:1744
+#: models.py:1857
msgctxt "filesystem"
msgid "File"
msgstr ""
-#: models.py:1745
+#: models.py:1858
msgid "Unknow type"
msgstr ""
-#: models.py:1761
+#: models.py:1874
msgid "4 digit year. e.g.: \"2015\""
msgstr ""
-#: models.py:1762
+#: models.py:1875
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr ""
-#: models.py:1763
+#: models.py:1876
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr ""
-#: models.py:1773
+#: models.py:1886
msgid "Options"
msgstr ""
-#: models.py:1775
+#: models.py:1888
msgid "Split character(s)"
msgstr ""
-#: models.py:1779
+#: models.py:1892
msgid "Importer - Formater type"
msgstr ""
-#: models.py:1780
+#: models.py:1893
msgid "Importer - Formater types"
msgstr ""
-#: models.py:1827 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:1940 templates/ishtar/dashboards/dashboard_main_detail.html:61
msgid "Created"
msgstr ""
-#: models.py:1828
+#: models.py:1941
msgid "Analyse in progress"
msgstr ""
-#: models.py:1829
+#: models.py:1942
msgid "Analysed"
msgstr ""
-#: models.py:1830
+#: models.py:1943
msgid "Import pending"
msgstr ""
-#: models.py:1831
+#: models.py:1944
msgid "Import in progress"
msgstr ""
-#: models.py:1832
+#: models.py:1945
msgid "Finished with errors"
msgstr ""
-#: models.py:1833
+#: models.py:1946
msgid "Finished"
msgstr ""
-#: models.py:1834
+#: models.py:1947
msgid "Archived"
msgstr ""
-#: models.py:1846
+#: models.py:1959
msgid "Imported file"
msgstr ""
-#: models.py:1849
+#: models.py:1962
msgid "Associated images (zip file)"
msgstr ""
-#: models.py:1851
+#: models.py:1964
msgid "Encoding"
msgstr ""
-#: models.py:1853
+#: models.py:1966
msgid "Skip lines"
msgstr ""
-#: models.py:1854 templates/ishtar/import_list.html:47
+#: models.py:1967 templates/ishtar/import_list.html:47
msgid "Error file"
msgstr ""
-#: models.py:1857
+#: models.py:1970
msgid "Result file"
msgstr ""
-#: models.py:1860 templates/ishtar/import_list.html:53
+#: models.py:1973 templates/ishtar/import_list.html:53
msgid "Match file"
msgstr ""
-#: models.py:1866
+#: models.py:1979
msgid "Conservative import"
msgstr ""
-#: models.py:1871
+#: models.py:1984
msgid "End date"
msgstr ""
-#: models.py:1873
+#: models.py:1986
msgid "Remaining seconds"
msgstr ""
-#: models.py:1878
+#: models.py:1991
msgid "Import"
msgstr ""
-#: models.py:1895
+#: models.py:2008
msgid "Analyse"
msgstr ""
-#: models.py:1897 models.py:1900
+#: models.py:2010 models.py:2013
msgid "Re-analyse"
msgstr ""
-#: models.py:1898
+#: models.py:2011
msgid "Launch import"
msgstr ""
-#: models.py:1901
+#: models.py:2014
msgid "Re-import"
msgstr ""
-#: models.py:1902
+#: models.py:2015
msgid "Archive"
msgstr ""
-#: models.py:1904
+#: models.py:2017
msgid "Unarchive"
msgstr ""
-#: models.py:2037
+#: models.py:2150
msgid "Organizations"
msgstr ""
-#: models.py:2039
+#: models.py:2152
msgid "Can view all Organizations"
msgstr ""
-#: models.py:2040
+#: models.py:2153
msgid "Can view own Organization"
msgstr ""
-#: models.py:2041
+#: models.py:2154
msgid "Can add own Organization"
msgstr ""
-#: models.py:2043
+#: models.py:2156
msgid "Can change own Organization"
msgstr ""
-#: models.py:2045
+#: models.py:2158
msgid "Can delete own Organization"
msgstr ""
-#: models.py:2080
+#: models.py:2193
msgid "Groups"
msgstr ""
-#: models.py:2085
+#: models.py:2198
msgid "Person types"
msgstr ""
-#: models.py:2092
+#: models.py:2205
msgid "Mr"
msgstr ""
-#: models.py:2093
+#: models.py:2206
msgid "Miss"
msgstr ""
-#: models.py:2094
+#: models.py:2207
msgid "Mr and Mrs"
msgstr ""
-#: models.py:2095
+#: models.py:2208
msgid "Mrs"
msgstr ""
-#: models.py:2096
+#: models.py:2209
msgid "Doctor"
msgstr ""
-#: models.py:2110
+#: models.py:2223
msgid "Contact type"
msgstr ""
-#: models.py:2113 models.py:2160
+#: models.py:2226 models.py:2273
msgid "Types"
msgstr ""
-#: models.py:2116
+#: models.py:2229
msgid "Is attached to"
msgstr ""
-#: models.py:2120
+#: models.py:2233
msgid "Persons"
msgstr ""
-#: models.py:2122
+#: models.py:2235
msgid "Can view all Persons"
msgstr ""
-#: models.py:2123
+#: models.py:2236
msgid "Can view own Person"
msgstr ""
-#: models.py:2124
+#: models.py:2237
msgid "Can add own Person"
msgstr ""
-#: models.py:2125
+#: models.py:2238
msgid "Can change own Person"
msgstr ""
-#: models.py:2126
+#: models.py:2239
msgid "Can delete own Person"
msgstr ""
-#: models.py:2252
+#: models.py:2383
msgid "Ishtar user"
msgstr ""
-#: models.py:2253
+#: models.py:2384
msgid "Ishtar users"
msgstr ""
-#: models.py:2298
+#: models.py:2426
+msgid "To modify the password use the form in Auth > User"
+msgstr ""
+
+#: models.py:2432
msgid "Author types"
msgstr ""
-#: models.py:2324
+#: models.py:2458
msgid "Source types"
msgstr ""
-#: models.py:2330
+#: models.py:2464
msgid "Support types"
msgstr ""
-#: models.py:2336
+#: models.py:2470
msgid "Formats"
msgstr ""
-#: models.py:2341
+#: models.py:2475
msgid "External ID"
msgstr ""
-#: models.py:2344
+#: models.py:2478
msgid "Support"
msgstr ""
-#: models.py:2348
+#: models.py:2482
msgid "Scale"
msgstr ""
-#: models.py:2362
+#: models.py:2496
msgid "Item number"
msgstr ""
-#: models.py:2363
+#: models.py:2497
msgid "Ref."
msgstr ""
-#: models.py:2366
+#: models.py:2500
msgid "Internal ref."
msgstr ""
-#: models.py:2407
+#: models.py:2542
msgid "Surface (m2)"
msgstr ""
-#: models.py:2408 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2543 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr ""
-#: models.py:2433
+#: models.py:2568
msgid "Is preventive"
msgstr ""
-#: models.py:2437
+#: models.py:2572
msgid "Operation types"
msgstr ""
-#: models.py:2463
+#: models.py:2598
msgid "Preventive"
msgstr ""
-#: models.py:2464
+#: models.py:2599
msgid "Research"
msgstr ""
@@ -1218,86 +1312,88 @@ msgstr ""
msgid " (...)"
msgstr ""
-#: views.py:100
+#: views.py:102
msgid "New person"
msgstr ""
-#: views.py:108
+#: views.py:110
msgid "Person modification"
msgstr ""
-#: views.py:123
+#: views.py:125
msgid "Person deletion"
msgstr ""
-#: views.py:134
+#: views.py:136
msgid "New organization"
msgstr ""
-#: views.py:141
+#: views.py:143
msgid "Organization modification"
msgstr ""
-#: views.py:147
+#: views.py:159
msgid "Organization deletion"
msgstr ""
-#: views.py:662 templates/base.html:81 templates/ishtar/basket_list.html:4
-#: templates/ishtar/sheet_organization.html:35
-#: templatetags/link_to_window.py:18
-msgid "Details"
+#: views.py:166
+msgid "Account management"
msgstr ""
-#: views.py:893 views.py:947
+#: views.py:172
+msgid "Account deletion"
+msgstr ""
+
+#: views.py:970 views.py:1039
msgid "Operation not permitted."
msgstr ""
-#: views.py:895
+#: views.py:972
#, python-format
msgid "New %s"
msgstr ""
-#: views.py:966 views.py:1020
+#: views.py:1058 views.py:1112
msgid "Operations"
msgstr ""
-#: views.py:1209 templates/ishtar/import_list.html:43
+#: views.py:1301 templates/ishtar/import_list.html:43
msgid "Link unmatched items"
msgstr ""
-#: views.py:1224
+#: views.py:1316
msgid "Delete import"
msgstr ""
-#: views.py:1283 views.py:1299
+#: views.py:1375 views.py:1391
msgid "Corporation manager"
msgstr ""
-#: widgets.py:237 widgets.py:345 widgets.py:461
+#: widgets.py:239 widgets.py:347 widgets.py:463
msgid "Search..."
msgstr ""
-#: widgets.py:604 templatetags/window_tables.py:71
+#: widgets.py:608 templatetags/window_tables.py:76
msgid "No results"
msgstr ""
-#: widgets.py:605 templatetags/window_tables.py:72
+#: widgets.py:609 templatetags/window_tables.py:77
msgid "Loading..."
msgstr ""
-#: widgets.py:606
+#: widgets.py:610
msgid "Remove"
msgstr ""
-#: wizards.py:318 templates/ishtar/import_delete.html:20
+#: wizards.py:321 templates/ishtar/import_delete.html:20
msgid "Yes"
msgstr ""
-#: wizards.py:320
+#: wizards.py:323
msgid "No"
msgstr ""
-#: wizards.py:1215
+#: wizards.py:1227
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr ""
@@ -1336,29 +1432,29 @@ msgstr ""
msgid "The %(app_name)s team"
msgstr ""
-#: templates/base.html:35
+#: templates/base.html:36
msgid "Logged in"
msgstr ""
-#: templates/base.html:36
+#: templates/base.html:37
msgid "Log out"
msgstr ""
-#: templates/base.html:37
+#: templates/base.html:38
msgid "Change password"
msgstr ""
-#: templates/base.html:39 templates/registration/activate.html:10
+#: templates/base.html:40 templates/registration/activate.html:10
#: templates/registration/login.html:8 templates/registration/login.html:10
#: templates/registration/password_reset_complete.html:8
msgid "Log in"
msgstr ""
-#: templates/base.html:45
+#: templates/base.html:46
msgid "Lang"
msgstr ""
-#: templates/base.html:45 templates/base.html.py:92 templates/welcome.html:7
+#: templates/base.html:46 templates/base.html.py:93 templates/welcome.html:7
#: templates/welcome.html.py:8 templates/welcome.html:9
#: templates/welcome.html.py:10 templates/ishtar/manage_basket.html:4
#: templates/ishtar/blocks/window_field.html:1
@@ -1368,26 +1464,23 @@ msgstr ""
msgid ":"
msgstr ""
-#: templates/base.html:70
+#: templates/base.html:71
msgid "Default selected items"
msgstr ""
-#: templates/base.html:90
+#: templates/base.html:91
msgid "Current items"
msgstr ""
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "Export as:"
msgstr ""
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "OpenOffice.org file"
msgstr ""
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "PDF file"
msgstr ""
@@ -1575,7 +1668,7 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: templates/sheet_ope.html:102 templates/ishtar/sheet_person.html:87
+#: templates/sheet_ope.html:102
msgid "Documents"
msgstr ""
@@ -1669,24 +1762,29 @@ msgstr ""
msgid "Search and select an item"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:16 templates/blocks/JQueryJqGrid.html:20
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:13
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12
msgid "Export as CSV"
msgstr ""
-#: templates/blocks/JQueryJqGrid.html:17
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
+msgid "CSV"
+msgstr ""
+
+#: templates/blocks/JQueryJqGrid.html:18
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
-msgid "simple"
+msgid "Export as CSV - full"
msgstr ""
#: templates/blocks/JQueryJqGrid.html:18
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:11
-msgid "full"
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+msgid "CSV full"
msgstr ""
#: templates/blocks/JQueryJqGrid.html:96
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:42
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
msgid "An error as occured during search. Check your query fields."
msgstr ""
@@ -1806,6 +1904,7 @@ msgstr ""
#: templates/ishtar/organization_person_form.html:32
#: templates/ishtar/person_form.html:43
#: templates/ishtar/blocks/modify_toolbar.html:1
+#: templates/ishtar/blocks/window_nav.html:39
msgid "Modify"
msgstr ""
@@ -1837,84 +1936,112 @@ msgstr ""
msgid "Contact informations"
msgstr ""
-#: templates/ishtar/sheet.html:21
-msgid "Previous"
-msgstr ""
-
-#: templates/ishtar/sheet.html:22
+#: templates/ishtar/sheet.html:28
msgid "Close"
msgstr ""
-#: templates/ishtar/sheet.html:23
+#: templates/ishtar/sheet.html:34
msgid "Close all windows"
msgstr ""
-#: templates/ishtar/sheet.html:24
-msgid "Next"
-msgstr ""
-
-#: templates/ishtar/sheet_organization.html:13
+#: templates/ishtar/sheet_organization.html:9
msgid "Created by:"
msgstr ""
-#: templates/ishtar/sheet_organization.html:23
+#: templates/ishtar/sheet_organization.html:19
msgid "Person in the organization"
msgstr ""
-#: templates/ishtar/sheet_organization.html:38
+#: templates/ishtar/sheet_organization.html:34
msgid "No person in this organization"
msgstr ""
-#: templates/ishtar/sheet_person.html:21
+#: templates/ishtar/sheet_person.html:20
#: templates/ishtar/wizard/wizard_person.html:19
msgid "Phone type"
msgstr ""
-#: templates/ishtar/sheet_person.html:44
+#: templates/ishtar/sheet_person.html:43
#: templates/ishtar/wizard/wizard_person.html:42
msgid "Business address"
msgstr ""
-#: templates/ishtar/sheet_person.html:52
+#: templates/ishtar/sheet_person.html:51
#: templates/ishtar/wizard/wizard_person.html:51
msgid "Other address"
msgstr ""
-#: templates/ishtar/sheet_person.html:60
+#: templates/ishtar/sheet_person.html:59
msgid "Associated organization"
msgstr ""
-#: templates/ishtar/sheet_person.html:71
+#: templates/ishtar/sheet_person.html:70
msgid "Associated operations as scientist"
msgstr ""
-#: templates/ishtar/sheet_person.html:75
+#: templates/ishtar/sheet_person.html:74
msgid "Associated operations as responsible"
msgstr ""
-#: templates/ishtar/sheet_person.html:81
+#: templates/ishtar/sheet_person.html:80
msgid "Associated archaelogical files"
msgstr ""
-#: templates/ishtar/sheet_person.html:92
-#: templates/ishtar/sheet_person.html:100
-#: templates/ishtar/blocks/window_tables/documents.html:9
-#: templates/ishtar/blocks/window_tables/documents.html:17
-msgid "Link"
+#: templates/ishtar/sheet_person.html:86
+msgid "Documents associated to operations"
+msgstr ""
+
+#: templates/ishtar/sheet_person.html:91
+msgid "Documents associated to context records"
msgstr ""
-#: templates/ishtar/sheet_person.html:104
-msgid "No document associated to this person"
+#: templates/ishtar/sheet_person.html:96
+msgid "Documents associated to finds"
msgstr ""
#: templates/ishtar/blocks/window_field_url.html:2
msgid "link"
msgstr ""
+#: templates/ishtar/blocks/window_nav.html:6
+msgid "Previous version"
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:17
+msgid "Restore this version"
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:17
+msgid ""
+"Are you sure to restore to this version? All changement made since this "
+"version will be lost."
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:22
+msgid "Restore"
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:24
+msgid "Next version"
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:45
+msgid "Export as OpenOffice.org file"
+msgstr ""
+
+#: templates/ishtar/blocks/window_nav.html:45
+msgid "Export as PDF file"
+msgstr ""
+
#: templates/ishtar/blocks/window_tables/documents.html:8
msgid "Related to"
msgstr ""
+#: templates/ishtar/blocks/window_tables/documents.html:9
+#: templates/ishtar/blocks/window_tables/documents.html:17
+msgid "Link"
+msgstr ""
+
#: templates/ishtar/dashboards/dashboard_main_detail.html:5
msgid "Numbers"
msgstr ""
@@ -2067,26 +2194,6 @@ msgstr ""
msgid "Associated persons"
msgstr ""
-#: templates/ishtar/wizard/wizard_organization_deletion.html:9
-#: templates/ishtar/wizard/wizard_organization_deletion.html:17
-#: templates/ishtar/wizard/wizard_organization_deletion.html:25
-#: templates/ishtar/wizard/wizard_organization_deletion.html:33
-#: templates/ishtar/wizard/wizard_person_deletion.html:9
-#: templates/ishtar/wizard/wizard_person_deletion.html:17
-#: templates/ishtar/wizard/wizard_person_deletion.html:25
-#: templates/ishtar/wizard/wizard_person_deletion.html:33
-#: templates/ishtar/wizard/wizard_person_deletion.html:41
-#: templates/ishtar/wizard/wizard_person_deletion.html:49
-#: templates/ishtar/wizard/wizard_person_deletion.html:57
-#: templates/ishtar/wizard/wizard_person_deletion.html:65
-#: templates/ishtar/wizard/wizard_person_deletion.html:73
-#: templates/ishtar/wizard/wizard_person_deletion.html:81
-#: templates/ishtar/wizard/wizard_person_deletion.html:98
-#: templates/ishtar/wizard/wizard_person_deletion.html:101
-#: templates/ishtar/wizard/wizard_person_deletion.html:111
-msgid "show"
-msgstr ""
-
#: templates/ishtar/wizard/wizard_organization_deletion.html:14
msgid "Associated archaeological files"
msgstr ""
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index 166360b56..3202d74b8 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.po
@@ -9,206 +9,218 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-04-07 09:18-0400\n"
+"PO-Revision-Date: 2016-08-25 07:30-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
-#: forms.py:45 forms.py:112 models.py:124
-#: templates/ishtar/sheet_contextrecord.html:72
+#: forms.py:46 forms.py:123 models.py:130
+#: templates/ishtar/sheet_contextrecord.html:57
msgid "ID"
msgstr "Identifiant"
-#: forms.py:49
+#: forms.py:51
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:50
+#: forms.py:52
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:52
+#: forms.py:54
msgid "Operation's number (index by year)"
msgstr "Numéro de l'opération (index par année)"
-#: forms.py:54
+#: forms.py:56
msgid "Archaelogical site"
msgstr "Entité Archéologique"
-#: forms.py:59 forms.py:178 models.py:48
+#: forms.py:62
+msgid "Search within operation relations"
+msgstr "Rechercher parmi les opérations reliées"
+
+#: forms.py:64 forms.py:189 models.py:48
msgid "Period"
msgstr "Période"
-#: forms.py:60
+#: forms.py:65
msgid "Unit type"
msgstr "Type d'unité"
-#: forms.py:61
-msgid "Parcel (section/number)"
-msgstr "Parcelle (section/numéro)"
+#: forms.py:66
+msgid "Parcel (section/number/public domain)"
+msgstr "Parcelle (section/nombre/domaine public)"
-#: forms.py:63
+#: forms.py:68
msgid "Search within relations"
msgstr "Recherche parmi les relations"
-#: forms.py:87 forms.py:274 views.py:111
+#: forms.py:98 forms.py:288 views.py:118
msgid "Context record search"
msgstr "Recherche d'Unité d'Enregistrement"
-#: forms.py:101
+#: forms.py:112
msgid "You should at least select one context record."
msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement."
-#: forms.py:107
+#: forms.py:118
msgid "General"
msgstr "Général"
-#: forms.py:111 models.py:117 models.py:120
-#: templates/ishtar/sheet_contextrecord.html:76
+#: forms.py:122 models.py:117 models.py:126
+#: templates/ishtar/sheet_contextrecord.html:61
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:114 models.py:125 templates/ishtar/sheet_contextrecord.html:42
-#: templates/ishtar/sheet_contextrecord.html:75
+#: forms.py:125 models.py:131 templates/ishtar/sheet_contextrecord.html:26
+#: templates/ishtar/sheet_contextrecord.html:60
msgid "Description"
msgstr "Description"
-#: forms.py:116 models.py:130
-msgid "Length (cm)"
-msgstr "Longueur (cm)"
+#: forms.py:127 models.py:136
+msgid "Length (m)"
+msgstr "Taille (m)"
-#: forms.py:117 models.py:131
-msgid "Width (cm)"
-msgstr "Largeur (cm)"
+#: forms.py:128 models.py:137
+msgid "Width (m)"
+msgstr "Largeur (m)"
-#: forms.py:118 models.py:132
-msgid "Thickness (cm)"
-msgstr "Épaisseur (cm)"
+#: forms.py:129 models.py:138
+msgid "Thickness (m)"
+msgstr "Épaisseur (m)"
-#: forms.py:119 models.py:134
-msgid "Depth (cm)"
-msgstr "Profondeur (cm)"
+#: forms.py:130 models.py:140
+msgid "Depth (m)"
+msgstr "Profondeur (m)"
-#: forms.py:120 models.py:140
+#: forms.py:131 models.py:148
msgid "Unit"
msgstr "Unité"
-#: forms.py:122 models.py:136
+#: forms.py:133 models.py:142
msgid "Location"
msgstr "Lieu"
-#: forms.py:167
+#: forms.py:178
msgid "This ID already exists for this operation."
msgstr "Cet identifiant existe déjà pour cette opération."
-#: forms.py:173 forms.py:197 models.py:59
+#: forms.py:184 forms.py:208 models.py:59
msgid "Dating"
msgstr "Datation"
-#: forms.py:179 models.py:49
+#: forms.py:190 models.py:49
msgid "Start date"
msgstr "Date de début"
-#: forms.py:180 models.py:50 models.py:129
+#: forms.py:191 models.py:50 models.py:135
msgid "End date"
msgstr "Date de fin"
-#: forms.py:181 models.py:53
+#: forms.py:192 models.py:53
msgid "Quality"
msgstr "Qualité"
-#: forms.py:182 models.py:35 models.py:51
+#: forms.py:193 models.py:35 models.py:51
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:206 ishtar_menu.py:29 models.py:321
+#: forms.py:217 ishtar_menu.py:29 models.py:354
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:226
+#: forms.py:237
msgid "Relations"
msgstr "Relations"
-#: forms.py:230 forms.py:237 models.py:145
-#: templates/ishtar/sheet_contextrecord.html:52
+#: forms.py:241 forms.py:251 models.py:153
+#: templates/ishtar/sheet_contextrecord.html:37
msgid "Interpretation"
msgstr "Interprétation"
-#: forms.py:233 models.py:142
+#: forms.py:245
+msgid "Comments on dating"
+msgstr "Commentaires sur la datation"
+
+#: forms.py:247 models.py:150
msgid "Has furniture?"
msgstr "Contient du mobilier ?"
-#: forms.py:235 models.py:144
+#: forms.py:249 models.py:152
msgid "Filling"
msgstr "Remplissage"
-#: forms.py:239 models.py:165
+#: forms.py:253 models.py:173
msgid "Activity"
msgstr "Activité"
-#: forms.py:241 models.py:163
+#: forms.py:255 models.py:171
msgid "Identification"
msgstr "Identification"
-#: forms.py:243 models.py:148
+#: forms.py:257 models.py:156
msgid "TAQ"
msgstr "TAQ"
-#: forms.py:244 models.py:152
+#: forms.py:258 models.py:160
msgid "Estimated TAQ"
msgstr "TAQ estimé"
-#: forms.py:246 models.py:155
+#: forms.py:260 models.py:163
msgid "TPQ"
msgstr "TPQ"
-#: forms.py:247 models.py:159
+#: forms.py:261 models.py:167
msgid "Estimated TPQ"
msgstr "TPQ estimé"
-#: forms.py:260
+#: forms.py:274
msgid "Operation search"
msgstr "Recherche d'Opérations"
-#: forms.py:262
+#: forms.py:276
msgid "You should select an operation."
msgstr "Vous devez sélectionner une Opération."
-#: forms.py:267
+#: forms.py:281
msgid "Would you like to delete this context record?"
msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?"
-#: forms.py:276
+#: forms.py:290
msgid "You should select a context record."
msgstr "Vous devez sélectionner une Unité d'Enregistrement."
-#: forms.py:281
-msgid "Town of the operation"
-msgstr "Commune de l'opération"
-
-#: forms.py:283
+#: forms.py:295
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:285
+#: forms.py:297
+msgid "Numeric reference"
+msgstr "Référence numérique"
+
+#: forms.py:303
+msgid "Town of the operation"
+msgstr "Commune de l'opération"
+
+#: forms.py:305
msgid "Period of the context record"
msgstr "Période de l'Unité d'Enregistrement"
-#: forms.py:287
+#: forms.py:307
msgid "Unit type of the context record"
msgstr "Type d'unité de l'Unité d'Enregistrement"
-#: forms.py:300
+#: forms.py:320
msgid "Documentation search"
msgstr "Recherche de documents"
-#: forms.py:302
+#: forms.py:322
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: ishtar_menu.py:31
+#: ishtar_menu.py:31 ishtar_menu.py:50
msgid "Search"
msgstr "Recherche"
@@ -216,11 +228,11 @@ msgstr "Recherche"
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:39 ishtar_menu.py:56
+#: ishtar_menu.py:39 ishtar_menu.py:61
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:43 ishtar_menu.py:62
+#: ishtar_menu.py:43 ishtar_menu.py:67
msgid "Deletion"
msgstr "Suppression"
@@ -228,7 +240,7 @@ msgstr "Suppression"
msgid "Documentation"
msgstr "Documentation"
-#: ishtar_menu.py:50
+#: ishtar_menu.py:55
msgid "Add"
msgstr "Ajout"
@@ -284,27 +296,35 @@ msgstr "Type d'identification"
msgid "Identification Types"
msgstr "Types d'identification"
-#: models.py:118
+#: models.py:123
msgid "External ID"
msgstr "ID externe"
-#: models.py:122 wizards.py:68
+#: models.py:125
+msgid "External ID is set automatically"
+msgstr "L'identifiant externe est configuré automatiquement"
+
+#: models.py:128 wizards.py:68
msgid "Operation"
msgstr "Opération"
-#: models.py:126
+#: models.py:132
msgid "Comment"
msgstr "Commentaires"
-#: models.py:127
+#: models.py:133
msgid "Date d'ouverture"
msgstr "Date d'ouverture"
-#: models.py:137
+#: models.py:143
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:149
+#: models.py:146
+msgid "Comment on datings"
+msgstr "Commentaire sur les datations"
+
+#: models.py:157
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
@@ -312,11 +332,11 @@ msgstr ""
"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée "
"après cette date"
-#: models.py:153
+#: models.py:161
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr "Estimation d'un « Terminus Ante Quem »"
-#: models.py:156
+#: models.py:164
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
@@ -324,298 +344,281 @@ msgstr ""
"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée "
"avant cette date"
-#: models.py:160
+#: models.py:168
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »"
-#: models.py:171 models.py:172 templates/ishtar/sheet_contextrecord.html:6
+#: models.py:176
+msgid "Point"
+msgstr "Point"
+
+#: models.py:177
+msgid "Polygon"
+msgstr "Polygone"
+
+#: models.py:181 models.py:182 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:174
+#: models.py:184
msgid "Can view all Context Records"
msgstr "Peut voir toutes les Unités d'Enregistrement"
-#: models.py:176
+#: models.py:186
msgid "Can view own Context Record"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: models.py:178
+#: models.py:188
msgid "Can add own Context Record"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: models.py:180
+#: models.py:190
msgid "Can change own Context Record"
msgstr "Peut modifier sa propre Unité d'Enregistrement"
-#: models.py:182
+#: models.py:192
msgid "Can delete own Context Record"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: models.py:191
+#: models.py:201
msgctxt "short"
msgid "Context record"
msgstr "UE"
-#: models.py:290
+#: models.py:320
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:294 templates/ishtar/sheet_contextrecord.html:71
+#: models.py:324 templates/ishtar/sheet_contextrecord.html:56
msgid "Relation type"
msgstr "Type de relation"
-#: models.py:295
+#: models.py:325
msgid "Relation types"
msgstr "Types de relation"
-#: models.py:308
+#: models.py:338
msgid "Record relation"
msgstr "Relation entre Unités d'Enregistrement"
-#: models.py:309
+#: models.py:339
msgid "Record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: models.py:318
+#: models.py:351
msgid "Context record documentation"
msgstr "Documentation d'une Unité d'Enregistrement"
-#: models.py:319
+#: models.py:352
msgid "Context record documentations"
msgstr "Documentations des Unités d'Enregistrement"
-#: views.py:121
+#: views.py:128
msgid "New context record"
msgstr "Nouvelle Unité d'Enregistrement"
-#: views.py:131
+#: views.py:138
msgid "Context record modification"
msgstr "Modification d'une Unité d'Enregistrement"
-#: views.py:145
+#: views.py:152
msgid "Context record deletion"
msgstr "Suppression d'une Unité d'Enregistrement"
-#: views.py:153
+#: views.py:157
+msgid "Context record: source search"
+msgstr "Unité d'Enregistrement : recherche de documentation associée"
+
+#: views.py:165
msgid "Context record: new source"
msgstr "Unité d'Enregistrement : nouvelle documentation associée"
-#: views.py:161
+#: views.py:173
msgid "Context record: source modification"
msgstr "Unité d'Enregistrement : modification d'une documentation associée"
-#: views.py:167
+#: views.py:188
msgid "Context record: source deletion"
msgstr "Unité d'Enregistrement : suppression d'une documentation associée"
-#: templates/ishtar/sheet_contextrecord.html:13
-msgid "Previous version"
-msgstr "Version précédente"
-
-#: templates/ishtar/sheet_contextrecord.html:17
-msgid "Are you sure to rollback to this version?"
-msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
-
-#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Next version"
-msgstr "Version suivante"
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "Export as:"
-msgstr "Exporter en :"
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "OpenOffice.org file"
-msgstr "Fichier OpenOffice.org"
-
-#: templates/ishtar/sheet_contextrecord.html:22
-msgid "PDF file"
-msgstr "Fichier PDF"
-
-#: templates/ishtar/sheet_contextrecord.html:23
-msgid "Modify"
-msgstr "Modifier"
-
-#: templates/ishtar/sheet_contextrecord.html:26
+#: templates/ishtar/sheet_contextrecord.html:9
msgid "Complete ID:"
msgstr "ID complet :"
-#: templates/ishtar/sheet_contextrecord.html:28
-#: templates/ishtar/sheet_contextrecord.html:101
+#: templates/ishtar/sheet_contextrecord.html:11
+#: templates/ishtar/sheet_contextrecord.html:86
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
-#: templates/ishtar/sheet_contextrecord.html:29
+#: templates/ishtar/sheet_contextrecord.html:12
msgid "Temporary ID:"
msgstr "ID temporaire :"
-#: templates/ishtar/sheet_contextrecord.html:32
+#: templates/ishtar/sheet_contextrecord.html:15
msgid "Creation date:"
msgstr "Date de création :"
-#: templates/ishtar/sheet_contextrecord.html:33
+#: templates/ishtar/sheet_contextrecord.html:16
msgid "Created by:"
msgstr "Créé par :"
-#: templates/ishtar/sheet_contextrecord.html:35
-#: templates/ishtar/sheet_contextrecord.html:114
+#: templates/ishtar/sheet_contextrecord.html:18
+#: templates/ishtar/sheet_contextrecord.html:98
msgid "Type:"
msgstr "Type :"
-#: templates/ishtar/sheet_contextrecord.html:37
+#: templates/ishtar/sheet_contextrecord.html:20
msgid "Chronology:"
msgstr "Chronologie :"
-#: templates/ishtar/sheet_contextrecord.html:38
+#: templates/ishtar/sheet_contextrecord.html:22
msgid "Place:"
msgstr "Lieu :"
-#: templates/ishtar/sheet_contextrecord.html:39
+#: templates/ishtar/sheet_contextrecord.html:23
msgid "Parcel:"
msgstr "Parcelle :"
-#: templates/ishtar/sheet_contextrecord.html:44
+#: templates/ishtar/sheet_contextrecord.html:28
msgid "Description:"
msgstr "Description :"
-#: templates/ishtar/sheet_contextrecord.html:45
-#: templates/ishtar/sheet_contextrecord.html:117
+#: templates/ishtar/sheet_contextrecord.html:29
msgid "Comment:"
msgstr "Commentaires :"
-#: templates/ishtar/sheet_contextrecord.html:46
-msgid "Length (cm):"
-msgstr "Longueur (cm) :"
+#: templates/ishtar/sheet_contextrecord.html:30
+msgid "Length (m):"
+msgstr "Taille (m) :"
-#: templates/ishtar/sheet_contextrecord.html:47
-msgid "Width (cm):"
-msgstr "Largeur (cm) :"
+#: templates/ishtar/sheet_contextrecord.html:31
+msgid "Width (m):"
+msgstr "Largeur (m) :"
-#: templates/ishtar/sheet_contextrecord.html:48
-msgid "Depth (cm):"
-msgstr "Profondeur (cm) :"
+#: templates/ishtar/sheet_contextrecord.html:32
+msgid "Depth (m):"
+msgstr "Profondeur (m) :"
-#: templates/ishtar/sheet_contextrecord.html:54
+#: templates/ishtar/sheet_contextrecord.html:33
+msgid "Thickness (m):"
+msgstr "Épaisseur (m) :"
+
+#: templates/ishtar/sheet_contextrecord.html:39
msgid "Activity:"
msgstr "Activité :"
-#: templates/ishtar/sheet_contextrecord.html:55
+#: templates/ishtar/sheet_contextrecord.html:40
msgid "Identification:"
msgstr "Identification :"
-#: templates/ishtar/sheet_contextrecord.html:56
+#: templates/ishtar/sheet_contextrecord.html:41
msgid "Interpretation:"
msgstr "Interprétation :"
-#: templates/ishtar/sheet_contextrecord.html:60
+#: templates/ishtar/sheet_contextrecord.html:45
msgid "Datations"
msgstr "Datations"
-#: templates/ishtar/sheet_contextrecord.html:61
+#: templates/ishtar/sheet_contextrecord.html:46
msgid "TAQ:"
msgstr "TAQ :"
-#: templates/ishtar/sheet_contextrecord.html:62
+#: templates/ishtar/sheet_contextrecord.html:47
msgid "Estimated TAQ:"
msgstr "TAQ estimé :"
-#: templates/ishtar/sheet_contextrecord.html:63
+#: templates/ishtar/sheet_contextrecord.html:48
msgid "TPQ:"
msgstr "TPQ :"
-#: templates/ishtar/sheet_contextrecord.html:64
+#: templates/ishtar/sheet_contextrecord.html:49
msgid "Estimated TPQ:"
msgstr "TPQ estimé :"
-#: templates/ishtar/sheet_contextrecord.html:68
+#: templates/ishtar/sheet_contextrecord.html:53
msgid "In relation with"
msgstr "En relation avec"
-#: templates/ishtar/sheet_contextrecord.html:73
+#: templates/ishtar/sheet_contextrecord.html:58
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:59
msgid "Chronology"
msgstr "Chronologie"
-#: templates/ishtar/sheet_contextrecord.html:87
-msgid "Details"
-msgstr "Détails"
-
-#: templates/ishtar/sheet_contextrecord.html:95
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "Operation summary"
msgstr "Résumé de l'opération"
-#: templates/ishtar/sheet_contextrecord.html:96
+#: templates/ishtar/sheet_contextrecord.html:81
msgid "Year:"
msgstr "Année :"
-#: templates/ishtar/sheet_contextrecord.html:99
+#: templates/ishtar/sheet_contextrecord.html:84
msgid "Patriarche OA code:"
msgstr "Code d'opération Patriarche"
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:89
msgid "Head scientist:"
msgstr "Responsable scientifique :"
-#: templates/ishtar/sheet_contextrecord.html:106
+#: templates/ishtar/sheet_contextrecord.html:90
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_contextrecord.html:108
+#: templates/ishtar/sheet_contextrecord.html:92
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_contextrecord.html:110
+#: templates/ishtar/sheet_contextrecord.html:94
msgid "Closed operation"
msgstr "Opération fermée"
-#: templates/ishtar/sheet_contextrecord.html:111
+#: templates/ishtar/sheet_contextrecord.html:95
msgid "Closing date:"
msgstr "Date de clôture :"
-#: templates/ishtar/sheet_contextrecord.html:112
+#: templates/ishtar/sheet_contextrecord.html:96
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_contextrecord.html:115
+#: templates/ishtar/sheet_contextrecord.html:99
msgid "Remains:"
msgstr "Vestiges :"
-#: templates/ishtar/sheet_contextrecord.html:116
+#: templates/ishtar/sheet_contextrecord.html:100
msgid "Periods:"
msgstr "Périodes :"
-#: templates/ishtar/sheet_contextrecord.html:118
+#: templates/ishtar/sheet_contextrecord.html:103
msgid "Localisation"
msgstr "Lieu"
-#: templates/ishtar/sheet_contextrecord.html:119
+#: templates/ishtar/sheet_contextrecord.html:104
msgid "Towns:"
msgstr "Communes :"
-#: templates/ishtar/sheet_contextrecord.html:120
+#: templates/ishtar/sheet_contextrecord.html:105
msgid "Related operation:"
msgstr "Opération associée :"
-#: templates/ishtar/sheet_contextrecord.html:123
+#: templates/ishtar/sheet_contextrecord.html:108
msgid "No operation linked to this context unit!"
msgstr "Pas d'opération rattachée à cette UE !"
-#: templates/ishtar/sheet_contextrecord.html:126
+#: templates/ishtar/sheet_contextrecord.html:111
msgid "Document from this context record"
msgstr "Document associé à cette Unité d'Enregistrement"
-#: templates/ishtar/sheet_contextrecord.html:131
+#: templates/ishtar/sheet_contextrecord.html:116
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_contextrecord.html:136
+#: templates/ishtar/sheet_contextrecord.html:121
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_contextrecordsource.html:6
+#: templates/ishtar/sheet_contextrecordsource.html:4
msgid "Context record source"
msgstr "Documentation associée à l'UE"
diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po
index b96e09e70..f5635073f 100644
--- a/translations/fr/archaeological_files.po
+++ b/translations/fr/archaeological_files.po
@@ -10,39 +10,39 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-02-24 02:09-0500\n"
+"PO-Revision-Date: 2016-08-25 07:31-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
-#: forms.py:51 forms.py:209 forms.py:253 forms.py:394 forms.py:421
-#: models.py:75 templates/ishtar/sheet_file.html:150
+#: forms.py:51 forms.py:210 forms.py:254 forms.py:395 forms.py:422
+#: models.py:76 templates/ishtar/sheet_file.html:133
msgid "Year"
msgstr "Année"
-#: forms.py:52 forms.py:214 forms.py:255 models.py:78
+#: forms.py:52 forms.py:215 forms.py:256 models.py:79
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:54 forms.py:216
+#: forms.py:54 forms.py:217
msgid "Other reference"
msgstr "Autre référence"
-#: forms.py:56 forms.py:429
-msgid "Parcel (section/number)"
-msgstr "Parcelle (section/numéro)"
+#: forms.py:56 forms.py:430
+msgid "Parcel (section/number/public domain)"
+msgstr "Parcelle (section/nombre/domaine public)"
-#: forms.py:59 forms.py:405 forms.py:432 models.py:518
+#: forms.py:59 forms.py:406 forms.py:433 models.py:512
msgid "Department"
msgstr "Département"
-#: forms.py:60 forms.py:441
+#: forms.py:60 forms.py:442
msgid "File name"
msgstr "Nom du dossier"
-#: forms.py:61 forms.py:155 forms.py:220 models.py:84
+#: forms.py:61 forms.py:156 forms.py:221 models.py:87
msgid "File type"
msgstr "Type de dossier"
@@ -50,214 +50,214 @@ msgstr "Type de dossier"
msgid "Is active?"
msgstr "Est actif ?"
-#: forms.py:63 forms.py:157 forms.py:317
+#: forms.py:63 forms.py:158 forms.py:318
msgid "Saisine type"
msgstr "Type de saisine"
-#: forms.py:64 forms.py:307 models.py:57 models.py:115
+#: forms.py:64 forms.py:308 models.py:58 models.py:118
msgid "Permit type"
msgstr "Type de permis"
-#: forms.py:66 forms.py:310 models.py:116
+#: forms.py:66 forms.py:311 models.py:119
msgid "Permit reference"
msgstr "Référence du permis"
-#: forms.py:67 forms.py:226 forms.py:364 models.py:145
-#: templates/ishtar/sheet_file.html:111
+#: forms.py:67 forms.py:227 forms.py:365 models.py:148
+#: templates/ishtar/sheet_file.html:94
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:69 templates/ishtar/sheet_file.html:127
+#: forms.py:69 templates/ishtar/sheet_file.html:110
msgid "In charge"
msgstr "Responsable"
-#: forms.py:76 forms.py:285 forms.py:443 models.py:91
+#: forms.py:76 forms.py:286 forms.py:444 models.py:94
msgid "General contractor"
msgstr "Aménageur"
-#: forms.py:83 forms.py:452
+#: forms.py:83 forms.py:453
msgid "Organization of general contractor"
msgstr "Organisation de l'aménageur"
-#: forms.py:90 forms.py:475
+#: forms.py:90 forms.py:476
msgid "Created by"
msgstr "Créé par"
-#: forms.py:97 forms.py:483
+#: forms.py:97 forms.py:484
msgid "Modified by"
msgstr "Modifié par"
-#: forms.py:126
+#: forms.py:127
msgid "Archaeological file search"
msgstr "Recherche de dossiers archéologiques"
-#: forms.py:140
+#: forms.py:141
msgid "You should select a file."
msgstr "Vous devez sélectionner un dossier archéologique."
-#: forms.py:143 forms.py:218 models.py:124
+#: forms.py:144 forms.py:219 models.py:127
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:144 forms.py:320 models.py:126
+#: forms.py:145 forms.py:321 models.py:129
msgid "Reception date"
msgstr "Date de réception"
-#: forms.py:149
+#: forms.py:150
msgid "Slicing"
msgstr "Découpage"
-#: forms.py:151
+#: forms.py:152
msgid "Department detail"
msgstr "Détail par département"
-#: forms.py:153
+#: forms.py:154
msgid "Date get from"
msgstr "Date utilisée"
-#: forms.py:159
+#: forms.py:160
msgid "Date after"
msgstr "Date après"
-#: forms.py:161
+#: forms.py:162
msgid "Date before"
msgstr "Date avant"
-#: forms.py:198 templates/ishtar/sheet_file.html:31
+#: forms.py:199 templates/ishtar/sheet_file.html:14
msgid "General"
msgstr "Général"
-#: forms.py:203 models.py:86
+#: forms.py:204 models.py:89
msgid "Person in charge"
msgstr "Responsable"
-#: forms.py:217 models.py:83
+#: forms.py:218 models.py:86
msgid "Name"
msgstr "Nom"
-#: forms.py:222 models.py:128
+#: forms.py:223 models.py:131
msgid "Related file"
msgstr "Dossier associé"
-#: forms.py:230 models.py:136
+#: forms.py:231 models.py:139
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:233 models.py:142
+#: forms.py:234 models.py:145
msgid "Main address"
msgstr "Adresse des terrains"
-#: forms.py:234
+#: forms.py:235
msgid "Main address - complement"
msgstr "Adresse des terrains - complément"
-#: forms.py:246
+#: forms.py:247
#, python-format
msgid "<br/>(last recorded: %s)"
msgstr "<br/>(dernier enregistrement : %s)"
-#: forms.py:268
+#: forms.py:269
msgid "Another file with this numeric id exists."
msgstr "Un autre dossier avec cet identifiant numérique existe."
-#: forms.py:279
+#: forms.py:280
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: forms.py:297 models.py:103
+#: forms.py:298 models.py:106
msgid "Responsible for town planning service"
msgstr "Responsable au service instructeur"
-#: forms.py:313 models.py:139
+#: forms.py:314 models.py:142
msgid "Total developed surface (m2)"
msgstr "Surface totale aménagée (m2)"
-#: forms.py:332 templates/ishtar/sheet_file.html:101
+#: forms.py:333 templates/ishtar/sheet_file.html:84
#: templates/ishtar/dashboards/dashboard_file.html:42
msgid "Research archaeology"
msgstr "Archéologie programmée"
-#: forms.py:340 models.py:148 templates/ishtar/sheet_file.html:102
+#: forms.py:341 models.py:151 templates/ishtar/sheet_file.html:85
msgid "Departments"
msgstr "Départements"
-#: forms.py:351 models.py:157
+#: forms.py:352 models.py:160
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:353 models.py:151 templates/ishtar/sheet_file.html:104
+#: forms.py:354 models.py:154 templates/ishtar/sheet_file.html:87
msgid "Requested operation type"
msgstr "Type d'opération demandée"
-#: forms.py:355
+#: forms.py:356
msgid "Lead organization"
msgstr "Organisation porteuse du projet"
-#: forms.py:371 models.py:161 templates/ishtar/sheet_file.html:109
+#: forms.py:372 models.py:164 templates/ishtar/sheet_file.html:92
msgid "Classified area"
msgstr "Au sein d'un site classé"
-#: forms.py:373 models.py:163 templates/ishtar/sheet_file.html:110
+#: forms.py:374 models.py:166 templates/ishtar/sheet_file.html:93
msgid "Protected area"
msgstr "Au sein d'un secteur sauvegardé"
-#: forms.py:385
+#: forms.py:386
msgid "Would you like to close this archaeological file?"
msgstr "Voulez vous clore ce dossier archéologique ?"
-#: forms.py:390
+#: forms.py:391
msgid "Would you like to delete this archaelogical file ?"
msgstr "Voulez vous supprimer ce dossier archéologique ?"
-#: forms.py:395 forms.py:422
+#: forms.py:396 forms.py:423 forms.py:546
msgid "Index"
msgstr "Index"
-#: forms.py:399 forms.py:426 forms.py:531
+#: forms.py:400 forms.py:427 forms.py:533
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:400
+#: forms.py:401
msgid "Object (full text search)"
msgstr "Objet (recherche texte intégral)"
-#: forms.py:427
+#: forms.py:428
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:433
+#: forms.py:434
msgid "Object"
msgstr "Objet"
-#: forms.py:437
+#: forms.py:438
msgid "Signature date after"
msgstr "Date de signature après"
-#: forms.py:439
+#: forms.py:440
msgid "Signature date before"
msgstr "Date de signature avant"
-#: forms.py:460
+#: forms.py:461
msgid "File numeric reference"
msgstr "Dossier : réf. numérique"
-#: forms.py:461
+#: forms.py:462
msgid "File year"
msgstr "Dossier : année"
-#: forms.py:463
+#: forms.py:464
msgid "File other reference"
msgstr "Dossier : autre référence"
-#: forms.py:465
+#: forms.py:466
msgid "File in charge"
msgstr "Dossier : responsable"
-#: forms.py:473
+#: forms.py:474
msgid "File permit reference"
msgstr "Dossier : réf. du permis"
-#: ishtar_menu.py:33 models.py:185 templates/ishtar/sheet_file.html:6
+#: ishtar_menu.py:33 models.py:188 templates/ishtar/sheet_file.html:4
msgid "Archaeological file"
msgstr "Dossier"
@@ -301,168 +301,172 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:87 models.py:186
+#: ishtar_menu.py:87 models.py:189
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: models.py:41
+#: models.py:42
msgid "Archaeological file type"
msgstr "Type de dossier archéologique"
-#: models.py:42
+#: models.py:43
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: models.py:58
+#: models.py:59
msgid "Permit types"
msgstr "Types de permis"
-#: models.py:63
+#: models.py:64
msgid "Delay (in days)"
msgstr "Délai (en jours)"
-#: models.py:79
+#: models.py:80
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:81
+#: models.py:82
msgid "External ID"
msgstr "ID externe"
-#: models.py:94
+#: models.py:85
+msgid "External ID is set automatically"
+msgstr "L'identifiant externe est configuré automatiquement"
+
+#: models.py:97
msgid "General contractor (raw)"
msgstr "Aménageur (brut)"
-#: models.py:98
+#: models.py:101
msgid "General contractor organization"
msgstr "Organisation de l'aménageur"
-#: models.py:106
+#: models.py:109
msgid "Town planning service (raw)"
msgstr "Service instructeur (brut)"
-#: models.py:112
+#: models.py:115
msgid "Town planning service organization"
msgstr "Service instructeur"
-#: models.py:118
+#: models.py:121
msgid "Closing date"
msgstr "Date de clôture"
-#: models.py:119
+#: models.py:122
msgid "Town"
msgstr "Commune"
-#: models.py:121
+#: models.py:124
msgid "Towns"
msgstr "Communes"
-#: models.py:134
+#: models.py:137
msgid "Instruction deadline"
msgstr "Date limite d'instruction"
-#: models.py:140
+#: models.py:143
msgid "Locality"
msgstr "Lieu-dit"
-#: models.py:143
+#: models.py:146
msgid "Main address - postal code"
msgstr "Adresse des terrains - code postal"
-#: models.py:153 templates/ishtar/sheet_file.html:105
+#: models.py:156 templates/ishtar/sheet_file.html:88
msgid "Organization"
msgstr "Organisation"
-#: models.py:158
+#: models.py:161
msgid "Research archaeology comment"
msgstr "Commentaire archéologie programmée"
-#: models.py:172
+#: models.py:175
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:173
+#: models.py:176
msgid "Imported line"
msgstr "Ligne importée"
-#: models.py:188
+#: models.py:191
msgid "Can view all Archaelogical files"
msgstr "Peut voir tous les Dossiers"
-#: models.py:189
+#: models.py:192
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier"
-#: models.py:190
+#: models.py:193
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier"
-#: models.py:192
+#: models.py:195
msgid "Can change own Archaelogical file"
msgstr "Peut modifier son propre Dossier"
-#: models.py:194
+#: models.py:197
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier"
-#: models.py:195
+#: models.py:198
msgid "Can close File"
msgstr "Peut fermer un Dossier"
-#: models.py:201
+#: models.py:204
msgid "FILE"
msgstr "DOSSIER"
-#: models.py:370
+#: models.py:373
msgid "Multi-town"
msgstr "Intercommunal"
-#: models.py:376
+#: models.py:379
msgid "No town"
msgstr "Pas de commune"
-#: models.py:517
+#: models.py:511
msgid "File"
msgstr "Dossier"
-#: views.py:155
+#: views.py:159
msgid "File search"
msgstr "Recherche de dossier archéologique"
-#: views.py:164
+#: views.py:168
msgid "New file"
msgstr "Nouveau dossier archéologique"
-#: views.py:183
+#: views.py:187
msgid "File modification"
msgstr "Modification de dossier archéologique"
-#: views.py:206
+#: views.py:210
msgid "File closing"
msgstr "Clôture de dossier archéologique"
-#: views.py:211
+#: views.py:215
msgid "File deletion"
msgstr "Suppression de dossier archéologique"
-#: views.py:218
+#: views.py:222
msgid "File: search administrative act"
msgstr "Dossier : rechercher un acte administratif"
-#: views.py:227
+#: views.py:231
msgid "File: new administrative act"
msgstr "Dossier : nouvel acte administratif"
-#: views.py:237
+#: views.py:241
msgid "File: administrative act modification"
msgstr "Dossier : modification d'acte administratif"
-#: views.py:246
+#: views.py:265
msgid "File: administrative act deletion"
msgstr "Dossier : suppression d'acte administratif"
-#: wizards.py:124 templates/ishtar/sheet_file.html:122
+#: wizards.py:124 templates/ishtar/sheet_file.html:105
msgid "Associated operations"
msgstr "Opérations associées"
@@ -482,157 +486,125 @@ msgstr "Choisir le type de document"
msgid "Generate"
msgstr "Générer"
-#: templates/ishtar/sheet_file.html:13
-msgid "Previous version"
-msgstr "Version précédente"
-
-#: templates/ishtar/sheet_file.html:17
-msgid "Are you sure to rollback to this version?"
-msgstr "Êtes vous sûr de vouloir revenir à cette version ?"
-
-#: templates/ishtar/sheet_file.html:18
-msgid "Next version"
-msgstr "Version suivante"
-
-#: templates/ishtar/sheet_file.html:22
-msgid "Export as:"
-msgstr "Exporter en :"
-
-#: templates/ishtar/sheet_file.html:22
-msgid "OpenOffice.org file"
-msgstr "Fichier OpenOffice.org"
-
-#: templates/ishtar/sheet_file.html:22
-msgid "PDF file"
-msgstr "Fichier PDF"
-
-#: templates/ishtar/sheet_file.html:24
-msgid "Modify"
-msgstr "Modifier"
-
-#: templates/ishtar/sheet_file.html:27
-msgid "Add an associated archaeological operation"
-msgstr "Ajouter une opération archéologique associée à ce dossier"
-
-#: templates/ishtar/sheet_file.html:38
+#: templates/ishtar/sheet_file.html:21
msgid "Edition date:"
msgstr "Date d'édition :"
-#: templates/ishtar/sheet_file.html:52
+#: templates/ishtar/sheet_file.html:35
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_file.html:52
+#: templates/ishtar/sheet_file.html:35
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_file.html:53
+#: templates/ishtar/sheet_file.html:36
msgid "Closed file"
msgstr "Dossier fermé"
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:38
msgid "Closing date:"
msgstr "Date de clôture :"
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:38
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_file.html:60
+#: templates/ishtar/sheet_file.html:43
msgid "Related file:"
msgstr "Dossier en relation avec :"
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:47
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_file.html:65
+#: templates/ishtar/sheet_file.html:48
msgid "Towns:"
msgstr "Communes :"
-#: templates/ishtar/sheet_file.html:66
+#: templates/ishtar/sheet_file.html:49
msgid "Departments:"
msgstr "Départements :"
-#: templates/ishtar/sheet_file.html:68
+#: templates/ishtar/sheet_file.html:51
msgid "Main address:"
msgstr "Adresse principale :"
-#: templates/ishtar/sheet_file.html:69
+#: templates/ishtar/sheet_file.html:52
msgid "Complement:"
msgstr "Complément :"
-#: templates/ishtar/sheet_file.html:70
+#: templates/ishtar/sheet_file.html:53
msgid "Postal code:"
msgstr "Code postal :"
-#: templates/ishtar/sheet_file.html:72
+#: templates/ishtar/sheet_file.html:55
msgid "Surface:"
msgstr "Surface :"
-#: templates/ishtar/sheet_file.html:77
+#: templates/ishtar/sheet_file.html:60
msgid "Preventive archaelogical file"
msgstr "Dossier d'archéologie préventive"
-#: templates/ishtar/sheet_file.html:78
+#: templates/ishtar/sheet_file.html:61
msgid "Developed surface:"
msgstr "Surface aménagée :"
-#: templates/ishtar/sheet_file.html:102 templates/ishtar/sheet_file.html:103
-#: templates/ishtar/sheet_file.html:104 templates/ishtar/sheet_file.html:105
-#: templates/ishtar/sheet_file.html:111
+#: templates/ishtar/sheet_file.html:85 templates/ishtar/sheet_file.html:86
+#: templates/ishtar/sheet_file.html:87 templates/ishtar/sheet_file.html:88
+#: templates/ishtar/sheet_file.html:94
#: templates/ishtar/dashboards/dashboard_file.html:14
msgid ":"
msgstr " :"
-#: templates/ishtar/sheet_file.html:103
+#: templates/ishtar/sheet_file.html:86
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: templates/ishtar/sheet_file.html:115
+#: templates/ishtar/sheet_file.html:98
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_file.html:118
+#: templates/ishtar/sheet_file.html:101
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: templates/ishtar/sheet_file.html:124 templates/ishtar/sheet_file.html:151
+#: templates/ishtar/sheet_file.html:107 templates/ishtar/sheet_file.html:134
msgid "Ref."
msgstr "Réf."
-#: templates/ishtar/sheet_file.html:126 templates/ishtar/sheet_file.html:152
+#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:135
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_file.html:128
+#: templates/ishtar/sheet_file.html:111
msgid "Start date"
msgstr "Date de début"
-#: templates/ishtar/sheet_file.html:129
+#: templates/ishtar/sheet_file.html:112
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: templates/ishtar/sheet_file.html:140
-msgid "Details"
-msgstr "Détails"
-
-#: templates/ishtar/sheet_file.html:143
+#: templates/ishtar/sheet_file.html:126
msgid "No operation associated to this archaelogical file"
msgstr "Pas d'opération associée à ce dossier archéologique"
-#: templates/ishtar/sheet_file.html:148
+#: templates/ishtar/sheet_file.html:131
msgid "Admninistrative acts linked to associated operations"
msgstr "Actes administratifs associés à ces opérations"
-#: templates/ishtar/sheet_file.html:153
+#: templates/ishtar/sheet_file.html:136
msgid "Date"
msgstr "Date"
-#: templates/ishtar/sheet_file.html:163
+#: templates/ishtar/sheet_file.html:146
msgid "No administrative act linked to operations"
msgstr "Pas d'acte administratif associé à ces opérations"
+#: templates/ishtar/blocks/window_file_nav.html:10
+msgid "Add an operation for this file"
+msgstr "Ajouter une opération pour ce dossier"
+
#: templates/ishtar/dashboards/dashboard_file.html:10
msgid "Global informations"
msgstr "Informations générales"
@@ -678,12 +650,12 @@ msgstr "Par acte administratif"
#: templates/ishtar/dashboards/dashboard_file.html:147
msgid "Archaeological files linked to at least one operation:"
-msgstr "Dossier associé à au moins une opération :"
+msgstr "Dossiers associés à au moins une opération :"
#: templates/ishtar/dashboards/dashboard_file.html:148
#, python-format
msgid "Archaeological files linked to at least one operation (%%):"
-msgstr "Dossier associé à au moins une opération (%%) :"
+msgstr "Dossiers associés à au moins une opération (%%) :"
#: templates/ishtar/dashboards/dashboard_file.html:152
#, python-format
diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po
index 90f5ffce0..e668bc64d 100644
--- a/translations/fr/archaeological_files_pdl.po
+++ b/translations/fr/archaeological_files_pdl.po
@@ -14,119 +14,119 @@ msgstr ""
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
-#: forms.py:39
+#: forms.py:41
msgid "General"
msgstr "Général"
-#: forms.py:41
+#: forms.py:43
msgid "File type"
msgstr "Type de dossier"
-#: forms.py:42 forms.py:399
+#: forms.py:44 forms.py:401
msgid "Year"
msgstr "Année"
-#: forms.py:46
+#: forms.py:48
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:49
+#: forms.py:51
msgid "Reception date"
msgstr "Date de réception"
-#: forms.py:60
+#: forms.py:62
msgid "Reception date cannot be after today."
msgstr "La date de réception ne peut pas être dans le futur."
-#: forms.py:68
+#: forms.py:70
msgid "Permit type"
msgstr "Type de permis"
-#: forms.py:70
+#: forms.py:72
msgid "Saisine type"
msgstr "Type de saisine"
-#: forms.py:83
+#: forms.py:85
msgid "Planning"
msgstr "Aménagement"
-#: forms.py:86
+#: forms.py:88
msgid "Planning name"
msgstr "Nom de l'aménagement"
-#: forms.py:89 forms.py:119
-#: templates/ishtar/wizard/wizard_preventiveplanning.html:28
+#: forms.py:91 forms.py:121
+#: templates/ishtar/wizard/wizard_preventiveplanning.html:31
msgid "Towns"
msgstr "Communes"
-#: forms.py:91 forms.py:121
-#: templates/ishtar/wizard/wizard_preventiveplanning.html:35
+#: forms.py:93 forms.py:123
+#: templates/ishtar/wizard/wizard_preventiveplanning.html:41
msgid "Departments"
msgstr "Départements"
-#: forms.py:92 forms.py:122
+#: forms.py:94 forms.py:124
msgid "Locality"
msgstr "Lieu-dit"
-#: forms.py:95 forms.py:125
+#: forms.py:97 forms.py:127
msgid "Address (number/street)"
msgstr "Adresse (n° / voie)"
-#: forms.py:96 forms.py:126
+#: forms.py:98 forms.py:128
msgid "Number/street"
msgstr "N° / voie"
-#: forms.py:98 forms.py:128
+#: forms.py:100 forms.py:130
msgid "Postal code"
msgstr "Code postal"
-#: forms.py:103
+#: forms.py:105
msgid "Total surface (m2)"
msgstr "Surface totale des terrains (m2)"
-#: forms.py:108
+#: forms.py:110
msgid "Total developed surface (m2)"
msgstr "Surface totale aménagée (m2)"
-#: forms.py:115
+#: forms.py:117
msgid "Address"
msgstr "Adresse"
-#: forms.py:229 forms.py:233 forms.py:263 forms.py:266
+#: forms.py:231 forms.py:235 forms.py:265 forms.py:268
msgid "General contractor"
msgstr "Aménageur"
-#: forms.py:248 forms.py:360
+#: forms.py:250 forms.py:362
msgid "In charge"
msgstr "Responsable"
-#: forms.py:338
+#: forms.py:340
msgid "Town planning service"
msgstr "Service instructeur"
-#: forms.py:342
+#: forms.py:344
msgid "File reference"
msgstr "Référence du dossier"
-#: forms.py:345
+#: forms.py:347
msgid "Planning service"
msgstr "Service instructeur"
-#: forms.py:379
+#: forms.py:381
msgid "Person in charge"
msgstr "Dossier suivi par"
-#: forms.py:391
+#: forms.py:393
msgid "Related file"
msgstr "Dossier lié à"
-#: forms.py:395
+#: forms.py:397
msgid "Comment"
msgstr "Commentaires"
-#: forms.py:402
+#: forms.py:404
msgid "Numeric reference"
msgstr "Référence numérique"
@@ -146,11 +146,6 @@ msgstr "Dossier suivi par"
msgid "The following files have the same numeric index as this file:"
msgstr "Les dossiers suivants ont le même index numérique que ce dossier :"
-#: templates/ishtar/wizard/file_confirm_wizard.html:11
-#: templates/ishtar/wizard/file_confirm_wizard.html:22
-msgid "Details"
-msgstr "Détails"
-
#: templates/ishtar/wizard/file_confirm_wizard.html:19
msgid ""
"The following files are in the same town and have parcels in common with "
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index e4cea7f0f..59a74c0ca 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -10,116 +10,132 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-06-08 12:20-0400\n"
+"PO-Revision-Date: 2016-08-25 07:45-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
-#: forms.py:46 forms.py:50 wizards.py:62
+#: forms.py:49 forms.py:53 wizards.py:62
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:79 ishtar_menu.py:31 models.py:348 models.py:597 models.py:694
-#: templates/ishtar/sheet_find.html:6 templates/ishtar/sheet_findbasket.html:6
+#: forms.py:82 ishtar_menu.py:31 models.py:384 models.py:649 models.py:747
+#: models.py:891 templates/ishtar/sheet_find.html:5
msgid "Find"
msgstr "Mobilier"
-#: forms.py:88 forms.py:187 forms.py:346 models.py:105 models.py:290
+#: forms.py:93 forms.py:208 forms.py:412 models.py:113 models.py:317
msgid "Free ID"
msgstr "ID libre"
-#: forms.py:90 models.py:331
+#: forms.py:95 models.py:365
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:91 forms.py:208 forms.py:286 models.py:108 models.py:291
-#: models.py:619
+#: forms.py:96 forms.py:237 forms.py:577 models.py:117 models.py:318
+#: models.py:681
msgid "Description"
msgstr "Description"
-#: forms.py:94 forms.py:210 models.py:119
+#: forms.py:99 forms.py:239 models.py:128
msgid "Batch/object"
msgstr "Lot/objet"
-#: forms.py:96 models.py:317
+#: forms.py:101 models.py:346
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:99 forms.py:201 forms.py:350 models.py:47
+#: forms.py:104 forms.py:228 forms.py:416 models.py:48
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:100 forms.py:205 models.py:57 models.py:295
+#: forms.py:105 forms.py:232 models.py:58 models.py:322
msgid "Conservatory state"
msgstr "État sanitaire"
-#: forms.py:103 models.py:82 models.py:320
+#: forms.py:108 models.py:324
+msgid "Conservatory comment"
+msgstr "Commentaire relatif à la conservation"
+
+#: forms.py:111 models.py:90 models.py:349
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:105 forms.py:204 models.py:64
+#: forms.py:113 forms.py:231 models.py:65
msgid "Preservation type"
msgstr "Type de conservation"
-#: forms.py:108 forms.py:207 models.py:322
+#: forms.py:116 forms.py:234 models.py:351
msgid "Integrity"
msgstr "Intégrité"
-#: forms.py:110 models.py:323
+#: forms.py:119 forms.py:235 models.py:353
+msgid "Remarkability"
+msgstr "Remarquabilité"
+
+#: forms.py:121 models.py:355
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:111 models.py:324
+#: forms.py:122 models.py:356
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:112 models.py:325
+#: forms.py:123 models.py:357
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: forms.py:113 models.py:326
+#: forms.py:124 models.py:358
msgid "Diameter (cm)"
msgstr "Diamètre (cm)"
-#: forms.py:114 forms.py:351 models.py:300
+#: forms.py:125 forms.py:417 models.py:329
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:115 forms.py:352 models.py:301
+#: forms.py:126 forms.py:418 models.py:330
msgid "Weight (g)"
msgstr "Poids (g)"
-#: forms.py:116 forms.py:353 models.py:304
+#: forms.py:128 models.py:359
+msgid "Dimensions comment"
+msgstr "Commentaire concernant les dimensions"
+
+#: forms.py:129 forms.py:419 models.py:333
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:117 models.py:327
+#: forms.py:130 models.py:361
msgid "Mark"
msgstr "Marque"
-#: forms.py:118 forms.py:212 models.py:333
+#: forms.py:131 forms.py:241 models.py:367
msgid "Check"
msgstr "Vérification"
-#: forms.py:120 models.py:335
+#: forms.py:133 models.py:369
msgid "Check date"
msgstr "Date de vérification"
-#: forms.py:121 models.py:109 models.py:328 models.py:620
+#: forms.py:134 models.py:118 models.py:362 models.py:682
msgid "Comment"
msgstr "Commentaires"
-#: forms.py:124 models.py:329
+#: forms.py:137 models.py:363
msgid "Comment on dating"
msgstr "Commentaire général sur les datations"
-#: forms.py:126
+#: forms.py:138 models.py:371
+msgid "Estimated value"
+msgstr "Valeur estimée"
+
+#: forms.py:140
msgid "Image"
msgstr "Image"
-#: forms.py:127
+#: forms.py:141
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
@@ -128,554 +144,630 @@ msgstr ""
"<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).</p>"
-#: forms.py:153 forms.py:181 models.py:312
+#: forms.py:174 forms.py:202 models.py:341
msgid "Dating"
msgstr "Datation"
-#: forms.py:158 forms.py:199
+#: forms.py:179 forms.py:226
msgid "Period"
msgstr "Période"
-#: forms.py:159 forms.py:288 models.py:630 models.py:699
-#: templates/ishtar/sheet_find.html:72 templates/ishtar/sheet_find.html:95
+#: forms.py:180 forms.py:579 models.py:695 models.py:760 models.py:896
+#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:104
msgid "Start date"
msgstr "Date de début"
-#: forms.py:161 forms.py:290 models.py:631 models.py:700
-#: templates/ishtar/sheet_find.html:73 templates/ishtar/sheet_find.html:96
+#: forms.py:182 forms.py:581 models.py:696 models.py:761 models.py:897
+#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:105
msgid "End date"
msgstr "Date de fin"
-#: forms.py:162
+#: forms.py:183
msgid "Quality"
msgstr "Qualité"
-#: forms.py:164
+#: forms.py:185
msgid "Dating type"
msgstr "Type de datation"
-#: forms.py:166
+#: forms.py:187
msgid "Precise dating"
msgstr "Datation précise"
-#: forms.py:185 models.py:124
+#: forms.py:206 models.py:136
msgid "Short ID"
msgstr "ID court"
-#: forms.py:186 models.py:127
+#: forms.py:207 models.py:139
msgid "Complete ID"
msgstr "ID complet"
-#: forms.py:190
+#: forms.py:211
msgid "Year"
msgstr "Année"
-#: forms.py:192
+#: forms.py:214
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:194
+#: forms.py:218
msgid "Archaelogical site"
msgstr "Entité Archéologique"
-#: forms.py:202 models.py:81
+#: forms.py:224
+msgid "Search within operation relations"
+msgstr "Rechercher parmi les opérations reliées"
+
+#: forms.py:229 models.py:89
msgid "Object type"
msgstr "Type d'objet"
-#: forms.py:213
+#: forms.py:242
msgid "Has an image?"
msgstr "Dispose d'une image ?"
-#: forms.py:242 forms.py:255 views.py:112
+#: forms.py:284 forms.py:297 views.py:120
msgid "Find search"
msgstr "Recherche de mobilier"
-#: forms.py:269
-msgid "Base treatment"
-msgstr "Traitement de base"
-
-#: forms.py:273 models.py:609 models.py:622
-msgid "Treatment type"
-msgstr "Type de traitement"
-
-#: forms.py:275 models.py:628 models.py:697
-#: templates/ishtar/sheet_find.html:70 templates/ishtar/sheet_find.html:94
-msgid "Person"
-msgstr "Individu"
-
-#: forms.py:281 models.py:623
-msgid "Location"
-msgstr "Lieu"
-
-#: forms.py:302
+#: forms.py:311
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:304 models.py:349
+#: forms.py:313 models.py:385
msgid "Finds"
msgstr "Mobilier"
-#: forms.py:314
+#: forms.py:323
msgid "You should at least select one archaeological find."
msgstr "Vous devez sélectionner au moins un mobilier archéologique."
-#: forms.py:343
+#: forms.py:409
msgid "Resulting find"
msgstr "Mobilier résultant"
-#: forms.py:348
+#: forms.py:414
msgid "Precise description"
msgstr "Description précise"
-#: forms.py:362
+#: forms.py:428
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:367
+#: forms.py:433
msgid "Would you like to delete this find?"
msgstr "Souhaitez vous supprimer ce mobilier ?"
-#: forms.py:371
+#: forms.py:437
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:378
+#: forms.py:448
msgid "Archaeological find search"
msgstr "Recherche de mobilier"
-#: forms.py:380
+#: forms.py:450
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:385
+#: forms.py:455
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:387
+#: forms.py:457
+msgid "Numeric reference"
+msgstr "Référence numérique"
+
+#: forms.py:464
msgid "Period of the archaelogical find"
msgstr "Période du mobilier"
-#: forms.py:389
+#: forms.py:466
msgid "Material type of the archaelogical find"
msgstr "Type de matériau du mobilier"
-#: forms.py:391
+#: forms.py:468
msgid "Description of the archaelogical find"
msgstr "Description du mobilier"
-#: forms.py:403
+#: forms.py:480
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:405
+#: forms.py:482
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:422
+#: forms.py:499
msgid "Another basket already exist with this name."
msgstr "Un autre panier existe déjà avec ce nom."
-#: forms.py:432 ishtar_menu.py:59
+#: forms.py:509 ishtar_menu.py:60
msgid "Basket"
msgstr "Panier"
-#: ishtar_menu.py:35
+#: forms.py:559
+msgid "Base treatment"
+msgstr "Traitement de base"
+
+#: forms.py:564 models.py:671 models.py:684 models.py:759
+msgid "Treatment type"
+msgstr "Type de traitement"
+
+#: forms.py:566 models.py:693 models.py:764
+#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:102
+msgid "Doer"
+msgstr "Opérateur"
+
+#: forms.py:572 models.py:686 models.py:762
+msgid "Location"
+msgstr "Lieu"
+
+#: forms.py:592
+msgid "Leave it blank if you want to select a single item"
+msgstr "Ne pas modifier si vous voulez sélectionner un seul élément"
+
+#: forms.py:599
+msgid "This treatment type is not available."
+msgstr "Ce type de traitement n'est pas disponible"
+
+#: forms.py:603
+msgid "This treatment needs a basket."
+msgstr "Ce traitement nécessite de sélectionner un panier."
+
+#: ishtar_menu.py:35 ishtar_menu.py:83
msgid "Search"
msgstr "Recherche"
-#: ishtar_menu.py:40 ishtar_menu.py:62 ishtar_menu.py:82
+#: ishtar_menu.py:40 ishtar_menu.py:63 ishtar_menu.py:88
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:45 ishtar_menu.py:87
+#: ishtar_menu.py:45 ishtar_menu.py:93
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:54 ishtar_menu.py:73 ishtar_menu.py:92
+#: ishtar_menu.py:55 ishtar_menu.py:74 ishtar_menu.py:98
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:67
+#: ishtar_menu.py:68
msgid "Manage items"
msgstr "Gérer les éléments"
-#: ishtar_menu.py:79
+#: ishtar_menu.py:80
msgid "Documentation"
msgstr "Documentation"
-#: models.py:40
+#: models.py:41
msgid "Code"
msgstr "Code"
-#: models.py:41
+#: models.py:42
msgid "Recommendation"
msgstr "Recommandation"
-#: models.py:44
+#: models.py:45
msgid "Parent material"
msgstr "Matériau parent"
-#: models.py:48 models.py:293
+#: models.py:49 models.py:320
msgid "Material types"
msgstr "Types de matériau"
-#: models.py:54
+#: models.py:55
msgid "Parent conservatory state"
msgstr "État sanitaire - parent"
-#: models.py:58
+#: models.py:59
msgid "Conservatory states"
msgstr "États sanitaires"
-#: models.py:65
+#: models.py:66
msgid "Preservation types"
msgstr "Types de conservation"
-#: models.py:71 models.py:72
+#: models.py:72
msgid "Integrity type"
msgstr "Type d'intégrité"
-#: models.py:78
+#: models.py:73
+msgid "Integrity types"
+msgstr "Types d'intégrité"
+
+#: models.py:79
+msgid "Remarkability type"
+msgstr "Type de remarquabilité"
+
+#: models.py:80
+msgid "Remarkability types"
+msgstr "Types de remarquabilité"
+
+#: models.py:86
msgid "Parent"
msgstr "Parent"
-#: models.py:97
+#: models.py:105
msgid "Unknow"
msgstr "Inconnu"
-#: models.py:98
+#: models.py:106
msgid "Object"
msgstr "Objet"
-#: models.py:99
+#: models.py:107
msgid "Batch"
msgstr "Lot"
-#: models.py:106 models.py:287 models.py:615
+#: models.py:114 models.py:313 models.py:677
msgid "External ID"
msgstr "ID externe"
-#: models.py:111
+#: models.py:116 models.py:315
+msgid "External ID is set automatically"
+msgstr "L'identifiant externe est configuré automatiquement"
+
+#: models.py:120
msgid "Topographic localisation"
msgstr "Localisation topogaphique"
-#: models.py:112
+#: models.py:121
msgid "Special interest"
msgstr "Intérêt spécifique"
-#: models.py:116
+#: models.py:125
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models.py:117
+#: models.py:126
msgid "Discovery date"
msgstr "Date de découverte"
-#: models.py:125 models.py:128
+#: models.py:131
+msgid "Material index"
+msgstr "Index matériel"
+
+#: models.py:132
+msgid "Point"
+msgstr "Point"
+
+#: models.py:133
+msgid "Line"
+msgstr "Ligne"
+
+#: models.py:134
+msgid "Polygon"
+msgstr "Polygon"
+
+#: models.py:137 models.py:140
msgid "Cached value - do not edit"
msgstr "Valeur en cache - ne pas éditer"
-#: models.py:133 models.py:285
+#: models.py:145 models.py:311
msgid "Base find"
msgstr "Mobilier de base"
-#: models.py:134
+#: models.py:146
msgid "Base finds"
msgstr "Mobilier de base"
-#: models.py:136
+#: models.py:148
msgid "Can view all Base finds"
msgstr "Peut voir tout le Mobilier de base"
-#: models.py:137
+#: models.py:149
msgid "Can view own Base find"
msgstr "Peut voir son propre Mobilier de base"
-#: models.py:138
+#: models.py:150
msgid "Can add own Base find"
msgstr "Peut ajouter son propre Mobilier de base"
-#: models.py:139
+#: models.py:151
msgid "Can change own Base find"
msgstr "Peut modifier son propre Mobilier de base"
-#: models.py:140
+#: models.py:152
msgid "Can delete own Base find"
msgstr "Peut supprimer son propre Mobilier de base"
-#: models.py:235
+#: models.py:261
msgid "g"
msgstr "g"
-#: models.py:236
+#: models.py:262
msgid "kg"
msgstr "kg"
-#: models.py:238
+#: models.py:264
msgid "Not checked"
msgstr "Non vérifié"
-#: models.py:239
+#: models.py:265
msgid "Checked but incorrect"
msgstr "Vérifié mais incorrect"
-#: models.py:240
+#: models.py:266
msgid "Checked and correct"
msgstr "Vérifié et correct"
-#: models.py:275
+#: models.py:301
msgid "Base find - Short ID"
msgstr "Mobilier de base - ID court"
-#: models.py:276
+#: models.py:302
msgid "Base find - Complete ID"
msgstr "Mobilier de base - ID complet"
-#: models.py:277
+#: models.py:303
msgid "Base find - Comment"
msgstr "Mobilier de base - Commentaires"
-#: models.py:278
+#: models.py:304
msgid "Base find - Description"
msgstr "Mobilier de base - Description"
-#: models.py:279
+#: models.py:305
msgid "Base find - Topographic localisation"
msgstr "Mobilier de base - Localisation topographique"
-#: models.py:281
+#: models.py:307
msgid "Base find - Special interest"
msgstr "Mobilier de base - Intérêt spécifique"
-#: models.py:282
+#: models.py:308
msgid "Base find - Discovery date"
msgstr "Mobilier de base - Date de découverte"
-#: models.py:289
+#: models.py:316 models.py:753
msgid "Order"
msgstr "Ordre"
-#: models.py:298
+#: models.py:327
msgid "Type of preservation to consider"
msgstr "Mesures de conservation à envisager"
-#: models.py:302
+#: models.py:331
msgid "Weight unit"
msgstr "Unité de poids"
-#: models.py:308 templates/ishtar/sheet_find.html:66
+#: models.py:337 templates/ishtar/sheet_find.html:73
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models.py:311 templates/ishtar/sheet_find.html:90
+#: models.py:340 templates/ishtar/sheet_find.html:98
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models.py:315 models.py:617 templates/ishtar/sheet_find.html:71
+#: models.py:344 models.py:679 models.py:763
+#: templates/ishtar/sheet_find.html:78 templates/ishtar/sheet_find.html:103
msgid "Container"
msgstr "Contenant"
-#: models.py:351
+#: models.py:387
msgid "Can view all Finds"
msgstr "Peut voir tout le Mobilier"
-#: models.py:352
+#: models.py:388
msgid "Can view own Find"
msgstr "Peut voir son propre Mobilier"
-#: models.py:353
+#: models.py:389
msgid "Can add own Find"
msgstr "Peut ajouter son propre Mobilier"
-#: models.py:354
+#: models.py:390
msgid "Can change own Find"
msgstr "Peut modifier son propre Mobilier"
-#: models.py:355
+#: models.py:391
msgid "Can delete own Find"
msgstr "Peut supprimer son propre Mobilier"
-#: models.py:360
+#: models.py:396
msgid "FIND"
msgstr "MOBILIER"
-#: models.py:595
+#: models.py:647
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models.py:596
+#: models.py:648
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models.py:606
+#: models.py:658
msgid "Virtual"
msgstr "Virtuel"
-#: models.py:610
+#: models.py:660
+msgid "Upstream is many"
+msgstr "Les éléments amonts sont multiple"
+
+#: models.py:662
+msgid "Check this if for this treatment from many finds you'll get one."
+msgstr ""
+"Cochez cela si pour ce traitement depuis plusieurs éléments vous en obtenez "
+"un."
+
+#: models.py:665
+msgid "Downstream is many"
+msgstr "Les éléments avals sont multiple"
+
+#: models.py:667
+msgid "Check this if for this treatment from one find you'll get many."
+msgstr ""
+"Cochez cela si pour ce traitement depuis un élément vous en obtenez "
+"plusieurs."
+
+#: models.py:672
msgid "Treatment types"
msgstr "Types de traitement"
-#: models.py:625
+#: models.py:688
+msgid "Location where the treatment is done. Target warehouse for a move."
+msgstr ""
+"Endroit où le traitement est réalisé. Renseignez le dépôt de destination "
+"pour un déplacement."
+
+#: models.py:690
msgid "Other location"
msgstr "Autre lieu"
-#: models.py:635 models.py:686
+#: models.py:700 models.py:749 models.py:883
msgid "Treatment"
msgstr "Traitement"
-#: models.py:636
+#: models.py:701 templates/ishtar/sheet_find.html:69
msgid "Treatments"
msgstr "Traitements"
-#: models.py:638
+#: models.py:703
msgid "Can view all Treatments"
msgstr "Peut voir tous les Traitements"
-#: models.py:639
+#: models.py:704
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: models.py:640
+#: models.py:705
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: models.py:641
+#: models.py:706
msgid "Can change own Treatment"
msgstr "Peut modifier son propre Traitement"
-#: models.py:642
+#: models.py:707
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre Traitement"
-#: models.py:648
+#: models.py:713
msgid "by"
msgstr "par"
-#: models.py:683
+#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:76
+#: templates/ishtar/sheet_find.html:101
+msgid "Related finds"
+msgstr "Mobilier associé"
+
+#: models.py:869
+msgid "Is upstream"
+msgstr "Est amont"
+
+#: models.py:880
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: models.py:684
+#: models.py:881
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: models.py:696
+#: models.py:893
msgid "Administrative act"
msgstr "Acte administratif"
-#: models.py:703
+#: models.py:894
+msgid "Person"
+msgstr "Individu"
+
+#: models.py:900
msgid "Property"
msgstr "Propriété"
-#: models.py:704
+#: models.py:901
msgid "Properties"
msgstr "Propriétés"
-#: views.py:107
+#: views.py:115
msgid "New find"
msgstr "Nouveau mobilier"
-#: views.py:121
+#: views.py:129
msgid "Find modification"
msgstr "Modification de mobilier"
-#: views.py:136
+#: views.py:144
msgid "Find deletion"
msgstr "Suppression de mobilier"
-#: views.py:145
+#: views.py:149
+msgid "Find: source search"
+msgstr "Mobilier : recherche de documentation associée"
+
+#: views.py:157
msgid "Find: new source"
msgstr "Mobilier : nouvelle documentation associée"
-#: views.py:153
+#: views.py:165
msgid "Find: source modification"
msgstr "Mobilier : modification de documentation associée"
-#: views.py:159
+#: views.py:180
msgid "Find: source deletion"
msgstr "Mobilier : suppression de mobilier associé"
-#: views.py:173
+#: views.py:194
msgid "New basket"
msgstr "Nouveau panier"
-#: views.py:192
+#: views.py:213
msgid "Manage items in basket"
msgstr "Gérer les éléments dans un panier"
-#: views.py:212
+#: views.py:233
msgid "Manage basket"
msgstr "Gérer un panier"
-#: views.py:300
+#: views.py:321
msgid "Delete basket"
msgstr "Supprimer un panier"
+#: views.py:359
+msgid "New treatment"
+msgstr "Nouveau traitement"
+
#: wizards.py:61
msgid "Operation"
msgstr "Opération"
-#: templates/ishtar/sheet_find.html:14
-msgid "Previous version"
-msgstr "Version précédente"
-
-#: templates/ishtar/sheet_find.html:18
-msgid "Are you sure to rollback to this version?"
-msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
-
-#: templates/ishtar/sheet_find.html:19
-msgid "Next version"
-msgstr "Version suivante"
-
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "Export as:"
-msgstr "Exporter en :"
-
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "OpenOffice.org file"
-msgstr "Fichier OpenOffice.org"
-
-#: templates/ishtar/sheet_find.html:24
-#: templates/ishtar/sheet_findbasket.html:11
-msgid "PDF file"
-msgstr "Fichier PDF"
-
-#: templates/ishtar/sheet_find.html:25
-#: templates/ishtar/sheet_findbasket.html:12
-msgid "Modify"
-msgstr "Modifier"
-
-#: templates/ishtar/sheet_find.html:68 templates/ishtar/sheet_find.html:92
-#: templates/ishtar/sheet_find.html:141
+#: templates/ishtar/sheet_find.html:75 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:166
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_find.html:69 templates/ishtar/sheet_find.html:93
-msgid "Related find"
-msgstr "Mobilier associé"
+#: templates/ishtar/sheet_find.html:93
+msgid "Export as CSV"
+msgstr "Export en CSV"
-#: templates/ishtar/sheet_find.html:110
+#: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:118
+msgid "CSV"
+msgstr "CSV"
+
+#: templates/ishtar/sheet_find.html:123
msgid "Associated base finds"
msgstr "Mobilier de base associé"
-#: templates/ishtar/sheet_find.html:136 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:161 templates/ishtar/sheet_find.html:163
msgid "Documents"
msgstr "Documents"
-#: templates/ishtar/sheet_find.html:140
+#: templates/ishtar/sheet_find.html:165
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:167
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:143 templates/ishtar/sheet_find.html:150
+#: templates/ishtar/sheet_find.html:168
msgid "Link"
msgstr "Lien"
-#: templates/ishtar/sheet_findsource.html:6
+#: templates/ishtar/sheet_findbasket.html:4
+msgid "Find basket"
+msgstr "Panier de mobilier"
+
+#: templates/ishtar/sheet_findsource.html:4
msgid "Find source"
msgstr "Documentation associé au mobilier"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 127197718..bd55fab37 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -10,19 +10,19 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-03-16 03:20-0400\n"
+"PO-Revision-Date: 2016-08-25 07:48-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
-#: forms.py:66 forms.py:344 forms.py:914 forms.py:936 forms.py:940
-#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8
+#: forms.py:66 forms.py:368 forms.py:952 forms.py:974 forms.py:978
+#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:69 forms.py:185 forms.py:890 models.py:770
+#: forms.py:69 forms.py:202 forms.py:928 models.py:801
#: templates/ishtar/blocks/window_tables/parcels.html:5
#: templates/ishtar/dashboards/dashboard_operation.html:302
#: templates/ishtar/dashboards/dashboard_operation.html:315
@@ -31,88 +31,92 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:71 forms.py:433 forms.py:704 forms.py:1148 models.py:158
-#: models.py:587 models.py:768
+#: forms.py:71 forms.py:457 forms.py:731 forms.py:1192 models.py:194
+#: models.py:618 models.py:799
#: templates/ishtar/blocks/window_tables/parcels.html:6
msgid "Year"
msgstr "Année"
-#: forms.py:74 models.py:771
+#: forms.py:74 models.py:802
#: templates/ishtar/blocks/window_tables/parcels.html:7
msgid "Section"
msgstr "Section"
-#: forms.py:77 models.py:772
+#: forms.py:77 models.py:804
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: forms.py:107
-msgid "Town section and parcel number fields are required."
-msgstr "La commune, la section et le numéro de parcelle sont obligatoires."
+#: forms.py:79 models.py:806 models.py:823 models.py:872
+msgid "Public domain"
+msgstr "Domaine public"
-#: forms.py:150
+#: forms.py:123
+msgid "Town section is required."
+msgstr "Vous devez renseigner le secteur."
+
+#: forms.py:167
msgid "Current parcels"
msgstr "Parcelles actuelles"
-#: forms.py:152
+#: forms.py:169
msgid "Deleted parcels"
msgstr "Parcelles supprimées"
-#: forms.py:188
+#: forms.py:205
msgid "Full text input"
msgstr "Saisie libre"
-#: forms.py:190
+#: forms.py:207
msgid "example: \"2013: XD:1 to 13,24,33 to 39, YD:24\" or \"AB:24,AC:42\""
msgstr "exemple : \"2013: XD:1 à 13,24,33 à 39, YD:24\" ou \"AB:24,AC:42\""
-#: forms.py:338
+#: forms.py:362
msgid "There are identical parcels."
msgstr "Il y a des parcelles identiques."
-#: forms.py:353
+#: forms.py:377
msgid "Relation type"
msgstr "Type de relation"
-#: forms.py:356 ishtar_menu.py:30 models.py:237 models.py:488 models.py:513
-#: models.py:528 models.py:579 models.py:767 wizards.py:338 wizards.py:349
-#: templates/ishtar/sheet_operation.html:6
+#: forms.py:380 ishtar_menu.py:30 models.py:276 models.py:518 models.py:543
+#: models.py:559 models.py:610 models.py:798 wizards.py:338 wizards.py:349
+#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr "Opération"
-#: forms.py:375
+#: forms.py:399
msgid ":"
msgstr ": "
-#: forms.py:383 forms.py:559 forms.py:1119
+#: forms.py:407 forms.py:585 forms.py:1157
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
-#: forms.py:387
+#: forms.py:411
msgid "You should select a relation type."
msgstr "Vous devez sélectionner un type de relation."
-#: forms.py:417
+#: forms.py:441
msgid "Current relations"
msgstr "Relations actuelles"
-#: forms.py:419
+#: forms.py:443
msgid "Deleted relations"
msgstr "Relations supprimées"
-#: forms.py:423 templates/ishtar/sheet_operation.html:115
+#: forms.py:447 templates/ishtar/sheet_operation.html:114
msgid "Relations"
msgstr "Relations"
-#: forms.py:434
+#: forms.py:458 forms.py:1163
msgid "Numeric reference"
msgstr "Identifiant numérique"
-#: forms.py:439 forms.py:1158
-msgid "Parcel (section/number)"
-msgstr "Parcelle (section/numéro)"
+#: forms.py:464 forms.py:1203
+msgid "Parcel (section/number/public domain)"
+msgstr "Parcelle (section/nombre/domaine public)"
-#: forms.py:442 forms.py:1161 models.py:489
+#: forms.py:467 forms.py:1206 models.py:519
#: templates/ishtar/dashboards/dashboard_operation.html:273
#: templates/ishtar/dashboards/dashboard_operation.html:286
#: templates/ishtar/dashboards/dashboard_operation.html:453
@@ -120,215 +124,219 @@ msgstr "Parcelle (section/numéro)"
msgid "Department"
msgstr "Département"
-#: forms.py:443 forms.py:1000 models.py:77
+#: forms.py:468 forms.py:1038 models.py:78
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6
msgid "Name"
msgstr "Nom"
-#: forms.py:445 forms.py:626 forms.py:702 forms.py:1124 models.py:166
+#: forms.py:470 forms.py:652 forms.py:729 forms.py:1169 models.py:202
msgid "Operation type"
msgstr "Type d'opération"
-#: forms.py:447
+#: forms.py:472
msgid "Is open?"
msgstr "Est ouvert ?"
-#: forms.py:456 forms.py:728 models.py:155
+#: forms.py:481 forms.py:758 models.py:191
msgid "In charge"
msgstr "Responsable"
-#: forms.py:463 models.py:573
+#: forms.py:488 models.py:604
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:465 forms.py:628 forms.py:719 models.py:153
+#: forms.py:490 forms.py:654 forms.py:749 models.py:189
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:472 forms.py:1005 models.py:81 models.py:168
+#: forms.py:497 forms.py:1043 models.py:82 models.py:204
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:473 forms.py:984 forms.py:1002 models.py:79 models.py:173
+#: forms.py:498 forms.py:1022 forms.py:1040 models.py:80 models.py:209
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Periods"
msgstr "Périodes"
-#: forms.py:474
+#: forms.py:499
msgid "Started before"
msgstr "Commencé avant"
-#: forms.py:476
+#: forms.py:501
msgid "Started after"
msgstr "Commencé après"
-#: forms.py:478
+#: forms.py:503
msgid "Ended before"
msgstr "Terminé avant"
-#: forms.py:480
+#: forms.py:505
msgid "Ended after"
msgstr "Terminé après"
-#: forms.py:483
+#: forms.py:508
msgid "Search within relations"
msgstr "Recherche parmi les relations"
-#: forms.py:485 forms.py:770 models.py:219
+#: forms.py:510 forms.py:797 models.py:255
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:486
+#: forms.py:511
msgid "Abstract (full text search)"
msgstr "Résumé (recherche texte intégral)"
-#: forms.py:487 forms.py:772 models.py:231
+#: forms.py:512 forms.py:799 models.py:267
msgid "Record quality"
msgstr "Qualité d'enregistrement"
-#: forms.py:488 forms.py:751 models.py:185
+#: forms.py:513 forms.py:781 models.py:221
msgid "Report processing"
msgstr "Traitement du rapport"
-#: forms.py:490 forms.py:775 models.py:226
+#: forms.py:515 forms.py:802 models.py:262
msgid "Virtual operation"
msgstr "Opération virtuelle"
-#: forms.py:492 forms.py:1045
+#: forms.py:517 forms.py:1083
msgid "Archaelogical site"
msgstr "Entité Archéologique"
-#: forms.py:498 forms.py:1165
+#: forms.py:523 forms.py:1210
msgid "Created by"
msgstr "Créé par"
-#: forms.py:504 forms.py:1171
+#: forms.py:529 forms.py:1216
msgid "Modified by"
msgstr "Modifié par"
-#: forms.py:546 forms.py:1117 views.py:231
+#: forms.py:572 forms.py:1155 views.py:247
msgid "Operation search"
msgstr "Recherche d'opérations"
-#: forms.py:590
+#: forms.py:616
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:594 forms.py:838 models.py:584 wizards.py:76
+#: forms.py:620 forms.py:876 models.py:615 wizards.py:76
msgid "Archaelogical file"
msgstr "Dossier"
-#: forms.py:601 forms.py:603 models.py:233
+#: forms.py:627 forms.py:629 models.py:269
msgid "Abstract"
msgstr "Résumé"
-#: forms.py:606
+#: forms.py:632
msgid "months"
msgstr "mois"
-#: forms.py:606
+#: forms.py:632
msgid "years"
msgstr "années"
-#: forms.py:608 models.py:139
+#: forms.py:634 models.py:175
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:609
+#: forms.py:635
msgid "Start of field work"
msgstr "Début du travail de terrain"
-#: forms.py:611
+#: forms.py:637
msgid "All"
msgstr "Tout"
-#: forms.py:612
+#: forms.py:638
msgid "Preventive"
msgstr "Préventif"
-#: forms.py:613
+#: forms.py:639
msgid "Research"
msgstr "Programmé"
-#: forms.py:617
+#: forms.py:643
msgid "Slicing"
msgstr "Découpage"
-#: forms.py:620
+#: forms.py:646
msgid "Department detail"
msgstr "Détail par département"
-#: forms.py:622
+#: forms.py:648
msgid "Date get from"
msgstr "Date obtenue depuis"
-#: forms.py:624
+#: forms.py:650
msgid "Preventive/Research"
msgstr "Préventif/Programmé"
-#: forms.py:630
+#: forms.py:656
msgid "Date after"
msgstr "Date après"
-#: forms.py:632
+#: forms.py:658
msgid "Date before"
msgstr "Date avant"
-#: forms.py:634
+#: forms.py:660
msgid "With reports"
msgstr "Avec un rapport"
-#: forms.py:635
+#: forms.py:661
msgid "With finds"
msgstr "Avec du mobilier"
-#: forms.py:687 forms.py:1218 templates/ishtar/sheet_administrativeact.html:11
-#: templates/ishtar/sheet_operation.html:32
+#: forms.py:713 forms.py:1264 templates/ishtar/sheet_administrativeact.html:13
+#: templates/ishtar/sheet_operation.html:30
msgid "General"
msgstr "Général"
-#: forms.py:700 models.py:218
+#: forms.py:727 models.py:254
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:709
+#: forms.py:736 models.py:223
+msgid "Old code"
+msgstr "Ancien code"
+
+#: forms.py:739
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:725 models.py:217
+#: forms.py:755 models.py:253
msgid "Operator reference"
msgstr "Référence de l'opérateur"
-#: forms.py:737
+#: forms.py:767
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:744 models.py:49 models.py:142 models.py:938
+#: forms.py:774 models.py:50 models.py:178 models.py:988
msgid "Start date"
msgstr "Date de début"
-#: forms.py:746 models.py:144
+#: forms.py:776 models.py:180
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:749 models.py:145
+#: forms.py:779 models.py:181
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
-#: forms.py:802
+#: forms.py:829
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:807
+#: forms.py:834
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:824
+#: forms.py:862
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
@@ -337,109 +345,109 @@ 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:828
+#: forms.py:866
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:834 models.py:159 models.py:366
+#: forms.py:872 models.py:195 models.py:405
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:860
+#: forms.py:898
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:861 models.py:171
+#: forms.py:899 models.py:207
#: templates/ishtar/dashboards/dashboard_operation.html:495
msgid "Cost (euros)"
msgstr "Coût (euros)"
-#: forms.py:862 models.py:176
+#: forms.py:900 models.py:212
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:864 models.py:179
+#: forms.py:902 models.py:215
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:866 models.py:182
+#: forms.py:904 models.py:218
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
-#: forms.py:876
+#: forms.py:914
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:879 models.py:201
+#: forms.py:917 models.py:237
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:881 models.py:204
+#: forms.py:919 models.py:240
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:884 models.py:206
+#: forms.py:922 models.py:242
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:888 forms.py:910 models.py:170 models.py:597
+#: forms.py:926 forms.py:948 models.py:206 models.py:628
msgid "Towns"
msgstr "Communes"
-#: forms.py:917 models.py:779 models.py:936
+#: forms.py:955 models.py:814 models.py:986
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:969 models.py:43
+#: forms.py:1007 models.py:44
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:973 models.py:42
+#: forms.py:1011 models.py:43
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:988
+#: forms.py:1026
msgid "Period"
msgstr "Période"
-#: forms.py:999 models.py:76
+#: forms.py:1037 models.py:77
msgid "Reference"
msgstr "Référence"
-#: forms.py:1024
+#: forms.py:1062
msgid "This reference already exists."
msgstr "Cette référence existe déjà."
-#: forms.py:1041 models.py:85
+#: forms.py:1079 models.py:86
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:1056 models.py:86 models.py:223
-#: templates/ishtar/sheet_operation.html:126
+#: forms.py:1094 models.py:87 models.py:259
+#: templates/ishtar/sheet_operation.html:125
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: forms.py:1060
+#: forms.py:1098
msgid "Associated archaelogical sites"
msgstr "Entités archéologiques associées"
-#: forms.py:1066 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1104 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr "Recherche"
-#: forms.py:1071
+#: forms.py:1109
msgid "Would you like to close this operation?"
msgstr "Voulez-vous clore cette opération ?"
-#: forms.py:1076
+#: forms.py:1114
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1085 forms.py:1149 models.py:515 models.py:564
+#: forms.py:1123 forms.py:1193 forms.py:1328 models.py:545 models.py:595
msgid "Index"
msgstr "Index"
-#: forms.py:1111
+#: forms.py:1149
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
@@ -448,68 +456,81 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:1123
-msgid "Operation's town"
-msgstr "Commune de l'opération"
-
-#: forms.py:1126
+#: forms.py:1161
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:1137
+#: forms.py:1168
+msgid "Operation's town"
+msgstr "Commune de l'opération"
+
+#: forms.py:1181
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:1139
+#: forms.py:1183
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1155 forms.py:1221 models.py:539 models.py:558
+#: forms.py:1200 forms.py:1267 models.py:570 models.py:589
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:1156 forms.py:1309
+#: forms.py:1201 forms.py:1398
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1162 forms.py:1226 models.py:588
+#: forms.py:1207 forms.py:1272 models.py:619
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Object"
msgstr "Objet"
-#: forms.py:1198 views.py:373
+#: forms.py:1244 views.py:403
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: forms.py:1213 forms.py:1267 forms.py:1334
+#: forms.py:1259 forms.py:1356 forms.py:1423
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1229 models.py:585
+#: forms.py:1275 models.py:616
msgid "Signature date"
msgstr "Date de signature"
-#: forms.py:1244
+#: forms.py:1316
+#, python-format
+msgid ""
+"This index already exist for year: %(year)d - use a value bigger than "
+"%(last_val)d"
+msgstr ""
+"Cet index existe déjà pour l'année : %(year)s, utilisez une valeur plus "
+"grande que %(last_val)d"
+
+#: forms.py:1320
+msgid "Bad index"
+msgstr "Mauvais index"
+
+#: forms.py:1333
msgid "Would you like to delete this administrative act?"
msgstr "Voulez-vous supprimer cet acte administratif ?"
-#: forms.py:1249
+#: forms.py:1338
msgid "Template"
msgstr "Patron"
-#: forms.py:1273 forms.py:1277
+#: forms.py:1362 forms.py:1366
msgid "This document is not intended for this type of act."
msgstr "Ce document n'est pas destiné à ce type d'acte."
-#: forms.py:1295
+#: forms.py:1384
msgid "Doc generation"
msgstr "Génération de document"
-#: forms.py:1297
+#: forms.py:1386
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:1318 ishtar_menu.py:121 views.py:407
+#: forms.py:1407 ishtar_menu.py:121 views.py:456
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
@@ -530,12 +551,12 @@ msgstr "Clôture"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:58 models.py:604
-#: templates/ishtar/sheet_administrativeact.html:6
+#: ishtar_menu.py:58 models.py:635
+#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr "Acte administratif"
-#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:52
+#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:55
msgid "Add"
msgstr "Ajout"
@@ -559,369 +580,381 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:136 models.py:238
+#: ishtar_menu.py:136 models.py:277
#: templates/ishtar/dashboards/dashboard_operation.html:9
msgid "Operations"
msgstr "Opérations"
-#: models.py:48 models.py:64 models.py:1400
+#: models.py:49 models.py:65 models.py:1450
msgid "Order"
msgstr "Ordre"
-#: models.py:50 models.py:939
+#: models.py:51 models.py:989
msgid "End date"
msgstr "Date de fin"
-#: models.py:51
+#: models.py:52
msgid "Parent period"
msgstr "Période parente"
-#: models.py:55
+#: models.py:56
msgid "Type Period"
msgstr "Type de période"
-#: models.py:56
+#: models.py:57
msgid "Types Period"
msgstr "Types de période"
-#: models.py:67
+#: models.py:68
msgid "Report state"
msgstr "État de rapport"
-#: models.py:68
+#: models.py:69
msgid "Report states"
msgstr "États de rapports"
-#: models.py:89
+#: models.py:90
msgid "Can view all Archaeological sites"
msgstr "Peut voir toutes les Entités archéologiques"
-#: models.py:91
+#: models.py:92
msgid "Can view own Archaeological site"
msgstr "Peut voir ses propres Entités archéologiques"
-#: models.py:93
+#: models.py:94
msgid "Can add own Archaeological site"
msgstr "Peut ajouter ses propres Entités archéologique"
-#: models.py:95
+#: models.py:96
msgid "Can change own Archaeological site"
msgstr "Peut modifier ses propres Entités archéologiques"
-#: models.py:97
+#: models.py:98
msgid "Can delete own Archaeological site"
msgstr "Peut supprimer ses propres Entités archéologiques"
-#: models.py:127
+#: models.py:135
msgid "Not documented"
msgstr "Non documenté"
-#: models.py:128
+#: models.py:136
msgid "Arbitrary"
msgstr "Arbitraire"
-#: models.py:129
+#: models.py:137
msgid "Reliable"
msgstr "Fiable"
-#: models.py:141
+#: models.py:177
msgid "Closing date"
msgstr "Date de clôture"
-#: models.py:148
+#: models.py:184
msgid "In charge scientist"
msgstr "Responsable scientifique"
-#: models.py:163 models.py:763
+#: models.py:199 models.py:794
msgid "File"
msgstr "Dossier"
-#: models.py:167
+#: models.py:203
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:220
+#: models.py:256
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:228
+#: models.py:264
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:240
+#: models.py:270
+msgid "Point"
+msgstr "Point"
+
+#: models.py:271
+msgid "Multi polygon"
+msgstr "Polygones multiples"
+
+#: models.py:279
msgid "Can view all Operations"
msgstr "Peut voir toutes les Opérations"
-#: models.py:241
+#: models.py:280
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: models.py:242
+#: models.py:281
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: models.py:243
+#: models.py:282
msgid "Can change own Operation"
msgstr "Peut modifier sa propre Opération"
-#: models.py:244
+#: models.py:283
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: models.py:245
+#: models.py:284
msgid "Can close Operation"
msgstr "Peut fermer une Opération"
-#: models.py:268
+#: models.py:307
msgid "OPE"
msgstr "OPE"
-#: models.py:325
+#: models.py:364
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:351 models.py:527
+#: models.py:390 models.py:558
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: models.py:352
+#: models.py:391
msgid "Code patriarche"
msgstr "Code patriarche"
-#: models.py:392
+#: models.py:431
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:459
+#: models.py:489
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:463
+#: models.py:493
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:464
+#: models.py:494
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:477
+#: models.py:507
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:478
+#: models.py:508
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:499
+#: models.py:529
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:500
+#: models.py:530
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:503
+#: models.py:533
msgid "Can view all Operation sources"
msgstr "Peut voir toutes les Documentations d'opération"
-#: models.py:505
+#: models.py:535
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Documentation d'opération"
-#: models.py:507
+#: models.py:537
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Documentation d'opération"
-#: models.py:509
+#: models.py:539
msgid "Can change own Operation source"
msgstr "Peut modifier sa propre Documentation d'opération"
-#: models.py:511
+#: models.py:541
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Documentation d'opération"
-#: models.py:530
+#: models.py:561
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:532
+#: models.py:563
msgid "Code"
msgstr "Code"
-#: models.py:535
+#: models.py:566
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:536
+#: models.py:567
msgid "Indexed"
msgstr "Indexé"
-#: models.py:540
+#: models.py:571
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:562
+#: models.py:593
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:568
+#: models.py:599
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:576
+#: models.py:607
msgid "Signatory"
msgstr "Signataire"
-#: models.py:594
+#: models.py:625
msgid "Departments"
msgstr "Départements"
-#: models.py:595
+#: models.py:626
msgid "Cached values get from associated departments"
msgstr "Valeur en cache des départements associés"
-#: models.py:598
+#: models.py:629
msgid "Cached values get from associated towns"
msgstr "Valeur en cache des communes associées"
-#: models.py:605 templates/ishtar/sheet_operation.html:134
+#: models.py:636 templates/ishtar/sheet_operation.html:133
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:608
+#: models.py:639
msgid "Can view all Administrative acts"
msgstr "Peut voir tous les Actes administratifs"
-#: models.py:610
+#: models.py:641
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:612
+#: models.py:643
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:614
+#: models.py:645
msgid "Can change own Administrative act"
msgstr "Peut modifier son propre Acte administratif"
-#: models.py:616
+#: models.py:647
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:625
+#: models.py:656
#: templates/ishtar/blocks/window_tables/administrativacts.html:5
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5
msgid "Ref."
msgstr "Réf."
-#: models.py:708
+#: models.py:739
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:774
+#: models.py:807
msgid "External ID"
msgstr "ID externe"
-#: models.py:776
+#: models.py:810
+msgid "External ID is set automatically"
+msgstr "L'identifiant externe est configuré automatiquement"
+
+#: models.py:811
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:934
+#: models.py:984
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:942
+#: models.py:992
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:943
+#: models.py:993
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:969
+#: models.py:1019
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:970
+#: models.py:1020
msgid "Effective"
msgstr "Effectif"
-#: models.py:971
+#: models.py:1021
msgid "Active"
msgstr "Actif"
-#: models.py:972
+#: models.py:1022
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:973
+#: models.py:1023
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:974
+#: models.py:1024
msgid "Closed"
msgstr "Clos"
-#: models.py:975
+#: models.py:1025
msgid "Documented and closed"
msgstr "Documenté et clos"
-#: models.py:1401
+#: models.py:1451
msgid "Is preventive"
msgstr "Préventif"
-#: models.py:1404
+#: models.py:1454
msgid "Operation type old"
msgstr "Type d'opération - ancien"
-#: models.py:1405
+#: models.py:1455
msgid "Operation types old"
msgstr "Types d'opération - ancien"
-#: views.py:258
+#: views.py:293
msgid "New operation"
msgstr "Nouvelle opération"
-#: views.py:294
+#: views.py:312
msgid "Operation modification"
msgstr "Modification d'une opération"
-#: views.py:334
+#: views.py:355
msgid "Operation closing"
msgstr "Clôture d'une opération"
-#: views.py:340
+#: views.py:361
msgid "Operation deletion"
msgstr "Suppression d'une opération"
-#: views.py:345
+#: views.py:366
msgid "Operation: source search"
msgstr "Opération : recherche de documentation associée"
-#: views.py:353
+#: views.py:374
msgid "Operation: source creation"
msgstr "Opération : nouvelle documentation associée"
-#: views.py:361
+#: views.py:382
msgid "Operation: source modification"
msgstr "Opération : modification d'une documentation associée"
-#: views.py:367
+#: views.py:397
msgid "Operation: source deletion"
msgstr "Opération : suppression d'une documentation associée"
-#: views.py:382
+#: views.py:416
msgid "Operation: new administrative act"
msgstr "Opération : nouvel acte administratif"
-#: views.py:392
+#: views.py:426
msgid "Operation: administrative act modification"
msgstr "Opération : modification d'un acte administratif"
-#: views.py:401
+#: views.py:450
msgid "Operation: administrative act deletion"
msgstr "Opération : suppression d'un acte administratif"
@@ -933,217 +966,210 @@ msgstr ""
"Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un "
"oubli, définissez-le à la première étape."
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "Export as:"
-msgstr "Exporter en :"
-
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "OpenOffice.org file"
-msgstr "Fichier OpenOffice.org"
-
-#: templates/ishtar/sheet_administrativeact.html:10
-#: templates/ishtar/sheet_operation.html:24
-msgid "PDF file"
-msgstr "Fichier PDF"
-
-#: templates/ishtar/sheet_administrativeact.html:12
-#: templates/ishtar/sheet_operation.html:34
+#: templates/ishtar/sheet_administrativeact.html:14
+#: templates/ishtar/sheet_operation.html:32
msgid "Year:"
msgstr "Année :"
-#: templates/ishtar/sheet_administrativeact.html:13
-#: templates/ishtar/sheet_operation.html:35
+#: templates/ishtar/sheet_administrativeact.html:15
+#: templates/ishtar/sheet_operation.html:33
msgid "Numerical reference:"
msgstr "Identifiant numérique :"
-#: templates/ishtar/sheet_administrativeact.html:14
+#: templates/ishtar/sheet_administrativeact.html:16
msgid "Internal reference:"
msgstr "Référence interne :"
-#: templates/ishtar/sheet_administrativeact.html:15
-#: templates/ishtar/sheet_operation.html:55
+#: templates/ishtar/sheet_administrativeact.html:17
+#: templates/ishtar/sheet_operation.html:54
msgid "Type:"
msgstr "Type :"
-#: templates/ishtar/sheet_administrativeact.html:16
+#: templates/ishtar/sheet_administrativeact.html:18
msgid "Object:"
msgstr "Objet :"
-#: templates/ishtar/sheet_administrativeact.html:17
+#: templates/ishtar/sheet_administrativeact.html:19
msgid "Signature date:"
msgstr "Date de signature :"
-#: templates/ishtar/sheet_administrativeact.html:18
-#: templates/ishtar/sheet_operation.html:47
+#: templates/ishtar/sheet_administrativeact.html:20
+#: templates/ishtar/sheet_operation.html:46
msgid "In charge:"
msgstr "Responsable :"
-#: templates/ishtar/sheet_administrativeact.html:19
+#: templates/ishtar/sheet_administrativeact.html:21
msgid "Archaeological preventive operator:"
msgstr "Opérateur d'archéologie préventive :"
-#: templates/ishtar/sheet_administrativeact.html:21
-#: templates/ishtar/sheet_operation.html:73
+#: templates/ishtar/sheet_administrativeact.html:23
+#: templates/ishtar/sheet_operation.html:72
msgid "Associated file:"
msgstr "Dossier associé :"
-#: templates/ishtar/sheet_administrativeact.html:22
+#: templates/ishtar/sheet_administrativeact.html:24
msgid "Associated operation:"
msgstr "Opération associée :"
-#: templates/ishtar/sheet_administrativeact.html:24
-#: templates/ishtar/sheet_operation.html:56
+#: templates/ishtar/sheet_administrativeact.html:26
+#: templates/ishtar/sheet_operation.html:55
msgid "Surface:"
msgstr "Surface :"
-#: templates/ishtar/sheet_administrativeact.html:25
-#: templates/ishtar/sheet_operation.html:41
+#: templates/ishtar/sheet_administrativeact.html:27
+#: templates/ishtar/sheet_operation.html:40
msgid "Created by:"
msgstr "Créé par :"
-#: templates/ishtar/sheet_operation.html:14
+#: templates/ishtar/sheet_operation.html:12
msgid "Previous version"
msgstr "Version précédente"
-#: templates/ishtar/sheet_operation.html:18
+#: templates/ishtar/sheet_operation.html:16
msgid "Are you sure to rollback to this version?"
msgstr "Êtes-vous sûr de vouloir revenir à cette version ?"
-#: templates/ishtar/sheet_operation.html:19
+#: templates/ishtar/sheet_operation.html:17
msgid "Next version"
msgstr "Version suivante"
-#: templates/ishtar/sheet_operation.html:26
+#: templates/ishtar/sheet_operation.html:22
+msgid "Export as:"
+msgstr "Exporter en :"
+
+#: templates/ishtar/sheet_operation.html:22
+msgid "OpenOffice.org file"
+msgstr "Fichier OpenOffice.org"
+
+#: templates/ishtar/sheet_operation.html:22
+msgid "PDF file"
+msgstr "Fichier PDF"
+
+#: templates/ishtar/sheet_operation.html:24
msgid "Modify"
msgstr "Modifier"
-#: templates/ishtar/sheet_operation.html:29
+#: templates/ishtar/sheet_operation.html:27
msgid "This operation is virtual."
msgstr "Cette opération est virtuelle."
-#: templates/ishtar/sheet_operation.html:33
+#: templates/ishtar/sheet_operation.html:31
msgid "Name:"
msgstr "Nom :"
-#: templates/ishtar/sheet_operation.html:37
+#: templates/ishtar/sheet_operation.html:35
msgid "Patriarche OA code:"
msgstr "Code d'opération Patriarche :"
-#: templates/ishtar/sheet_operation.html:38
+#: templates/ishtar/sheet_operation.html:36
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
-#: templates/ishtar/sheet_operation.html:40
-msgid "Edition date:"
-msgstr "Date d'édition :"
+#: templates/ishtar/sheet_operation.html:39
+msgid "Last modification date:"
+msgstr "Dernière date de modification :"
-#: templates/ishtar/sheet_operation.html:43
+#: templates/ishtar/sheet_operation.html:42
msgid "Begining date:"
msgstr "Date de début :"
-#: templates/ishtar/sheet_operation.html:44
+#: templates/ishtar/sheet_operation.html:43
msgid "Excavation end date:"
msgstr "Date de fin de chantier :"
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:45
msgid "Head scientist:"
msgstr "Responsable scientifique :"
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:47
msgid "Operator:"
msgstr "Opérateur :"
-#: templates/ishtar/sheet_operation.html:49
+#: templates/ishtar/sheet_operation.html:48
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_operation.html:49
+#: templates/ishtar/sheet_operation.html:48
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_operation.html:50
+#: templates/ishtar/sheet_operation.html:49
msgid "Closed operation"
msgstr "Opération fermée"
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:50
msgid "Closing date:"
msgstr "Date de clôture :"
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:50
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_operation.html:57
+#: templates/ishtar/sheet_operation.html:56
msgid "Cost:"
msgstr "Coût :"
-#: templates/ishtar/sheet_operation.html:58
+#: templates/ishtar/sheet_operation.html:57
msgid "Duration:"
msgstr "Durée :"
-#: templates/ishtar/sheet_operation.html:58
+#: templates/ishtar/sheet_operation.html:57
msgid "Day"
msgstr "Jour"
-#: templates/ishtar/sheet_operation.html:84
+#: templates/ishtar/sheet_operation.html:83
msgid "Permit type:"
msgstr "Type de permis :"
-#: templates/ishtar/sheet_operation.html:85
+#: templates/ishtar/sheet_operation.html:84
msgid "Permit reference:"
msgstr "Référence du permis :"
-#: templates/ishtar/sheet_operation.html:100
+#: templates/ishtar/sheet_operation.html:99
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_operation.html:101
+#: templates/ishtar/sheet_operation.html:100
msgid "Towns:"
msgstr "Communes :"
-#: templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:103
msgid "Main address:"
msgstr "Adresse des terrains :"
-#: templates/ishtar/sheet_operation.html:105
+#: templates/ishtar/sheet_operation.html:104
msgid "Complement:"
msgstr "Complément :"
-#: templates/ishtar/sheet_operation.html:106
+#: templates/ishtar/sheet_operation.html:105
msgid "Postal code:"
msgstr "Code postal :"
-#: templates/ishtar/sheet_operation.html:120
-msgid "Details"
-msgstr "Détails"
-
-#: templates/ishtar/sheet_operation.html:130
+#: templates/ishtar/sheet_operation.html:129
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_operation.html:138
+#: templates/ishtar/sheet_operation.html:137
msgid "Document from this operation"
msgstr "Documents de cette opération"
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:142
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:148
+#: templates/ishtar/sheet_operation.html:147
msgid "Documents from associated context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_operation.html:153
+#: templates/ishtar/sheet_operation.html:152
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:157
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_operationsource.html:6
+#: templates/ishtar/sheet_operationsource.html:4
msgid "Operation source"
msgstr "Documentation associée à l'opération"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index fbe8251a2..23dde1c2c 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -13,7 +13,7 @@ msgstr ""
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
#: forms.py:34 forms.py:96 models.py:44 models.py:73
msgid "Warehouse"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index 6c05e723b..73e63840a 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -10,12 +10,12 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-06-08 12:25-0400\n"
+"PO-Revision-Date: 2016-08-25 08:01-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
#: __init__.py:8
msgid "username"
@@ -29,70 +29,70 @@ msgstr "courriel"
msgid "Related item"
msgstr "Élément associé"
-#: context_processors.py:37
+#: context_processors.py:38
msgid "Archaeological file"
msgstr "Dossier"
-#: context_processors.py:38 models.py:1322
+#: context_processors.py:39 models.py:1434
msgid "Operation"
msgstr "Opération"
-#: context_processors.py:40
+#: context_processors.py:41
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: context_processors.py:42
+#: context_processors.py:43
msgid "Find"
msgstr "Mobilier"
-#: data_importer.py:181
+#: data_importer.py:182
#, python-format
msgid "\"%(value)s\" is too long. The max length is %(length)d characters."
msgstr ""
"\"%(value)s\" est trop long. La longueur maximum est de %(length)d "
"caractères."
-#: data_importer.py:198
+#: data_importer.py:199
#, python-format
msgid "\"%(value)s\" not equal to yes or no"
msgstr "\"%(value)s\" diffère de oui ou non"
-#: data_importer.py:210
+#: data_importer.py:211
#, python-format
msgid "\"%(value)s\" is not a float"
msgstr "\"%(value)s\" n'est pas un nombre à virgule"
-#: data_importer.py:223 data_importer.py:236 data_importer.py:479
+#: data_importer.py:224 data_importer.py:238 data_importer.py:482
#, python-format
msgid "\"%(value)s\" is not a valid date"
msgstr "\"%(value)s\" n'est pas une date valide"
-#: data_importer.py:248
+#: data_importer.py:251
#, python-format
msgid "\"%(value)s\" is not an integer"
msgstr "\"%(value)s\" n'est pas un entier"
-#: data_importer.py:299 data_importer.py:540
+#: data_importer.py:302 data_importer.py:545
#, python-format
msgid "Choice for \"%s\" is not available. Which one is relevant?\n"
msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n"
-#: data_importer.py:306
+#: data_importer.py:309
#, python-format
msgid "%d. None of the above - create new"
msgstr "%d. Aucun de ceux-là - créer un nouveau"
-#: data_importer.py:309
+#: data_importer.py:312
#, python-format
msgid "%d. None of the above - skip"
msgstr "%d. Aucun de ceux-là - passer"
-#: data_importer.py:503
+#: data_importer.py:508
#, python-format
msgid "\"%(value)s\" is not a valid path for the given archive"
msgstr "\"%(value)s\" n'est pas un chemin valide pour cette archive"
-#: data_importer.py:615
+#: data_importer.py:620
msgid ""
"The given file is not correct. Check the file format. If you use a CSV file: "
"check that column separator and encoding are similar to the ones used by the "
@@ -102,57 +102,57 @@ msgstr ""
"utilisez un fichier CSV : vérifiez que le séparateur de colonne et "
"l'encodage sont similaires à ceux du fichier de référence."
-#: data_importer.py:619
+#: data_importer.py:624
#, python-format
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:621
+#: data_importer.py:626
msgid "No data provided"
msgstr "Aucune donnée fournie"
-#: data_importer.py:622
+#: data_importer.py:627
msgid "Value is required"
msgstr "Valeur requise"
-#: data_importer.py:623
+#: data_importer.py:628
#, python-format
msgid "At least %d columns must be filled"
msgstr "Au moins %d colonnes doivent être remplies"
-#: data_importer.py:624
+#: data_importer.py:629
msgid "The regexp doesn't match."
msgstr "L'expression régulière ne fonctionne pas."
-#: data_importer.py:1032
+#: data_importer.py:1037
msgid "Not imported"
msgstr "Non importé"
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "line"
msgstr "ligne"
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "col"
msgstr "colonne"
-#: data_importer.py:1408
+#: data_importer.py:1441
msgid "error"
msgstr "erreur"
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "field"
msgstr "champ"
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "source"
msgstr "source"
-#: data_importer.py:1414
+#: data_importer.py:1447
msgid "result"
msgstr "résultat"
-#: data_importer.py:1430
+#: data_importer.py:1463
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr "\"%(value)s\" n'est pas dans %(values)s"
@@ -161,7 +161,7 @@ msgstr "\"%(value)s\" n'est pas dans %(values)s"
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
-#: forms.py:71 forms_common.py:441
+#: forms.py:71 forms_common.py:489
msgid "Confirm"
msgstr "Confirmer"
@@ -177,22 +177,22 @@ msgstr "Il y a des éléments identiques."
msgid "Closing date"
msgstr "Date de clôture"
-#: forms.py:130
+#: forms.py:137
msgid "You should select an item."
msgstr "Vous devez sélectionner un élément."
-#: forms.py:131
+#: forms.py:138
msgid "Add a new item"
msgstr "Ajouter un nouvel élément"
-#: forms.py:174 models.py:1099
+#: forms.py:204 models.py:1211
msgid "Template"
msgstr "Patron"
#: forms_common.py:39 forms_common.py:57 forms_common.py:169
-#: forms_common.py:289 models.py:1165 models.py:2420
+#: forms_common.py:292 models.py:1277 models.py:2555
#: templates/blocks/JQueryAdvancedTown.html:19
-#: templates/ishtar/sheet_organization.html:17
+#: templates/ishtar/sheet_organization.html:13
msgid "Town"
msgstr "Commune"
@@ -214,269 +214,281 @@ 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:66 forms_common.py:669 ishtar_menu.py:42 models.py:1320
-#: models.py:2119 models.py:2248 models.py:2302
+#: forms_common.py:66 forms_common.py:717 ishtar_menu.py:47 models.py:1432
+#: models.py:2232 models.py:2379 models.py:2436
#: templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr "Personne"
-#: forms_common.py:157 forms_common.py:231 ishtar_menu.py:66 models.py:1321
-#: models.py:2036 templates/ishtar/sheet_organization.html:6
+#: forms_common.py:157 forms_common.py:233 forms_common.py:335
+#: ishtar_menu.py:71 models.py:1433 models.py:2149
+#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr "Organisation"
-#: forms_common.py:160 forms_common.py:196 forms_common.py:226
-#: forms_common.py:259 models.py:812 models.py:1098 models.py:1366
-#: models.py:1584 models.py:2030 models.py:2106 models.py:2406
-#: templates/ishtar/sheet_organization.html:12
-#: templates/ishtar/sheet_organization.html:25
+#: forms_common.py:160 forms_common.py:196 forms_common.py:228
+#: forms_common.py:262 forms_common.py:330 models.py:886 models.py:1210
+#: models.py:1478 models.py:1696 models.py:2143 models.py:2219 models.py:2541
+#: templates/ishtar/sheet_organization.html:8
+#: templates/ishtar/sheet_organization.html:21
msgid "Name"
msgstr "Nom"
-#: forms_common.py:161 models.py:1307 models.py:1715
+#: forms_common.py:161 models.py:1419 models.py:1827
msgid "Organization type"
msgstr "Type d'organisation"
-#: forms_common.py:163 forms_common.py:283 models.py:1160
-#: templates/ishtar/sheet_organization.html:14
+#: forms_common.py:163 forms_common.py:286 models.py:1272
+#: templates/ishtar/sheet_organization.html:10
msgid "Address"
msgstr "Adresse"
-#: forms_common.py:165 forms_common.py:286 models.py:1161
-#: templates/ishtar/sheet_organization.html:15
+#: forms_common.py:165 forms_common.py:289 models.py:1273
+#: templates/ishtar/sheet_organization.html:11
msgid "Address complement"
msgstr "Complément d'adresse"
-#: forms_common.py:167 forms_common.py:287 models.py:1163
-#: templates/ishtar/sheet_organization.html:16
+#: forms_common.py:167 forms_common.py:290 models.py:1275
+#: templates/ishtar/sheet_organization.html:12
msgid "Postal code"
msgstr "Code postal"
-#: forms_common.py:170 forms_common.py:290 models.py:1166
+#: forms_common.py:170 forms_common.py:293 models.py:1278
msgid "Country"
msgstr "Pays"
-#: forms_common.py:172 forms_common.py:228 forms_common.py:263
-#: forms_common.py:397 models.py:1193
+#: forms_common.py:172 forms_common.py:230 forms_common.py:266
+#: forms_common.py:332 forms_common.py:445 models.py:1305
msgid "Email"
msgstr "Courriel"
-#: forms_common.py:173 forms_common.py:266 models.py:1178
-#: templates/ishtar/sheet_organization.html:18
-#: templates/ishtar/sheet_person.html:19
+#: forms_common.py:173 forms_common.py:269 models.py:1290
+#: templates/ishtar/sheet_organization.html:14
+#: templates/ishtar/sheet_person.html:18
#: templates/ishtar/wizard/wizard_person.html:17
msgid "Phone"
msgstr "Téléphone"
-#: forms_common.py:174 forms_common.py:275 models.py:1190
-#: templates/ishtar/sheet_organization.html:19
-#: templates/ishtar/sheet_person.html:37
+#: forms_common.py:174 forms_common.py:278 models.py:1302
+#: templates/ishtar/sheet_organization.html:15
+#: templates/ishtar/sheet_person.html:36
#: templates/ishtar/wizard/wizard_person.html:35
msgid "Mobile phone"
msgstr "Téléphone portable"
-#: forms_common.py:197 forms_common.py:229 models.py:1741 models.py:2032
-#: models.py:2343 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
-#: templates/sheet_ope.html:126 templates/ishtar/import_list.html:13
-#: templates/ishtar/sheet_organization.html:27
-#: templates/ishtar/sheet_person.html:91
+#: forms_common.py:197 forms_common.py:231 forms_common.py:333 models.py:1854
+#: models.py:2145 models.py:2477 templates/sheet_ope.html:85
+#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
+#: templates/ishtar/import_list.html:13
+#: templates/ishtar/sheet_organization.html:23
#: templates/ishtar/blocks/window_tables/documents.html:6
msgid "Type"
msgstr "Type"
-#: forms_common.py:206 views.py:128
+#: forms_common.py:206 views.py:130
msgid "Organization search"
msgstr "Recherche d'organisations"
-#: forms_common.py:227 forms_common.py:257 models.py:2104
-#: templates/ishtar/sheet_organization.html:26
+#: forms_common.py:229 forms_common.py:260 forms_common.py:331 models.py:2217
+#: templates/ishtar/sheet_organization.html:22
msgid "Surname"
msgstr "Prénom"
-#: forms_common.py:243 views.py:93
+#: forms_common.py:245 forms_common.py:318 views.py:95
msgid "Person search"
msgstr "Recherche de personnes"
-#: forms_common.py:254 templates/ishtar/sheet_person.html:8
+#: forms_common.py:257 templates/ishtar/sheet_person.html:7
#: templates/ishtar/wizard/wizard_person.html:6
msgid "Identity"
msgstr "Identité"
-#: forms_common.py:256 forms_common.py:595 forms_common.py:636 models.py:2102
-#: models.py:2340 templates/sheet_ope.html:104
-#: templates/ishtar/sheet_person.html:90
+#: forms_common.py:259 forms_common.py:643 forms_common.py:684 models.py:2215
+#: models.py:2474 templates/sheet_ope.html:104
#: templates/ishtar/blocks/window_tables/documents.html:5
msgid "Title"
msgstr "Titre"
-#: forms_common.py:261 models.py:2108
+#: forms_common.py:264 models.py:2221
msgid "Raw name"
msgstr "Nom brut"
-#: forms_common.py:264 models.py:1179
+#: forms_common.py:267 models.py:1291
msgid "Phone description"
msgstr "Type de téléphone"
-#: forms_common.py:267 models.py:1181 models.py:1183
+#: forms_common.py:270 models.py:1293 models.py:1295
msgid "Phone description 2"
msgstr "Type de téléphone 2"
-#: forms_common.py:269
+#: forms_common.py:272
msgid "Phone 2"
msgstr "Téléphone 2"
-#: forms_common.py:271 models.py:1187
+#: forms_common.py:274 models.py:1299
msgid "Phone description 3"
msgstr "Type de téléphone 3"
-#: forms_common.py:273 models.py:1185
+#: forms_common.py:276 models.py:1297
msgid "Phone 3"
msgstr "Téléphone 3"
-#: forms_common.py:278
+#: forms_common.py:281
msgid "Current organization"
msgstr "Organisation actuelle"
-#: forms_common.py:292 models.py:1168
+#: forms_common.py:295 models.py:1280
msgid "Other address: address"
msgstr "Autre adresse : adresse"
-#: forms_common.py:295 models.py:1171
+#: forms_common.py:298 models.py:1283
msgid "Other address: address complement"
msgstr "Autre adresse : complément d'adresse"
-#: forms_common.py:297 models.py:1172
+#: forms_common.py:300 models.py:1284
msgid "Other address: postal code"
msgstr "Autre adresse : code postal"
-#: forms_common.py:299 models.py:1174
+#: forms_common.py:302 models.py:1286
msgid "Other address: town"
msgstr "Autre adresse : ville"
-#: forms_common.py:301 models.py:1176
+#: forms_common.py:304 models.py:1288
msgid "Other address: country"
msgstr "Autre adresse : pays"
-#: forms_common.py:346 forms_common.py:376 forms_common.py:380 models.py:2084
+#: forms_common.py:314
+msgid "Already has an account"
+msgstr "As déjà un compte"
+
+#: forms_common.py:329
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: forms_common.py:347
+msgid "Account search"
+msgstr "Recherche de comptes"
+
+#: forms_common.py:394 forms_common.py:424 forms_common.py:428 models.py:2197
msgid "Person type"
msgstr "Type de personne"
-#: forms_common.py:391 forms_common.py:396
+#: forms_common.py:439 forms_common.py:444 ishtar_menu.py:32
msgid "Account"
msgstr "Compte"
-#: forms_common.py:400 wizards.py:1158
+#: forms_common.py:448 wizards.py:1170
msgid "New password"
msgstr "Nouveau mot de passe"
-#: forms_common.py:403
+#: forms_common.py:451
msgid "New password (confirmation)"
msgstr "Nouveau mot de passe (confirmation)"
-#: forms_common.py:422
+#: forms_common.py:470
msgid "Your password and confirmation password do not match."
msgstr "La vérification du mot de passe a échoué."
-#: forms_common.py:427
+#: forms_common.py:475
msgid "You must provide a correct password."
msgstr "Vous devez fournir un mot de passe correct."
-#: forms_common.py:435
+#: forms_common.py:483
msgid "This username already exists."
msgstr "Ce nom d'utilisateur existe déjà."
-#: forms_common.py:442
+#: forms_common.py:490
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:451 forms_common.py:464 models.py:2421
+#: forms_common.py:499 forms_common.py:512 models.py:2556
msgid "Towns"
msgstr "Communes"
-#: forms_common.py:461
+#: forms_common.py:509
msgid "There are identical towns."
msgstr "Il y a des communes identiques."
-#: forms_common.py:545
+#: forms_common.py:593
msgid "Only one choice can be checked."
msgstr "Seul un choix peut être coché."
-#: forms_common.py:593
+#: forms_common.py:641
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:597 forms_common.py:637 models.py:1716 models.py:2323
+#: forms_common.py:645 forms_common.py:685 models.py:1828 models.py:2457
msgid "Source type"
msgstr "Type de document"
-#: forms_common.py:599 forms_common.py:638 templates/sheet_ope.html:84
+#: forms_common.py:647 forms_common.py:686 templates/sheet_ope.html:84
msgid "Reference"
msgstr "Référence"
-#: forms_common.py:602 forms_common.py:639
+#: forms_common.py:650 forms_common.py:687
msgid "Internal reference"
msgstr "Référence interne"
-#: forms_common.py:605 models.py:2354
+#: forms_common.py:653 models.py:2488
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:606 models.py:2356
+#: forms_common.py:654 models.py:2490
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:608 models.py:1868 models.py:2358
+#: forms_common.py:656 models.py:1981 models.py:2492
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:611 models.py:2361
+#: forms_common.py:659 models.py:2495
msgid "Receipt date in documentation"
msgstr "Date de réception en documentation"
-#: forms_common.py:613 forms_common.py:641 models.py:282 models.py:490
-#: models.py:1611 models.py:2112 models.py:2368
+#: forms_common.py:661 forms_common.py:689 models.py:287 models.py:516
+#: models.py:1723 models.py:2225 models.py:2502
msgid "Comment"
msgstr "Commentaire"
-#: forms_common.py:615 forms_common.py:640 models.py:814 models.py:1370
-#: models.py:1543 models.py:1585 models.py:2367 templates/sheet_ope.html:128
+#: forms_common.py:663 forms_common.py:688 models.py:888 models.py:1482
+#: models.py:1655 models.py:1697 models.py:2501 templates/sheet_ope.html:128
msgid "Description"
msgstr "Description"
-#: forms_common.py:618 models.py:2369
+#: forms_common.py:666 models.py:2503
msgid "Additional information"
msgstr "Informations supplémentaires"
-#: forms_common.py:620 forms_common.py:644 models.py:2371
+#: forms_common.py:668 forms_common.py:692 models.py:2505
msgid "Has a duplicate"
msgstr "Existe en doublon"
-#: forms_common.py:633 forms_common.py:662 forms_common.py:695 models.py:2307
+#: forms_common.py:681 forms_common.py:710 forms_common.py:743 models.py:2441
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr "Auteur"
-#: forms_common.py:643
+#: forms_common.py:691
msgid "Additional informations"
msgstr "Informations complémentaires"
-#: forms_common.py:654
+#: forms_common.py:702
msgid "Would you like to delete this documentation?"
msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:670 models.py:1717 models.py:2297 models.py:2304
+#: forms_common.py:718 models.py:1829 models.py:2431 models.py:2438
msgid "Author type"
msgstr "Type d'auteur"
-#: forms_common.py:688
+#: forms_common.py:736
msgid "Author selection"
msgstr "Sélection d'auteur"
-#: forms_common.py:702
+#: forms_common.py:750
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:706 models.py:2308 models.py:2350
+#: forms_common.py:754 models.py:2442 models.py:2484
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Authors"
@@ -486,52 +498,56 @@ msgstr "Auteurs"
msgid "Administration"
msgstr "Administration"
-#: ishtar_menu.py:31 views.py:154
-msgid "Account management"
-msgstr "Gestion des comptes"
+#: ishtar_menu.py:33
+msgid "Add/modify"
+msgstr "Ajouter/Modifier"
-#: ishtar_menu.py:34 models.py:894 views.py:1140
+#: ishtar_menu.py:36
+msgid "Deletion"
+msgstr "Suppression"
+
+#: ishtar_menu.py:39 models.py:1006 views.py:1232
msgid "Global variables"
msgstr "Variables globales"
-#: ishtar_menu.py:39
+#: ishtar_menu.py:44
msgid "Directory"
msgstr "Annuaire"
-#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:3
+#: ishtar_menu.py:50 ishtar_menu.py:74 templates/blocks/JQueryJqGrid.html:3
msgid "Search"
msgstr "Recherche"
-#: ishtar_menu.py:49 ishtar_menu.py:74 templates/ishtar/import_list.html:15
+#: ishtar_menu.py:54 ishtar_menu.py:79 templates/ishtar/import_list.html:15
msgid "Creation"
msgstr "Ajout"
-#: ishtar_menu.py:53 ishtar_menu.py:79
+#: ishtar_menu.py:58 ishtar_menu.py:84
msgid "Modification"
msgstr "Modification"
-#: ishtar_menu.py:57 ishtar_menu.py:84 templates/ishtar/merge.html:5
+#: ishtar_menu.py:62 ishtar_menu.py:89 templates/ishtar/merge.html:5
msgid "Merge"
msgstr "Fusion"
-#: ishtar_menu.py:61 ishtar_menu.py:88 models.py:1905 widgets.py:110
+#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2018 widgets.py:110
#: templates/ishtar/form_delete.html:11
msgid "Delete"
msgstr "Suppression"
-#: ishtar_menu.py:96 models.py:1879
+#: ishtar_menu.py:101 models.py:1992
msgid "Imports"
msgstr "Imports"
-#: ishtar_menu.py:99 views.py:1148
+#: ishtar_menu.py:104 views.py:1240
msgid "New import"
msgstr "Nouvel import"
-#: ishtar_menu.py:103 views.py:1162
+#: ishtar_menu.py:108 views.py:1254
msgid "Current imports"
msgstr "Imports en cours"
-#: ishtar_menu.py:107
+#: ishtar_menu.py:112
msgid "Old imports"
msgstr "Anciens imports"
@@ -547,79 +563,91 @@ msgstr "Un élément sélectionné n'est pas valide."
msgid "This item already exists."
msgstr "Cet élément existe déjà."
-#: models.py:278 models.py:489 models.py:1133 models.py:1145
+#: models.py:283 models.py:515 models.py:1245 models.py:1257
msgid "Label"
msgstr "Libellé"
-#: models.py:280
+#: models.py:285
msgid "Textual ID"
msgstr "Identifiant textuel"
-#: models.py:283 models.py:492 models.py:1102
+#: models.py:288 models.py:518 models.py:1214
msgid "Available"
msgstr "Disponible"
-#: models.py:511 models.py:1657
+#: models.py:537 models.py:1769
msgid "Key"
msgstr "Clé"
-#: models.py:517
+#: models.py:543
msgid "Specific key to an import"
msgstr "Clé spécifique à un import"
-#: models.py:593
+#: models.py:623
msgid "Last editor"
msgstr "Dernier éditeur"
-#: models.py:596
+#: models.py:626
msgid "Creator"
msgstr "Créateur"
-#: models.py:729 models.py:2432
+#: models.py:766 models.py:2567
msgid "Order"
msgstr "Ordre"
-#: models.py:730
+#: models.py:767
msgid "Symmetrical"
msgstr "Symétrique"
-#: models.py:743
+#: models.py:768
+msgid "Tiny label"
+msgstr "Petit libellé"
+
+#: models.py:782
msgid "Cannot have symmetrical and an inverse_relation"
msgstr "Ne peut pas être symétrique et avoir une relation inverse"
-#: models.py:813 models.py:1368
+#: models.py:880
+msgid "Euro"
+msgstr "Euro"
+
+#: models.py:881
+msgid "US dollar"
+msgstr "Dollars US"
+
+#: models.py:887 models.py:1480
msgid "Slug"
msgstr "Identifiant texte"
-#: models.py:815
+#: models.py:889
msgid "Files module"
msgstr "Module Dossiers"
-#: models.py:816
+#: models.py:890
msgid "Context records module"
msgstr "Module Unités d'Enregistrement"
-#: models.py:818
+#: models.py:892
msgid "Finds module"
msgstr "Module Mobilier"
-#: models.py:819
+#: models.py:893
msgid "Need context records module"
msgstr "Nécessite le module Unités d'Enregistrement"
-#: models.py:821
+#: models.py:895
msgid "Warehouses module"
msgstr "Module Dépôts"
-#: models.py:822
+#: models.py:896
msgid "Need finds module"
msgstr "Nécessite le module mobilier"
-#: models.py:824
+#: models.py:898
msgid "Home page"
msgstr "Page d'accueil"
-#: models.py:825
+#: models.py:899
msgid ""
"Homepage of Ishtar - if not defined a default homepage will appear. Use the "
"markdown syntax."
@@ -627,614 +655,694 @@ msgstr ""
"Page d'accueil d'Ishtar. Si elle n'est pas définie une page d'accueil par "
"défaut va apparaître. Utiliser la syntaxe Markdown."
-#: models.py:827
+#: models.py:902
+msgid "File external id"
+msgstr "Identifiant externe de fichier"
+
+#: models.py:904
+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"
+
+#: models.py:909
+msgid "Parcel external id"
+msgstr "Identifiant externe de parcelle"
+
+#: models.py:912
+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 "
+"précaution. Une formule incorrecte peut rendre l'application inutilisable et "
+"l'import de données externes peut alors être destructif."
+
+#: models.py:917
+msgid "Context record external id"
+msgstr "Identifiant externe d'unité d'enregistrement"
+
+#: models.py:919
+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 "
+"inutilisable et l'import de données externes peut alors être destructif."
+
+#: models.py:924
+msgid "Base find external id"
+msgstr "Identifiant externe de mobilier de base"
+
+#: models.py:926
+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 de base. À "
+"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:931
+msgid "Find external id"
+msgstr "Identifiant externe de mobilier"
+
+#: models.py:933
+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."
+
+#: models.py:937
msgid "Current active"
msgstr "Actuellement utilisé"
-#: models.py:830
+#: models.py:938
+msgid "Currency"
+msgstr "Devise"
+
+#: models.py:942
msgid "Ishtar site profile"
msgstr "Profil d'instance Ishtar"
-#: models.py:831
+#: models.py:943
msgid "Ishtar site profiles"
msgstr "Profils d'instance Ishtar"
-#: models.py:887
+#: models.py:999
msgid "Variable name"
msgstr "Nom de la variable"
-#: models.py:888
+#: models.py:1000
msgid "Description of the variable"
msgstr "Description de la variable"
-#: models.py:890 models.py:1658
+#: models.py:1002 models.py:1770
msgid "Value"
msgstr "Valeur"
-#: models.py:893
+#: models.py:1005
msgid "Global variable"
msgstr "Variable globale"
-#: models.py:1003 models.py:1033
+#: models.py:1115 models.py:1145
msgid "Total"
msgstr "Total"
-#: models.py:1010 models.py:1134 models.py:1146
-#: templates/ishtar/sheet_person.html:22
+#: models.py:1122 models.py:1246 models.py:1258
+#: templates/ishtar/sheet_person.html:21
#: templates/ishtar/dashboards/dashboard_main_detail.html:135
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
#: templates/ishtar/wizard/wizard_person.html:20
msgid "Number"
msgstr "Nombre"
-#: models.py:1097
+#: models.py:1209
msgid "Administrative Act"
msgstr "Acte administratif"
-#: models.py:1101
+#: models.py:1213
msgid "Associated object"
msgstr "Objet associé"
-#: models.py:1105
+#: models.py:1217
msgid "Document template"
msgstr "Patron de document"
-#: models.py:1106
+#: models.py:1218
msgid "Document templates"
msgstr "Patrons de documents"
-#: models.py:1137 models.py:1147 models.py:1863
+#: models.py:1249 models.py:1259 models.py:1976
msgid "State"
msgstr "État"
-#: models.py:1151 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1263 templates/blocks/JQueryAdvancedTown.html:12
msgid "Department"
msgstr "Département"
-#: models.py:1152
+#: models.py:1264
msgid "Departments"
msgstr "Départements"
-#: models.py:1189
+#: models.py:1301
msgid "Raw phone"
msgstr "Téléphone brut"
-#: models.py:1195
+#: models.py:1307
msgid "Alternative address is prefered"
msgstr "L'adresse alternative est préférée"
-#: models.py:1234
+#: models.py:1346
msgid "Tel: "
msgstr "Tél :"
-#: models.py:1238
+#: models.py:1350
msgid "Mobile: "
msgstr "Mobile :"
-#: models.py:1242
+#: models.py:1354
msgid "Email: "
msgstr "Courriel :"
-#: models.py:1247
+#: models.py:1359
msgid "Merge key"
msgstr "Clé de fusion"
-#: models.py:1308
+#: models.py:1420
msgid "Organization types"
msgstr "Types d'organisation"
-#: models.py:1324
+#: models.py:1436
msgid "Archaeological site"
msgstr "Entité Archéologique"
-#: models.py:1325
+#: models.py:1437
msgid "Parcels"
msgstr "Parcelles"
-#: models.py:1327
+#: models.py:1439
msgid "Operation source"
msgstr "Documentation de l'opération"
-#: models.py:1330 views.py:965 views.py:1016
+#: models.py:1442 views.py:1057 views.py:1108
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: models.py:1332 views.py:968 views.py:1024
+#: models.py:1444 views.py:1060 views.py:1116
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: models.py:1334
+#: models.py:1446
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: models.py:1336 views.py:970 views.py:1027
+#: models.py:1448 views.py:1062 views.py:1119
msgid "Finds"
msgstr "Mobilier"
-#: models.py:1372 templates/ishtar/dashboards/dashboard_main.html:26
+#: models.py:1484 templates/ishtar/dashboards/dashboard_main.html:25
msgid "Users"
msgstr "Utilisateurs"
-#: models.py:1374
+#: models.py:1486
msgid "Associated model"
msgstr "Modèle associé"
-#: models.py:1377
+#: models.py:1489
msgid "Is template"
msgstr "Est un patron"
-#: models.py:1378
+#: models.py:1490
msgid "Unicity keys (separator \";\")"
msgstr "Clés d'unicité (séparateur « ; »)"
-#: models.py:1382
+#: models.py:1494
msgid "Importer - Type"
msgstr "Importeur - Type"
-#: models.py:1383
+#: models.py:1495
msgid "Importer - Types"
msgstr "Importeur - Types"
-#: models.py:1473
+#: models.py:1585
msgid "Importer - Default"
msgstr "Importeur - Par défaut"
-#: models.py:1474
+#: models.py:1586
msgid "Importer - Defaults"
msgstr "Importeur - Par défaut"
-#: models.py:1509
+#: models.py:1621
msgid "Importer - Default value"
msgstr "Importeur - Valeur par défaut"
-#: models.py:1510
+#: models.py:1622
msgid "Importer - Default values"
msgstr "Importeur - Valeurs par défaut"
-#: models.py:1542
+#: models.py:1654
msgid "Column number"
msgstr "Numéro de colonne"
-#: models.py:1545
+#: models.py:1657
msgid "Required"
msgstr "Requis"
-#: models.py:1548
+#: models.py:1660
msgid "Importer - Column"
msgstr "Importeur - Colonne"
-#: models.py:1549
+#: models.py:1661
msgid "Importer - Columns"
msgstr "Importeur - Colonnes"
-#: models.py:1569
+#: models.py:1681
msgid "Field name"
msgstr "Nom du champ"
-#: models.py:1571 models.py:1605
+#: models.py:1683 models.py:1717
msgid "Force creation of new items"
msgstr "Forcer la création de nouveaux éléments"
-#: models.py:1573 models.py:1607
+#: models.py:1685 models.py:1719
msgid "Concatenate with existing"
msgstr "Concaténer avec l'existant"
-#: models.py:1575 models.py:1609
+#: models.py:1687 models.py:1721
msgid "Concatenate character"
msgstr "Caractère de concaténation"
-#: models.py:1579
+#: models.py:1691
msgid "Importer - Duplicate field"
msgstr "Importeur - Champ dupliqué"
-#: models.py:1580
+#: models.py:1692
msgid "Importer - Duplicate fields"
msgstr "Importeur - Champs dupliqués"
-#: models.py:1587
+#: models.py:1699
msgid "Regular expression"
msgstr "Expression régulière"
-#: models.py:1590
+#: models.py:1702
msgid "Importer - Regular expression"
msgstr "Importeur - Expression régulière"
-#: models.py:1591
+#: models.py:1703
msgid "Importer - Regular expressions"
msgstr "Importeur - Expressions régulières"
-#: models.py:1614
+#: models.py:1726
msgid "Importer - Target"
msgstr "Importeur - Cible"
-#: models.py:1615
+#: models.py:1727
msgid "Importer - Targets"
msgstr "Importeur - Cibles"
-#: models.py:1639 views.py:325
+#: models.py:1751 views.py:343
msgid "True"
msgstr "Oui"
-#: models.py:1640 views.py:327
+#: models.py:1752 views.py:345
msgid "False"
msgstr "Non"
-#: models.py:1659
+#: models.py:1771
msgid "Is set"
msgstr "Est défini"
-#: models.py:1666
+#: models.py:1778
msgid "Importer - Target key"
msgstr "Importeur - Rapprochement"
-#: models.py:1667
+#: models.py:1779
msgid "Importer - Targets keys"
msgstr "Importeur - Rapprochements"
-#: models.py:1718 models.py:2335 models.py:2346
+#: models.py:1830 models.py:2469 models.py:2480
msgid "Format"
msgstr "Format"
-#: models.py:1719 models.py:2436
+#: models.py:1831 models.py:2571
msgid "Operation type"
msgstr "Type d'opération"
-#: models.py:1720
+#: models.py:1832
msgid "Period"
msgstr "Périodes"
-#: models.py:1721
+#: models.py:1833
+msgid "Report state"
+msgstr "État de rapport"
+
+#: models.py:1834
msgid "Unit"
msgstr "Unité"
-#: models.py:1722
+#: models.py:1835
msgid "Material"
msgstr "Matériau"
-#: models.py:1724
+#: models.py:1837
msgid "Conservatory state"
msgstr "État de conservation"
-#: models.py:1725
+#: models.py:1838
msgid "Preservation type"
msgstr "Type de conservation"
-#: models.py:1726
+#: models.py:1839
msgid "Object type"
msgstr "Type d'objet"
-#: models.py:1728
+#: models.py:1841
msgid "Identification type"
msgstr "Type d'identification"
-#: models.py:1730
+#: models.py:1843
msgid "Context record relation type"
msgstr "Type de relations entre Unités d'Enregistrement"
-#: models.py:1731 models.py:2329
+#: models.py:1844 models.py:2463
msgid "Support type"
msgstr "Type de support"
-#: models.py:1737
+#: models.py:1850
msgid "Integer"
msgstr "Entier"
-#: models.py:1738
+#: models.py:1851
msgid "Float"
msgstr "Nombre à virgule"
-#: models.py:1739
+#: models.py:1852
msgid "String"
msgstr "Chaîne de caractères"
-#: models.py:1740 templates/sheet_ope.html:86
+#: models.py:1853 templates/sheet_ope.html:86
msgid "Date"
msgstr "Date"
-#: models.py:1742 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
-#: templates/ishtar/sheet_person.html:89
+#: models.py:1855 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
#: templates/ishtar/dashboards/dashboard_main_detail.html:120
msgid "Year"
msgstr "Année"
-#: models.py:1743
+#: models.py:1856
msgid "String to boolean"
msgstr "Chaîne de caractères vers booléen"
-#: models.py:1744
+#: models.py:1857
msgctxt "filesystem"
msgid "File"
msgstr "Fichier"
-#: models.py:1745
+#: models.py:1858
msgid "Unknow type"
msgstr "Type inconnu"
-#: models.py:1761
+#: models.py:1874
msgid "4 digit year. e.g.: \"2015\""
msgstr "Année sur 4 chiffres. Exemple : « 2015 »"
-#: models.py:1762
+#: models.py:1875
msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
-#: models.py:1763
+#: models.py:1876
msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »"
-#: models.py:1773
+#: models.py:1886
msgid "Options"
msgstr "Options"
-#: models.py:1775
+#: models.py:1888
msgid "Split character(s)"
msgstr "Caractère(s) de séparation"
-#: models.py:1779
+#: models.py:1892
msgid "Importer - Formater type"
msgstr "Importeur - Type de mise en forme"
-#: models.py:1780
+#: models.py:1893
msgid "Importer - Formater types"
msgstr "Importeur - Types de mise en forme"
-#: models.py:1827 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:1940 templates/ishtar/dashboards/dashboard_main_detail.html:61
msgid "Created"
msgstr "Créé"
-#: models.py:1828
+#: models.py:1941
msgid "Analyse in progress"
msgstr "Analyse en cours"
-#: models.py:1829
+#: models.py:1942
msgid "Analysed"
msgstr "Analysé"
-#: models.py:1830
+#: models.py:1943
msgid "Import pending"
msgstr "Import en attente"
-#: models.py:1831
+#: models.py:1944
msgid "Import in progress"
msgstr "Import en cours"
-#: models.py:1832
+#: models.py:1945
msgid "Finished with errors"
msgstr "Terminé avec des erreurs"
-#: models.py:1833
+#: models.py:1946
msgid "Finished"
msgstr "Terminé"
-#: models.py:1834
+#: models.py:1947
msgid "Archived"
msgstr "Archivé"
-#: models.py:1846
+#: models.py:1959
msgid "Imported file"
msgstr "Fichier importé"
-#: models.py:1849
+#: models.py:1962
msgid "Associated images (zip file)"
msgstr "Images associées (fichier zip)"
-#: models.py:1851
+#: models.py:1964
msgid "Encoding"
msgstr "Codage"
-#: models.py:1853
+#: models.py:1966
msgid "Skip lines"
msgstr "Nombre de lignes d'entête"
-#: models.py:1854 templates/ishtar/import_list.html:47
+#: models.py:1967 templates/ishtar/import_list.html:47
msgid "Error file"
msgstr "Fichier erreur"
-#: models.py:1857
+#: models.py:1970
msgid "Result file"
msgstr "Fichier résultant"
-#: models.py:1860 templates/ishtar/import_list.html:53
+#: models.py:1973 templates/ishtar/import_list.html:53
msgid "Match file"
msgstr "Fichier de correspondance"
-#: models.py:1866
+#: models.py:1979
msgid "Conservative import"
msgstr "Import conservateur"
-#: models.py:1871
+#: models.py:1984
msgid "End date"
msgstr "Date de fin"
-#: models.py:1873
+#: models.py:1986
msgid "Remaining seconds"
msgstr "Secondes restantes"
-#: models.py:1878
+#: models.py:1991
msgid "Import"
msgstr "Import"
-#: models.py:1895
+#: models.py:2008
msgid "Analyse"
msgstr "Analyser"
-#: models.py:1897 models.py:1900
+#: models.py:2010 models.py:2013
msgid "Re-analyse"
msgstr "Analyser de nouveau "
-#: models.py:1898
+#: models.py:2011
msgid "Launch import"
msgstr "Lancer l'import"
-#: models.py:1901
+#: models.py:2014
msgid "Re-import"
msgstr "Ré-importer"
-#: models.py:1902
+#: models.py:2015
msgid "Archive"
msgstr "Archiver"
-#: models.py:1904
+#: models.py:2017
msgid "Unarchive"
msgstr "Désarchiver"
-#: models.py:2037
+#: models.py:2150
msgid "Organizations"
msgstr "Organisations"
-#: models.py:2039
+#: models.py:2152
msgid "Can view all Organizations"
msgstr "Peut voir toutes les Organisations"
-#: models.py:2040
+#: models.py:2153
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: models.py:2041
+#: models.py:2154
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: models.py:2043
+#: models.py:2156
msgid "Can change own Organization"
msgstr "Peut modifier sa propre Organisation"
-#: models.py:2045
+#: models.py:2158
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: models.py:2080
+#: models.py:2193
msgid "Groups"
msgstr "Groupes"
-#: models.py:2085
+#: models.py:2198
msgid "Person types"
-msgstr "Types d'individu"
+msgstr "Types de personne"
-#: models.py:2092
+#: models.py:2205
msgid "Mr"
msgstr "M."
-#: models.py:2093
+#: models.py:2206
msgid "Miss"
msgstr "Mlle"
-#: models.py:2094
+#: models.py:2207
msgid "Mr and Mrs"
msgstr "M. et Mme"
-#: models.py:2095
+#: models.py:2208
msgid "Mrs"
msgstr "Mme"
-#: models.py:2096
+#: models.py:2209
msgid "Doctor"
msgstr "Dr."
-#: models.py:2110
+#: models.py:2223
msgid "Contact type"
msgstr "Type de contact"
-#: models.py:2113 models.py:2160
+#: models.py:2226 models.py:2273
msgid "Types"
msgstr "Types"
-#: models.py:2116
+#: models.py:2229
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:2120
+#: models.py:2233
msgid "Persons"
msgstr "Personnes"
-#: models.py:2122
+#: models.py:2235
msgid "Can view all Persons"
msgstr "Peut voir toutes les Personnes"
-#: models.py:2123
+#: models.py:2236
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: models.py:2124
+#: models.py:2237
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: models.py:2125
+#: models.py:2238
msgid "Can change own Person"
msgstr "Peut modifier sa propre Personne"
-#: models.py:2126
+#: models.py:2239
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: models.py:2252
+#: models.py:2383
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:2253
+#: models.py:2384
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:2298
+#: models.py:2426
+msgid "To modify the password use the form in Auth > User"
+msgstr ""
+"Pour modifier le mot de passe, utilisez le formulaire dans Authentification "
+"> Utilisateurs"
+
+#: models.py:2432
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:2324
+#: models.py:2458
msgid "Source types"
msgstr "Types de document"
-#: models.py:2330
+#: models.py:2464
msgid "Support types"
msgstr "Types de support"
-#: models.py:2336
+#: models.py:2470
msgid "Formats"
msgstr "Formats"
-#: models.py:2341
+#: models.py:2475
msgid "External ID"
msgstr "Identifiant externe"
-#: models.py:2344
+#: models.py:2478
msgid "Support"
msgstr "Support"
-#: models.py:2348
+#: models.py:2482
msgid "Scale"
msgstr "Échelle"
-#: models.py:2362
+#: models.py:2496
msgid "Item number"
msgstr "Numéro d'élément"
-#: models.py:2363
+#: models.py:2497
msgid "Ref."
msgstr "Réf."
-#: models.py:2366
+#: models.py:2500
msgid "Internal ref."
msgstr "Réf. interne"
-#: models.py:2407
+#: models.py:2542
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:2408 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2543 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr "Localisation"
-#: models.py:2433
+#: models.py:2568
msgid "Is preventive"
msgstr "Est du préventif"
-#: models.py:2437
+#: models.py:2572
msgid "Operation types"
msgstr "Types d'opération"
-#: models.py:2463
+#: models.py:2598
msgid "Preventive"
msgstr "Préventif"
-#: models.py:2464
+#: models.py:2599
msgid "Research"
msgstr "Programmé"
@@ -1242,86 +1350,88 @@ msgstr "Programmé"
msgid " (...)"
msgstr " (...)"
-#: views.py:100
+#: views.py:102
msgid "New person"
msgstr "Nouvelle personne"
-#: views.py:108
+#: views.py:110
msgid "Person modification"
msgstr "Modification d'une personne"
-#: views.py:123
+#: views.py:125
msgid "Person deletion"
msgstr "Suppression de personne"
-#: views.py:134
+#: views.py:136
msgid "New organization"
msgstr "Nouvelle organisation"
-#: views.py:141
+#: views.py:143
msgid "Organization modification"
msgstr "Modification d'une organisation"
-#: views.py:147
+#: views.py:159
msgid "Organization deletion"
msgstr "Suppression d'une organisation"
-#: views.py:662 templates/base.html:81 templates/ishtar/basket_list.html:4
-#: templates/ishtar/sheet_organization.html:35
-#: templatetags/link_to_window.py:18
-msgid "Details"
-msgstr "Détails"
+#: views.py:166
+msgid "Account management"
+msgstr "Gestion des comptes"
+
+#: views.py:172
+msgid "Account deletion"
+msgstr "Suppression de comptes"
-#: views.py:893 views.py:947
+#: views.py:970 views.py:1039
msgid "Operation not permitted."
msgstr "Opération non permise."
-#: views.py:895
+#: views.py:972
#, python-format
msgid "New %s"
msgstr "Nouveau %s"
-#: views.py:966 views.py:1020
+#: views.py:1058 views.py:1112
msgid "Operations"
msgstr "Opérations"
-#: views.py:1209 templates/ishtar/import_list.html:43
+#: views.py:1301 templates/ishtar/import_list.html:43
msgid "Link unmatched items"
msgstr "Associer les éléments non rapprochés"
-#: views.py:1224
+#: views.py:1316
msgid "Delete import"
msgstr "Suppression de l'import"
-#: views.py:1283 views.py:1299
+#: views.py:1375 views.py:1391
msgid "Corporation manager"
msgstr "Représentant de la personne morale"
-#: widgets.py:237 widgets.py:345 widgets.py:461
+#: widgets.py:239 widgets.py:347 widgets.py:463
msgid "Search..."
msgstr "Recherche..."
-#: widgets.py:604 templatetags/window_tables.py:71
+#: widgets.py:608 templatetags/window_tables.py:76
msgid "No results"
msgstr "Pas de résultats"
-#: widgets.py:605 templatetags/window_tables.py:72
+#: widgets.py:609 templatetags/window_tables.py:77
msgid "Loading..."
msgstr "Chargement..."
-#: widgets.py:606
+#: widgets.py:610
msgid "Remove"
msgstr "Enlever"
-#: wizards.py:318 templates/ishtar/import_delete.html:20
+#: wizards.py:321 templates/ishtar/import_delete.html:20
msgid "Yes"
msgstr "Oui"
-#: wizards.py:320
+#: wizards.py:323
msgid "No"
msgstr "Non"
-#: wizards.py:1215
+#: wizards.py:1227
#, python-format
msgid "[%(app_name)s] Account creation/modification"
msgstr "[%(app_name)s] Création /modification du compte"
@@ -1360,29 +1470,29 @@ msgstr "Merci pour l'intérêt que vous portez au projet."
msgid "The %(app_name)s team"
msgstr "L'équipe %(app_name)s"
-#: templates/base.html:35
+#: templates/base.html:36
msgid "Logged in"
msgstr "Connecté"
-#: templates/base.html:36
+#: templates/base.html:37
msgid "Log out"
msgstr "Déconnexion"
-#: templates/base.html:37
+#: templates/base.html:38
msgid "Change password"
msgstr "Changement de mot de passe"
-#: templates/base.html:39 templates/registration/activate.html:10
+#: templates/base.html:40 templates/registration/activate.html:10
#: templates/registration/login.html:8 templates/registration/login.html:10
#: templates/registration/password_reset_complete.html:8
msgid "Log in"
msgstr "Connexion"
-#: templates/base.html:45
+#: templates/base.html:46
msgid "Lang"
msgstr "Langue"
-#: templates/base.html:45 templates/base.html.py:92 templates/welcome.html:7
+#: templates/base.html:46 templates/base.html.py:93 templates/welcome.html:7
#: templates/welcome.html.py:8 templates/welcome.html:9
#: templates/welcome.html.py:10 templates/ishtar/manage_basket.html:4
#: templates/ishtar/blocks/window_field.html:1
@@ -1392,26 +1502,23 @@ msgstr "Langue"
msgid ":"
msgstr " :"
-#: templates/base.html:70
+#: templates/base.html:71
msgid "Default selected items"
msgstr "Éléments sélectionnés par défaut"
-#: templates/base.html:90
+#: templates/base.html:91
msgid "Current items"
msgstr "Éléments courants"
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "Export as:"
msgstr "Export en :"
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "OpenOffice.org file"
msgstr "fichier OpenOffice.org"
-#: templates/sheet_ope.html:4 templates/ishtar/sheet_organization.html:10
-#: templates/ishtar/sheet_toolbar.html:1
+#: templates/sheet_ope.html:4
msgid "PDF file"
msgstr "fichier PDF"
@@ -1599,7 +1706,7 @@ msgstr "Pas d'acte administratif associé à cette opération"
msgid "Documentation"
msgstr "Documentation"
-#: templates/sheet_ope.html:102 templates/ishtar/sheet_person.html:87
+#: templates/sheet_ope.html:102
msgid "Documents"
msgstr "Documents"
@@ -1697,24 +1804,29 @@ msgstr "Choisissez une région"
msgid "Search and select an item"
msgstr "Rechercher puis sélectionner un élément"
-#: templates/blocks/JQueryJqGrid.html:16 templates/blocks/JQueryJqGrid.html:20
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:13
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12
msgid "Export as CSV"
msgstr "Export en CSV"
-#: templates/blocks/JQueryJqGrid.html:17
+#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9
+msgid "CSV"
+msgstr "CSV"
+
+#: templates/blocks/JQueryJqGrid.html:18
#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
-msgid "simple"
-msgstr "simple"
+msgid "Export as CSV - full"
+msgstr "Export en CSV - complet"
#: templates/blocks/JQueryJqGrid.html:18
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:11
-msgid "full"
-msgstr "complet"
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10
+msgid "CSV full"
+msgstr "CSV complet"
#: templates/blocks/JQueryJqGrid.html:96
-#: templates/ishtar/blocks/window_tables/dynamic_documents.html:42
+#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41
msgid "An error as occured during search. Check your query fields."
msgstr ""
"Une erreur est intervenue sur cette recherche. Vérifiez la pertinence de vos "
@@ -1836,6 +1948,7 @@ msgstr "N'est pas un doublon"
#: templates/ishtar/organization_person_form.html:32
#: templates/ishtar/person_form.html:43
#: templates/ishtar/blocks/modify_toolbar.html:1
+#: templates/ishtar/blocks/window_nav.html:39
msgid "Modify"
msgstr "Modifier"
@@ -1867,84 +1980,114 @@ msgstr "Identification"
msgid "Contact informations"
msgstr "Coordonnées"
-#: templates/ishtar/sheet.html:21
-msgid "Previous"
-msgstr "Précédent"
-
-#: templates/ishtar/sheet.html:22
+#: templates/ishtar/sheet.html:28
msgid "Close"
msgstr "Fermer"
-#: templates/ishtar/sheet.html:23
+#: templates/ishtar/sheet.html:34
msgid "Close all windows"
msgstr "Fermer toutes les fenêtres"
-#: templates/ishtar/sheet.html:24
-msgid "Next"
-msgstr "Suivant"
-
-#: templates/ishtar/sheet_organization.html:13
+#: templates/ishtar/sheet_organization.html:9
msgid "Created by:"
msgstr "Créé par :"
-#: templates/ishtar/sheet_organization.html:23
+#: templates/ishtar/sheet_organization.html:19
msgid "Person in the organization"
msgstr "Personnes au sein de l'organisation"
-#: templates/ishtar/sheet_organization.html:38
+#: templates/ishtar/sheet_organization.html:34
msgid "No person in this organization"
msgstr "Pas de personne au sein de cette organisation"
-#: templates/ishtar/sheet_person.html:21
+#: templates/ishtar/sheet_person.html:20
#: templates/ishtar/wizard/wizard_person.html:19
msgid "Phone type"
msgstr "Type de téléphone"
-#: templates/ishtar/sheet_person.html:44
+#: templates/ishtar/sheet_person.html:43
#: templates/ishtar/wizard/wizard_person.html:42
msgid "Business address"
msgstr "Adresse professionnelle"
-#: templates/ishtar/sheet_person.html:52
+#: templates/ishtar/sheet_person.html:51
#: templates/ishtar/wizard/wizard_person.html:51
msgid "Other address"
msgstr "Autre adresse"
-#: templates/ishtar/sheet_person.html:60
+#: templates/ishtar/sheet_person.html:59
msgid "Associated organization"
msgstr "Organisations associées"
-#: templates/ishtar/sheet_person.html:71
+#: templates/ishtar/sheet_person.html:70
msgid "Associated operations as scientist"
msgstr "Opérations associées en tant que responsable scientifique"
-#: templates/ishtar/sheet_person.html:75
+#: templates/ishtar/sheet_person.html:74
msgid "Associated operations as responsible"
msgstr "Opérations associées en tant que responsable"
-#: templates/ishtar/sheet_person.html:81
+#: templates/ishtar/sheet_person.html:80
msgid "Associated archaelogical files"
msgstr "Dossiers archéologiques associés"
-#: templates/ishtar/sheet_person.html:92
-#: templates/ishtar/sheet_person.html:100
-#: templates/ishtar/blocks/window_tables/documents.html:9
-#: templates/ishtar/blocks/window_tables/documents.html:17
-msgid "Link"
-msgstr "Lien"
+#: templates/ishtar/sheet_person.html:86
+msgid "Documents associated to operations"
+msgstr "Documents des opérations associées"
+
+#: templates/ishtar/sheet_person.html:91
+msgid "Documents associated to context records"
+msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_person.html:104
-msgid "No document associated to this person"
-msgstr "Pas de document associé à cette personne"
+#: templates/ishtar/sheet_person.html:96
+msgid "Documents associated to finds"
+msgstr "Documents du mobilier associé"
#: templates/ishtar/blocks/window_field_url.html:2
msgid "link"
msgstr "lien"
+#: templates/ishtar/blocks/window_nav.html:6
+msgid "Previous version"
+msgstr "Version précédente"
+
+#: templates/ishtar/blocks/window_nav.html:17
+msgid "Restore this version"
+msgstr "Restaurer cette version"
+
+#: templates/ishtar/blocks/window_nav.html:17
+msgid ""
+"Are you sure to restore to this version? All changement made since this "
+"version will be lost."
+msgstr ""
+"Êtes-vous sûr de vouloir revenir à cette version ? Tous les changements "
+"réalisées depuis cette version seront perdus."
+
+#: templates/ishtar/blocks/window_nav.html:22
+msgid "Restore"
+msgstr "Restaurer"
+
+#: templates/ishtar/blocks/window_nav.html:24
+msgid "Next version"
+msgstr "Version suivante"
+
+#: templates/ishtar/blocks/window_nav.html:45
+msgid "Export as OpenOffice.org file"
+msgstr "Exporter en fichier OpenOffice.org"
+
+#: templates/ishtar/blocks/window_nav.html:45
+msgid "Export as PDF file"
+msgstr "Exporter en fichier PDF"
+
#: templates/ishtar/blocks/window_tables/documents.html:8
msgid "Related to"
msgstr "Associé à"
+#: templates/ishtar/blocks/window_tables/documents.html:9
+#: templates/ishtar/blocks/window_tables/documents.html:17
+msgid "Link"
+msgstr "Lien"
+
#: templates/ishtar/dashboards/dashboard_main_detail.html:5
msgid "Numbers"
msgstr "Nombres"
@@ -2006,7 +2149,7 @@ msgstr "Par opérations"
#: templates/ishtar/dashboards/dashboard_main_detail.html:58
msgid "Created last"
-msgstr "Derniers créés"
+msgstr "Dernières créations"
#: templates/ishtar/dashboards/dashboard_main_detail.html:65
#: templates/ishtar/dashboards/dashboard_main_detail.html:76
@@ -2103,26 +2246,6 @@ msgstr "Vous avez enregistré les informations suivantes :"
msgid "Associated persons"
msgstr "Personnes associées"
-#: templates/ishtar/wizard/wizard_organization_deletion.html:9
-#: templates/ishtar/wizard/wizard_organization_deletion.html:17
-#: templates/ishtar/wizard/wizard_organization_deletion.html:25
-#: templates/ishtar/wizard/wizard_organization_deletion.html:33
-#: templates/ishtar/wizard/wizard_person_deletion.html:9
-#: templates/ishtar/wizard/wizard_person_deletion.html:17
-#: templates/ishtar/wizard/wizard_person_deletion.html:25
-#: templates/ishtar/wizard/wizard_person_deletion.html:33
-#: templates/ishtar/wizard/wizard_person_deletion.html:41
-#: templates/ishtar/wizard/wizard_person_deletion.html:49
-#: templates/ishtar/wizard/wizard_person_deletion.html:57
-#: templates/ishtar/wizard/wizard_person_deletion.html:65
-#: templates/ishtar/wizard/wizard_person_deletion.html:73
-#: templates/ishtar/wizard/wizard_person_deletion.html:81
-#: templates/ishtar/wizard/wizard_person_deletion.html:98
-#: templates/ishtar/wizard/wizard_person_deletion.html:101
-#: templates/ishtar/wizard/wizard_person_deletion.html:111
-msgid "show"
-msgstr "voir"
-
#: templates/ishtar/wizard/wizard_organization_deletion.html:14
msgid "Associated archaeological files"
msgstr "Dossiers associés"