summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-15 17:39:14 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-15 17:39:14 +0200
commiteb61b763e5165694d2ee937664a671f2eb91b394 (patch)
treea4db2851c95e748ff2d5df56c1145586821dbeab
parentd01d5137aa184fa3e3294b71a61ae142524f2b38 (diff)
downloadIshtar-eb61b763e5165694d2ee937664a671f2eb91b394.tar.bz2
Ishtar-eb61b763e5165694d2ee937664a671f2eb91b394.zip
Update translation
-rw-r--r--archaeological_context_records/locale/django.pot56
-rw-r--r--archaeological_context_records/models.py24
-rw-r--r--archaeological_files/locale/django.pot92
-rw-r--r--archaeological_files/models.py38
-rw-r--r--archaeological_finds/locale/django.pot588
-rw-r--r--archaeological_finds/models_finds.py63
-rw-r--r--archaeological_finds/models_treatments.py31
-rw-r--r--archaeological_operations/locale/django.pot365
-rw-r--r--archaeological_operations/models.py168
-rw-r--r--archaeological_operations/tests.py11
-rw-r--r--archaeological_warehouse/locale/django.pot26
-rw-r--r--archaeological_warehouse/models.py14
-rw-r--r--ishtar_common/locale/django.pot96
-rw-r--r--ishtar_common/models.py48
-rw-r--r--ishtar_common/utils.py3
-rw-r--r--translations/de/ishtar_common.po83
-rw-r--r--translations/fr/archaeological_context_records.po57
-rw-r--r--translations/fr/archaeological_files.po92
-rw-r--r--translations/fr/archaeological_finds.po587
-rw-r--r--translations/fr/archaeological_operations.po363
-rw-r--r--translations/fr/archaeological_warehouse.po27
-rw-r--r--translations/fr/ishtar_common.po83
22 files changed, 2278 insertions, 637 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index 0326eadbf..b6d8256eb 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -14,7 +14,6 @@ msgid "Point"
msgstr ""
#: admin.py:51 models.py:377
-#| msgid "Polygon"
msgid "Multi polygon"
msgstr ""
@@ -368,6 +367,61 @@ msgstr ""
msgid "Parcel (year)"
msgstr ""
+#: models.py:262
+msgctxt "key for text search"
+msgid "id"
+msgstr ""
+
+#: models.py:266
+msgctxt "key for text search"
+msgid "town"
+msgstr ""
+
+#: models.py:270
+msgctxt "key for text search"
+msgid "operation-year"
+msgstr ""
+
+#: models.py:274
+msgctxt "key for text search"
+msgid "patriarche"
+msgstr ""
+
+#: models.py:278
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr ""
+
+#: models.py:282
+msgctxt "key for text search"
+msgid "site"
+msgstr ""
+
+#: models.py:286
+msgctxt "key for text search"
+msgid "operation-relation-type"
+msgstr ""
+
+#: models.py:290
+msgctxt "key for text search"
+msgid "period"
+msgstr ""
+
+#: models.py:294
+msgctxt "key for text search"
+msgid "unit-type"
+msgstr ""
+
+#: models.py:298
+msgctxt "key for text search"
+msgid "parcel"
+msgstr ""
+
+#: models.py:302
+msgctxt "key for text search"
+msgid "record-relation-type"
+msgstr ""
+
#: models.py:310
msgid "External ID"
msgstr ""
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 97bf2a117..7d266ccac 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -28,7 +28,7 @@ from django.db.models.signals import post_delete, post_save
from django.utils.translation import ugettext_lazy as _, pgettext, pgettext_lazy
from django.utils.text import slugify
-from ishtar_common.utils import cached_label_changed, TXT_SEARCH_COMMENT
+from ishtar_common.utils import cached_label_changed
from ishtar_common.models import Document, GeneralType, \
BaseHistorizedItem, HistoricalRecords, OwnPerms, ShortMenuItem, \
@@ -259,47 +259,47 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
# alternative names of fields for searches
ALT_NAMES = {
'label': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"id"),
+ pgettext_lazy("key for text search", u"id"),
'label'
),
'town': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"town"),
+ pgettext_lazy("key for text search", u"town"),
'town__cached_label__iexact'
),
'operation__year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-year"),
+ pgettext_lazy("key for text search", u"operation-year"),
'operation__year'
),
'operation__code_patriarche': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"patriarche"),
+ pgettext_lazy("key for text search", u"patriarche"),
'operation__code_patriarche'
),
'operation__operation_code': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-code"),
+ pgettext_lazy("key for text search", u"operation-code"),
'operation__operation_code'
),
'archaeological_site': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"site"),
+ pgettext_lazy("key for text search", u"site"),
'archaeological_site__cached_label__icontains'
),
'ope_relation_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-relation-type"),
+ pgettext_lazy("key for text search", u"operation-relation-type"),
'ope_relation_types'
),
'datings__period': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"period"),
+ pgettext_lazy("key for text search", u"period"),
'datings__period__label__iexact'
),
'unit': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"unit-type"),
+ pgettext_lazy("key for text search", u"unit-type"),
'unit__label__iexact'
),
'parcel': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"),
+ pgettext_lazy("key for text search", u"parcel"),
'parcel__cached_label__iexact'
),
'cr_relation_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"record-relation-type"),
+ pgettext_lazy("key for text search", u"record-relation-type"),
'cr_relation_types'
),
}
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index aaed2910a..007aea421 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -6,6 +6,7 @@
# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
+# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata
msgid ""
msgstr ""
@@ -27,7 +28,6 @@ msgid "Other reference"
msgstr ""
#: forms.py:61 forms.py:452
-#| msgid "Parcels"
msgid "Parcel"
msgstr ""
@@ -331,6 +331,96 @@ msgstr ""
msgid "Delay (in days)"
msgstr ""
+#: models.py:127
+msgctxt "key for text search"
+msgid "year"
+msgstr ""
+
+#: models.py:131
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models.py:135
+msgctxt "key for text search"
+msgid "other-reference"
+msgstr ""
+
+#: models.py:139
+msgctxt "key for text search"
+msgid "town"
+msgstr ""
+
+#: models.py:143
+msgctxt "key for text search"
+msgid "parcel"
+msgstr ""
+
+#: models.py:147
+msgctxt "key for text search"
+msgid "department"
+msgstr ""
+
+#: models.py:151
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:155
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
+#: models.py:159
+msgctxt "key for text search"
+msgid "active"
+msgstr ""
+
+#: models.py:163
+msgctxt "key for text search"
+msgid "saisine-type"
+msgstr ""
+
+#: models.py:167
+msgctxt "key for text search"
+msgid "permit-type"
+msgstr ""
+
+#: models.py:171
+msgctxt "key for text search"
+msgid "permit-reference"
+msgstr ""
+
+#: models.py:175
+msgctxt "key for text search"
+msgid "comment"
+msgstr ""
+
+#: models.py:179
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr ""
+
+#: models.py:183
+msgctxt "key for text search"
+msgid "general-contractor"
+msgstr ""
+
+#: models.py:188
+msgctxt "key for text search"
+msgid "general-contractor-organization"
+msgstr ""
+
+#: models.py:192
+msgctxt "key for text search"
+msgid "created-by"
+msgstr ""
+
+#: models.py:196
+msgctxt "key for text search"
+msgid "modified-by"
+msgstr ""
+
#: models.py:211
msgid "Internal reference"
msgstr ""
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index eb4e30bde..0e5948958 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -27,7 +27,7 @@ from django.db.models.signals import post_save, m2m_changed, post_delete
from django.utils.translation import ugettext_lazy as _, pgettext_lazy
from ishtar_common.utils import cached_label_changed, get_cache, \
- get_current_year, TXT_SEARCH_COMMENT
+ get_current_year
from ishtar_common.models import GeneralType, BaseHistorizedItem, \
HistoricalRecords, OwnPerms, Person, Organization, Department, Town, \
@@ -124,76 +124,76 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
# alternative names of fields for searches
ALT_NAMES = {
'year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'year'
),
'numeric_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"),
+ pgettext_lazy("key for text search", u"reference"),
'numeric_reference'
),
'internal_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"other-reference"),
+ pgettext_lazy("key for text search", u"other-reference"),
'internal_reference'
),
'towns': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"town"),
+ pgettext_lazy("key for text search", u"town"),
'towns__cached_label__iexact'
),
'parcel': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"),
+ pgettext_lazy("key for text search", u"parcel"),
'parcels__cached_label__iexact'
),
'towns__numero_insee__startswith': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"department"),
+ pgettext_lazy("key for text search", u"department"),
'towns__numero_insee__startswith'
),
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name__icontains'
),
'file_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'file_type__label__iexact'
),
'end_date': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"active"),
+ pgettext_lazy("key for text search", u"active"),
'end_date__isnull'
),
'saisine_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"saisine-type"),
+ pgettext_lazy("key for text search", u"saisine-type"),
'saisine_type__label__iexact'
),
'permit_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"permit-type"),
+ pgettext_lazy("key for text search", u"permit-type"),
'permit_type__label__iexact'
),
'permit_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"permit-reference"),
+ pgettext_lazy("key for text search", u"permit-reference"),
'permit_reference__iexact'
),
'comment': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"),
+ pgettext_lazy("key for text search", u"comment"),
'comment__icontains'
),
'in_charge': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"in-charge"),
+ pgettext_lazy("key for text search", u"in-charge"),
'in_charge__cached_label__iexact'
),
'general_contractor': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"general-contractor"),
+ pgettext_lazy("key for text search", u"general-contractor"),
'general_contractor__cached_label__iexact'
),
'general_contractor__attached_to': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"general-contractor-organization"),
'general_contractor__attached_to__cached_label__iexact'
),
'history_creator': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"created-by"),
+ pgettext_lazy("key for text search", u"created-by"),
'history_creator__ishtaruser__person__cached_label__iexact'
),
'history_modifier': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"modified-by"),
+ pgettext_lazy("key for text search", u"modified-by"),
'history_modifier__ishtaruser__person__cached_label__iexact'
),
}
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 62f08e861..63d0d1c18 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -9,21 +9,20 @@
msgid ""
msgstr ""
-#: admin.py:39 models_finds.py:286
+#: admin.py:39 models_finds.py:285
msgid "Point (2D)"
msgstr ""
-#: admin.py:41 models_finds.py:288
+#: admin.py:41 models_finds.py:287
msgid "Line"
msgstr ""
-#: admin.py:43 models_finds.py:289
-#| msgid "Polygon"
+#: admin.py:43 models_finds.py:288
msgid "Multi polygon"
msgstr ""
-#: forms.py:88 forms.py:94 forms.py:451 models_finds.py:620
-#: models_finds.py:1086 wizards.py:71
+#: forms.py:88 forms.py:94 forms.py:451 models_finds.py:619
+#: models_finds.py:1085 wizards.py:71
msgid "Context record"
msgstr ""
@@ -31,8 +30,8 @@ msgstr ""
msgid "Find - 010 - Context record choice"
msgstr ""
-#: forms.py:123 ishtar_menu.py:32 models_finds.py:987 models_finds.py:1580
-#: models_treatments.py:339 templates/ishtar/sheet_find.html:4
+#: forms.py:123 ishtar_menu.py:32 models_finds.py:986 models_finds.py:1579
+#: models_treatments.py:338 templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr ""
@@ -44,105 +43,105 @@ msgstr ""
msgid "Identification"
msgstr ""
-#: forms.py:142 forms.py:420 forms.py:702 models_finds.py:251
-#: models_finds.py:856 templates/ishtar/sheet_find.html:19
+#: forms.py:142 forms.py:420 forms.py:702 models_finds.py:250
+#: models_finds.py:855 templates/ishtar/sheet_find.html:19
msgid "Free ID"
msgstr ""
-#: forms.py:144 forms.py:421 models_finds.py:857
+#: forms.py:144 forms.py:421 models_finds.py:856
#: templates/ishtar/sheet_find.html:18
msgid "Denomination"
msgstr ""
-#: forms.py:145 models_finds.py:930
+#: forms.py:145 models_finds.py:929
msgid "Previous ID"
msgstr ""
-#: forms.py:147 models_finds.py:255
+#: forms.py:147 models_finds.py:254
msgid "Excavation ID"
msgstr ""
-#: forms.py:148 models_finds.py:858
+#: forms.py:148 models_finds.py:857
msgid "Museum ID"
msgstr ""
-#: forms.py:149 models_finds.py:853
+#: forms.py:149 models_finds.py:852
msgid "Seal number"
msgstr ""
-#: forms.py:150 models_finds.py:926
+#: forms.py:150 models_finds.py:925
msgid "Mark"
msgstr ""
#: forms.py:152 forms.py:153 forms.py:471 forms_treatments.py:139
-#: models_finds.py:256 models_finds.py:859 models_treatments.py:139
+#: models_finds.py:255 models_finds.py:858 models_treatments.py:138
#: templates/ishtar/sheet_find.html:134
msgid "Description"
msgstr ""
-#: forms.py:156 models_finds.py:263
+#: forms.py:156 models_finds.py:262
msgid "Discovery date (exact or TPQ)"
msgstr ""
-#: forms.py:159 models_finds.py:265 templates/ishtar/sheet_find.html:78
+#: forms.py:159 models_finds.py:264 templates/ishtar/sheet_find.html:78
msgid "Discovery date (TAQ)"
msgstr ""
-#: forms.py:161 forms.py:473 models_finds.py:267
+#: forms.py:161 forms.py:473 models_finds.py:266
msgid "Batch/object"
msgstr ""
-#: forms.py:163 models_finds.py:891
+#: forms.py:163 models_finds.py:890
msgid "Is complete?"
msgstr ""
-#: forms.py:166 models_finds.py:55 models_finds.py:643 models_finds.py:865
+#: forms.py:166 models_finds.py:54 models_finds.py:642 models_finds.py:864
msgid "Material types"
msgstr ""
-#: forms.py:169 models_finds.py:870
+#: forms.py:169 models_finds.py:869
msgid "Material type quality"
msgstr ""
-#: forms.py:171 models_finds.py:150 models_finds.py:644 models_finds.py:894
+#: forms.py:171 models_finds.py:149 models_finds.py:643 models_finds.py:893
msgid "Object types"
msgstr ""
-#: forms.py:174 models_finds.py:899
+#: forms.py:174 models_finds.py:898
msgid "Object type quality"
msgstr ""
-#: forms.py:175 forms.py:709 models_finds.py:877
+#: forms.py:175 forms.py:709 models_finds.py:876
msgid "Find number"
msgstr ""
-#: forms.py:177 models_finds.py:912
+#: forms.py:177 models_finds.py:911
msgid "Minimum number of individuals (MNI)"
msgstr ""
-#: forms.py:179 models_finds.py:860
+#: forms.py:179 models_finds.py:859
msgid "Decoration"
msgstr ""
-#: forms.py:181 models_finds.py:861
+#: forms.py:181 models_finds.py:860
msgid "Inscription"
msgstr ""
-#: forms.py:184 models_finds.py:863
+#: forms.py:184 models_finds.py:862
msgid "Manufacturing place"
msgstr ""
-#: forms.py:186 models_finds.py:909
+#: forms.py:186 models_finds.py:908
msgid "Communicability"
msgstr ""
#: forms.py:188 forms_treatments.py:141 forms_treatments.py:491
-#: models_finds.py:257 models_finds.py:927 models_treatments.py:138
-#: models_treatments.py:596
+#: models_finds.py:256 models_finds.py:926 models_treatments.py:137
+#: models_treatments.py:595
msgid "Comment"
msgstr ""
-#: forms.py:191 models_finds.py:928
+#: forms.py:191 models_finds.py:927
msgid "Comment on dating"
msgstr ""
@@ -150,27 +149,27 @@ msgstr ""
msgid "Dimensions"
msgstr ""
-#: forms.py:194 models_finds.py:913
+#: forms.py:194 models_finds.py:912
msgid "Length (cm)"
msgstr ""
-#: forms.py:195 models_finds.py:914
+#: forms.py:195 models_finds.py:913
msgid "Width (cm)"
msgstr ""
-#: forms.py:196 models_finds.py:915
+#: forms.py:196 models_finds.py:914
msgid "Height (cm)"
msgstr ""
-#: forms.py:197 models_finds.py:916
+#: forms.py:197 models_finds.py:915
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:198 models_finds.py:917
+#: forms.py:198 models_finds.py:916
msgid "Thickness (cm)"
msgstr ""
-#: forms.py:199 forms.py:707 models_finds.py:873
+#: forms.py:199 forms.py:707 models_finds.py:872
msgid "Volume (l)"
msgstr ""
@@ -190,7 +189,7 @@ msgstr ""
msgid "Clutter height (cm)"
msgstr ""
-#: forms.py:208 models_finds.py:924
+#: forms.py:208 models_finds.py:923
msgid "Dimensions comment"
msgstr ""
@@ -199,35 +198,35 @@ msgstr ""
msgid "Coordinates"
msgstr ""
-#: forms.py:213 models_finds.py:272
+#: forms.py:213 models_finds.py:271
msgid "Point of topographic reference"
msgstr ""
-#: forms.py:216 models_finds.py:274
+#: forms.py:216 models_finds.py:273
msgid "X"
msgstr ""
-#: forms.py:217 models_finds.py:275
+#: forms.py:217 models_finds.py:274
msgid "Y"
msgstr ""
-#: forms.py:218 models_finds.py:276
+#: forms.py:218 models_finds.py:275
msgid "Z"
msgstr ""
-#: forms.py:220 models_finds.py:284
+#: forms.py:220 models_finds.py:283
msgid "Spatial Reference System"
msgstr ""
-#: forms.py:223 models_finds.py:277
+#: forms.py:223 models_finds.py:276
msgid "Estimated error for X"
msgstr ""
-#: forms.py:225 models_finds.py:279
+#: forms.py:225 models_finds.py:278
msgid "Estimated error for Y"
msgstr ""
-#: forms.py:227 models_finds.py:281
+#: forms.py:227 models_finds.py:280
msgid "Estimated error for Z"
msgstr ""
@@ -235,11 +234,11 @@ msgstr ""
msgid "Sheet"
msgstr ""
-#: forms.py:230 forms.py:474 models_finds.py:932
+#: forms.py:230 forms.py:474 models_finds.py:931
msgid "Check"
msgstr ""
-#: forms.py:232 models_finds.py:934
+#: forms.py:232 models_finds.py:933
msgid "Check date"
msgstr ""
@@ -273,51 +272,51 @@ msgstr ""
msgid "Find - 030 - Preservation"
msgstr ""
-#: forms.py:333 forms.py:467 models_finds.py:903
+#: forms.py:333 forms.py:467 models_finds.py:902
msgid "Integrity / interest"
msgstr ""
-#: forms.py:336 forms.py:469 models_finds.py:906
+#: forms.py:336 forms.py:469 models_finds.py:905
msgid "Remarkability"
msgstr ""
-#: forms.py:338 forms.py:465 models_finds.py:78 models_finds.py:944
+#: forms.py:338 forms.py:465 models_finds.py:77 models_finds.py:943
msgid "Conservatory state"
msgstr ""
-#: forms.py:341 models_finds.py:953
+#: forms.py:341 models_finds.py:952
msgid "Alteration"
msgstr ""
-#: forms.py:344 models_finds.py:957
+#: forms.py:344 models_finds.py:956
msgid "Alteration cause"
msgstr ""
-#: forms.py:347 models_finds.py:950
+#: forms.py:347 models_finds.py:949
msgid "Recommended treatments"
msgstr ""
-#: forms.py:349 models_finds.py:961
+#: forms.py:349 models_finds.py:960
msgid "Treatment emergency"
msgstr ""
-#: forms.py:351 models_finds.py:936
+#: forms.py:351 models_finds.py:935
msgid "Estimated value"
msgstr ""
-#: forms.py:352 models_finds.py:964
+#: forms.py:352 models_finds.py:963
msgid "Insurance value"
msgstr ""
-#: forms.py:354 models_finds.py:966
+#: forms.py:354 models_finds.py:965
msgid "Appraisal date"
msgstr ""
-#: forms.py:356 models_finds.py:946
+#: forms.py:356 models_finds.py:945
msgid "Conservatory comment"
msgstr ""
-#: forms.py:380 forms.py:404 models_finds.py:885
+#: forms.py:380 forms.py:404 models_finds.py:884
#: templates/ishtar/sheet_find.html:199
msgid "Dating"
msgstr ""
@@ -327,13 +326,13 @@ msgid "Period"
msgstr ""
#: forms.py:386 forms_treatments.py:143 forms_treatments.py:284
-#: forms_treatments.py:493 models_finds.py:1585 models_treatments.py:141
-#: models_treatments.py:350 templates/ishtar/sheet_find.html:232
+#: forms_treatments.py:493 models_finds.py:1584 models_treatments.py:140
+#: models_treatments.py:349 templates/ishtar/sheet_find.html:232
#: templates/ishtar/sheet_find.html:270
msgid "Start date"
msgstr ""
-#: forms.py:388 models_finds.py:1586 models_treatments.py:351
+#: forms.py:388 models_finds.py:1585 models_treatments.py:350
#: templates/ishtar/sheet_find.html:233 templates/ishtar/sheet_find.html:271
msgid "End date"
msgstr ""
@@ -363,17 +362,17 @@ msgstr ""
msgid "Full text search"
msgstr ""
-#: forms.py:418 models_finds.py:292
+#: forms.py:418 models_finds.py:291
msgid "Short ID"
msgstr ""
-#: forms.py:419 models_finds.py:295
+#: forms.py:419 models_finds.py:294
msgid "Complete ID"
msgstr ""
#: forms.py:424 forms_treatments.py:56 forms_treatments.py:101
#: forms_treatments.py:336 forms_treatments.py:411 forms_treatments.py:463
-#: forms_treatments.py:601 models_treatments.py:115 models_treatments.py:569
+#: forms_treatments.py:601 models_treatments.py:114 models_treatments.py:568
msgid "Year"
msgstr ""
@@ -409,11 +408,11 @@ msgstr ""
msgid "Search within related context records"
msgstr ""
-#: forms.py:461 forms.py:706 models_finds.py:54
+#: forms.py:461 forms.py:706 models_finds.py:53
msgid "Material type"
msgstr ""
-#: forms.py:462 models_finds.py:149
+#: forms.py:462 models_finds.py:148
msgid "Object type"
msgstr ""
@@ -445,12 +444,12 @@ msgstr ""
msgid "Find search"
msgstr ""
-#: forms.py:582 models_treatments.py:248
+#: forms.py:582 models_treatments.py:247
#: templates/ishtar/sheet_treatment.html:56
msgid "Upstream finds"
msgstr ""
-#: forms.py:584 models_finds.py:988
+#: forms.py:584 models_finds.py:987
msgid "Finds"
msgstr ""
@@ -474,7 +473,7 @@ msgstr ""
msgid "Would you like to delete this find?"
msgstr ""
-#: forms.py:727 models_treatments.py:67
+#: forms.py:727 models_treatments.py:66
msgid "Upstream find"
msgstr ""
@@ -486,25 +485,25 @@ msgstr ""
msgid "Basket"
msgstr ""
-#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:111
+#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:110
#: templates/ishtar/sheet_find.html:226 templates/ishtar/sheet_find.html:264
msgid "Label"
msgstr ""
-#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:113
+#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:112
msgid "Other ref."
msgstr ""
#: forms_treatments.py:57 forms_treatments.py:232 forms_treatments.py:337
#: forms_treatments.py:399 forms_treatments.py:412 forms_treatments.py:516
-#: forms_treatments.py:602 forms_treatments.py:669 models_treatments.py:116
-#: models_treatments.py:570
+#: forms_treatments.py:602 forms_treatments.py:669 models_treatments.py:115
+#: models_treatments.py:569
msgid "Index"
msgstr ""
#: forms_treatments.py:58 forms_treatments.py:106 forms_treatments.py:292
-#: forms_treatments.py:353 models_finds.py:104 models_treatments.py:121
-#: models_treatments.py:349
+#: forms_treatments.py:353 models_finds.py:103 models_treatments.py:120
+#: models_treatments.py:348
msgid "Treatment type"
msgstr ""
@@ -520,7 +519,7 @@ msgstr ""
msgid "Treatment - 020 - General"
msgstr ""
-#: forms_treatments.py:108 models_treatments.py:69 models_treatments.py:123
+#: forms_treatments.py:108 models_treatments.py:68 models_treatments.py:122
#: templates/ishtar/sheet_find.html:228 templates/ishtar/sheet_find.html:266
msgid "State"
msgstr ""
@@ -529,15 +528,15 @@ msgstr ""
msgid "Target"
msgstr ""
-#: forms_treatments.py:112 forms_treatments.py:474 models_treatments.py:131
+#: forms_treatments.py:112 forms_treatments.py:474 models_treatments.py:130
msgid "Responsible"
msgstr ""
-#: forms_treatments.py:118 models_treatments.py:134
+#: forms_treatments.py:118 models_treatments.py:133
msgid "Organization"
msgstr ""
-#: forms_treatments.py:124 models_treatments.py:126 models_treatments.py:352
+#: forms_treatments.py:124 models_treatments.py:125 models_treatments.py:351
msgid "Location"
msgstr ""
@@ -549,12 +548,12 @@ msgstr ""
msgid "External ref."
msgstr ""
-#: forms_treatments.py:137 models_treatments.py:140
+#: forms_treatments.py:137 models_treatments.py:139
msgid "Goal"
msgstr ""
#: forms_treatments.py:145 forms_treatments.py:284 forms_treatments.py:499
-#: forms_treatments.py:551 models_treatments.py:142 models_treatments.py:590
+#: forms_treatments.py:551 models_treatments.py:141 models_treatments.py:589
msgid "Closing date"
msgstr ""
@@ -600,7 +599,7 @@ msgstr ""
msgid "Another treatment with this index exists for {}."
msgstr ""
-#: forms_treatments.py:262 models_treatments.py:119
+#: forms_treatments.py:262 models_treatments.py:118
msgid "Associated request"
msgstr ""
@@ -609,7 +608,7 @@ msgid "Treatment - 010 - Request choice"
msgstr ""
#: forms_treatments.py:268 forms_treatments.py:454 ishtar_menu.py:84
-#: models_treatments.py:605 models_treatments.py:633
+#: models_treatments.py:604 models_treatments.py:632
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:195
msgid "Treatment request"
msgstr ""
@@ -693,7 +692,7 @@ msgstr ""
msgid "Treatment - Administrative act - General"
msgstr ""
-#: forms_treatments.py:409 forms_treatments.py:461 models_treatments.py:575
+#: forms_treatments.py:409 forms_treatments.py:461 models_treatments.py:574
msgid "Name"
msgstr ""
@@ -701,7 +700,7 @@ msgstr ""
msgid "Internal ref."
msgstr ""
-#: forms_treatments.py:413 forms_treatments.py:472 models_treatments.py:68
+#: forms_treatments.py:413 forms_treatments.py:472 models_treatments.py:67
#: templates/ishtar/sheet_find.html:227 templates/ishtar/sheet_find.html:265
msgid "Type"
msgstr ""
@@ -710,12 +709,12 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms_treatments.py:422 forms_treatments.py:480 models_treatments.py:584
+#: forms_treatments.py:422 forms_treatments.py:480 models_treatments.py:583
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Applicant"
msgstr ""
-#: forms_treatments.py:428 forms_treatments.py:486 models_treatments.py:588
+#: forms_treatments.py:428 forms_treatments.py:486 models_treatments.py:587
#: templates/ishtar/sheet_treatmentfile.html:53
msgid "Applicant organisation"
msgstr ""
@@ -724,7 +723,7 @@ msgstr ""
msgid "Treatment request search"
msgstr ""
-#: forms_treatments.py:497 forms_treatments.py:550 models_treatments.py:594
+#: forms_treatments.py:497 forms_treatments.py:550 models_treatments.py:593
msgid "Reception date"
msgstr ""
@@ -740,12 +739,12 @@ msgstr ""
msgid "Would you like to delete this treatment request?"
msgstr ""
-#: forms_treatments.py:549 models_treatments.py:592
+#: forms_treatments.py:549 models_treatments.py:591
msgid "Creation date"
msgstr ""
-#: forms_treatments.py:559 forms_treatments.py:622 models_treatments.py:509
-#: models_treatments.py:577
+#: forms_treatments.py:559 forms_treatments.py:622 models_treatments.py:508
+#: models_treatments.py:576
msgid "Treatment request type"
msgstr ""
@@ -793,16 +792,16 @@ msgstr ""
msgid "Manage items"
msgstr ""
-#: ishtar_menu.py:109 ishtar_menu.py:165 models_finds.py:1582
+#: ishtar_menu.py:109 ishtar_menu.py:165 models_finds.py:1581
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:127 ishtar_menu.py:184 models_finds.py:969
-#: models_treatments.py:156 models_treatments.py:598
+#: ishtar_menu.py:127 ishtar_menu.py:184 models_finds.py:968
+#: models_treatments.py:155 models_treatments.py:597
msgid "Documents"
msgstr ""
-#: ishtar_menu.py:136 models_treatments.py:163 models_treatments.py:341
+#: ishtar_menu.py:136 models_treatments.py:162 models_treatments.py:340
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr ""
@@ -811,380 +810,573 @@ msgstr ""
msgid "Simple treatments"
msgstr ""
-#: models_finds.py:49
+#: models_finds.py:48
msgid "Code"
msgstr ""
-#: models_finds.py:50
+#: models_finds.py:49
msgid "Recommendation"
msgstr ""
-#: models_finds.py:64 models_finds.py:88 models_finds.py:136
-#: models_finds.py:159 models_finds.py:216 models_finds.py:855
-#: models_treatments.py:345
+#: models_finds.py:63 models_finds.py:87 models_finds.py:135
+#: models_finds.py:158 models_finds.py:215 models_finds.py:854
+#: models_treatments.py:344
msgid "Order"
msgstr ""
-#: models_finds.py:67
+#: models_finds.py:66
msgid "Material type quality type"
msgstr ""
-#: models_finds.py:68
+#: models_finds.py:67
msgid "Material type quality types"
msgstr ""
-#: models_finds.py:79
+#: models_finds.py:78
msgid "Conservatory states"
msgstr ""
-#: models_finds.py:89
+#: models_finds.py:88
msgid "Parent type"
msgstr ""
-#: models_finds.py:91
+#: models_finds.py:90
msgid "Virtual"
msgstr ""
-#: models_finds.py:93
+#: models_finds.py:92
msgid "Upstream is many"
msgstr ""
-#: models_finds.py:95
+#: models_finds.py:94
msgid "Check this if for this treatment from many finds you'll get one."
msgstr ""
-#: models_finds.py:98
+#: models_finds.py:97
msgid "Downstream is many"
msgstr ""
-#: models_finds.py:100
+#: models_finds.py:99
msgid "Check this if for this treatment from one find you'll get many."
msgstr ""
-#: models_finds.py:105 models_treatments.py:230
+#: models_finds.py:104 models_treatments.py:229
msgid "Treatment types"
msgstr ""
-#: models_finds.py:115
+#: models_finds.py:114
msgid "Integrity / interest type"
msgstr ""
-#: models_finds.py:116
+#: models_finds.py:115
msgid "Integrity / interest types"
msgstr ""
-#: models_finds.py:126
+#: models_finds.py:125
msgid "Remarkability type"
msgstr ""
-#: models_finds.py:127
+#: models_finds.py:126
msgid "Remarkability types"
msgstr ""
-#: models_finds.py:138
+#: models_finds.py:137
msgid "Batch type"
msgstr ""
-#: models_finds.py:139
+#: models_finds.py:138
msgid "Batch types"
msgstr ""
-#: models_finds.py:162
+#: models_finds.py:161
msgid "Object type quality type"
msgstr ""
-#: models_finds.py:163
+#: models_finds.py:162
msgid "Object type quality types"
msgstr ""
-#: models_finds.py:173
+#: models_finds.py:172
msgid "Alteration type"
msgstr ""
-#: models_finds.py:174
+#: models_finds.py:173
msgid "Alteration types"
msgstr ""
-#: models_finds.py:184
+#: models_finds.py:183
msgid "Alteration cause type"
msgstr ""
-#: models_finds.py:185
+#: models_finds.py:184
msgid "Alteration cause types"
msgstr ""
-#: models_finds.py:195
+#: models_finds.py:194
msgid "Treatment emergency type"
msgstr ""
-#: models_finds.py:196
+#: models_finds.py:195
msgid "Treatment emergency types"
msgstr ""
-#: models_finds.py:206
+#: models_finds.py:205
msgid "Communicability type"
msgstr ""
-#: models_finds.py:207
+#: models_finds.py:206
msgid "Communicability types"
msgstr ""
-#: models_finds.py:219
-#| msgid "Checked"
+#: models_finds.py:218
msgid "Checked type"
msgstr ""
-#: models_finds.py:220
-#| msgid "Checked"
+#: models_finds.py:219
msgid "Checked types"
msgstr ""
-#: models_finds.py:252 models_finds.py:848 models_treatments.py:136
-#: models_treatments.py:573
+#: models_finds.py:251 models_finds.py:847 models_treatments.py:135
+#: models_treatments.py:572
msgid "External ID"
msgstr ""
-#: models_finds.py:254 models_finds.py:850
+#: models_finds.py:253 models_finds.py:849
msgid "External ID is set automatically"
msgstr ""
-#: models_finds.py:258
+#: models_finds.py:257
msgid "Special interest"
msgstr ""
-#: models_finds.py:262
+#: models_finds.py:261
msgid "Context Record"
msgstr ""
-#: models_finds.py:270
+#: models_finds.py:269
msgid "Material index"
msgstr ""
-#: models_finds.py:287
+#: models_finds.py:286
msgid "Point (3D)"
msgstr ""
-#: models_finds.py:293 models_finds.py:296
+#: models_finds.py:292 models_finds.py:295
msgid "Cached value - do not edit"
msgstr ""
-#: models_finds.py:305 models_finds.py:846
+#: models_finds.py:304 models_finds.py:845
msgid "Base find"
msgstr ""
-#: models_finds.py:306
+#: models_finds.py:305
msgid "Base finds"
msgstr ""
-#: models_finds.py:550
+#: models_finds.py:549
msgid "g"
msgstr ""
-#: models_finds.py:551
+#: models_finds.py:550
msgid "kg"
msgstr ""
-#: models_finds.py:621 templates/ishtar/sheet_find.html:21
+#: models_finds.py:620 templates/ishtar/sheet_find.html:21
msgid "Base find - Short ID"
msgstr ""
-#: models_finds.py:622 templates/ishtar/sheet_find.html:20
+#: models_finds.py:621 templates/ishtar/sheet_find.html:20
msgid "Base find - Complete ID"
msgstr ""
-#: models_finds.py:624
+#: models_finds.py:623
msgid "Operation (code)"
msgstr ""
-#: models_finds.py:626
+#: models_finds.py:625
msgid "Town"
msgstr ""
-#: models_finds.py:628
+#: models_finds.py:627
msgid "Operation (name)"
msgstr ""
-#: models_finds.py:630
+#: models_finds.py:629
msgid "Parcel"
msgstr ""
-#: models_finds.py:631
+#: models_finds.py:630
msgid "Batch"
msgstr ""
-#: models_finds.py:632
+#: models_finds.py:631
msgid "Base find - Comment"
msgstr ""
-#: models_finds.py:633
+#: models_finds.py:632
msgid "Base find - Description"
msgstr ""
-#: models_finds.py:634
+#: models_finds.py:633
msgid "Base find - Topographic localisation"
msgstr ""
-#: models_finds.py:636
+#: models_finds.py:635
msgid "Base find - Special interest"
msgstr ""
-#: models_finds.py:638
+#: models_finds.py:637
msgid "Base find - Discovery date (exact or TPQ)"
msgstr ""
-#: models_finds.py:640
+#: models_finds.py:639
msgid "Base find - Discovery date (TAQ)"
msgstr ""
-#: models_finds.py:641 models_finds.py:888 models_treatments.py:143
-#: models_treatments.py:353 templates/ishtar/sheet_find.html:231
+#: models_finds.py:640 models_finds.py:887 models_treatments.py:142
+#: models_treatments.py:352 templates/ishtar/sheet_find.html:231
#: templates/ishtar/sheet_find.html:269
msgid "Container"
msgstr ""
-#: models_finds.py:642
+#: models_finds.py:641
msgid "Periods"
msgstr ""
-#: models_finds.py:874
+#: models_finds.py:718
+msgctxt "key for text search"
+msgid "short-id"
+msgstr ""
+
+#: models_finds.py:722
+msgctxt "key for text search"
+msgid "complete-id"
+msgstr ""
+
+#: models_finds.py:726
+msgctxt "key for text search"
+msgid "free-id"
+msgstr ""
+
+#: models_finds.py:730
+msgctxt "key for text search"
+msgid "denomination"
+msgstr ""
+
+#: models_finds.py:734
+msgctxt "key for text search"
+msgid "town"
+msgstr ""
+
+#: models_finds.py:738 models_treatments.py:84 models_treatments.py:540
+msgctxt "key for text search"
+msgid "year"
+msgstr ""
+
+#: models_finds.py:742
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr ""
+
+#: models_finds.py:746
+msgctxt "key for text search"
+msgid "code-patriarche"
+msgstr ""
+
+#: models_finds.py:750
+msgctxt "key for text search"
+msgid "operation-type"
+msgstr ""
+
+#: models_finds.py:755
+msgctxt "key for text search"
+msgid "area"
+msgstr ""
+
+#: models_finds.py:759
+msgctxt "key for text search"
+msgid "site"
+msgstr ""
+
+#: models_finds.py:764
+msgctxt "key for text search"
+msgid "context-record-site"
+msgstr ""
+
+#: models_finds.py:769
+msgctxt "key for text search"
+msgid "context-record"
+msgstr ""
+
+#: models_finds.py:773
+msgctxt "key for text search"
+msgid "operation-relation-type"
+msgstr ""
+
+#: models_finds.py:777
+msgctxt "key for text search"
+msgid "context-record-relation-type"
+msgstr ""
+
+#: models_finds.py:781
+msgctxt "key for text search"
+msgid "period"
+msgstr ""
+
+#: models_finds.py:785
+msgctxt "key for text search"
+msgid "material"
+msgstr ""
+
+#: models_finds.py:789
+msgctxt "key for text search"
+msgid "object-type"
+msgstr ""
+
+#: models_finds.py:793
+msgctxt "key for text search"
+msgid "preservation"
+msgstr ""
+
+#: models_finds.py:797
+msgctxt "key for text search"
+msgid "conservatory"
+msgstr ""
+
+#: models_finds.py:801
+msgctxt "key for text search"
+msgid "integrity"
+msgstr ""
+
+#: models_finds.py:805
+msgctxt "key for text search"
+msgid "remarkability"
+msgstr ""
+
+#: models_finds.py:809
+msgctxt "key for text search"
+msgid "description"
+msgstr ""
+
+#: models_finds.py:813
+msgctxt "key for text search"
+msgid "batch"
+msgstr ""
+
+#: models_finds.py:817
+msgctxt "key for text search"
+msgid "checked"
+msgstr ""
+
+#: models_finds.py:821 models_treatments.py:92
+msgctxt "key for text search"
+msgid "has-image"
+msgstr ""
+
+#: models_finds.py:825
+msgctxt "key for text search"
+msgid "location"
+msgstr ""
+
+#: models_finds.py:829
+msgctxt "key for text search"
+msgid "warehouse"
+msgstr ""
+
+#: models_finds.py:833
+msgctxt "key for text search"
+msgid "container-index"
+msgstr ""
+
+#: models_finds.py:837
+msgctxt "key for text search"
+msgid "container-ref"
+msgstr ""
+
+#: models_finds.py:873
msgid "Weight"
msgstr ""
-#: models_finds.py:875
+#: models_finds.py:874
msgid "Weight unit"
msgstr ""
-#: models_finds.py:881 templates/ishtar/sheet_find.html:221
+#: models_finds.py:880 templates/ishtar/sheet_find.html:221
msgid "Upstream treatment"
msgstr ""
-#: models_finds.py:884 templates/ishtar/sheet_find.html:259
+#: models_finds.py:883 templates/ishtar/sheet_find.html:259
msgid "Downstream treatment"
msgstr ""
-#: models_finds.py:919
+#: models_finds.py:918
msgid "Clutter - long side (cm)"
msgstr ""
-#: models_finds.py:921
+#: models_finds.py:920
msgid "Clutter - short side (cm)"
msgstr ""
-#: models_finds.py:923
+#: models_finds.py:922
msgid "Clutter - height (cm)"
msgstr ""
-#: models_finds.py:939
+#: models_finds.py:938
msgid "Collection"
msgstr ""
-#: models_finds.py:971 models_treatments.py:158 models_treatments.py:600
+#: models_finds.py:970 models_treatments.py:157 models_treatments.py:599
msgid "Cached name"
msgstr ""
-#: models_finds.py:1000
+#: models_finds.py:999
msgid "FIND"
msgstr ""
-#: models_finds.py:1095 wizards.py:70 wizards.py:207
+#: models_finds.py:1094 wizards.py:70 wizards.py:207
msgid "Operation"
msgstr ""
-#: models_finds.py:1407
+#: models_finds.py:1406
msgid "No container have been set - the localisation cannot be set."
msgstr ""
-#: models_finds.py:1413
+#: models_finds.py:1412
msgid "The division number {} have not been set for the warehouse {}."
msgstr ""
-#: models_finds.py:1583
+#: models_finds.py:1582
msgid "Person"
msgstr ""
-#: models_finds.py:1589
+#: models_finds.py:1588
msgid "Property"
msgstr ""
-#: models_finds.py:1590
+#: models_finds.py:1589
msgid "Properties"
msgstr ""
-#: models_treatments.py:42
+#: models_treatments.py:41
msgid "Treatment state type"
msgstr ""
-#: models_treatments.py:43
+#: models_treatments.py:42
msgid "Treatment state types"
msgstr ""
-#: models_treatments.py:66
+#: models_treatments.py:65
msgid "Downstream find"
msgstr ""
-#: models_treatments.py:128
+#: models_treatments.py:76
+msgctxt "key for text search"
+msgid "label"
+msgstr ""
+
+#: models_treatments.py:80
+msgctxt "key for text search"
+msgid "other-reference"
+msgstr ""
+
+#: models_treatments.py:88 models_treatments.py:544
+msgctxt "key for text search"
+msgid "index"
+msgstr ""
+
+#: models_treatments.py:96 models_treatments.py:548
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
+#: models_treatments.py:127
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-#: models_treatments.py:145
+#: models_treatments.py:144
msgid "Estimated cost"
msgstr ""
-#: models_treatments.py:147
+#: models_treatments.py:146
msgid "Quoted cost"
msgstr ""
-#: models_treatments.py:149
+#: models_treatments.py:148
msgid "Realized cost"
msgstr ""
-#: models_treatments.py:151
+#: models_treatments.py:150
msgid "Insurance cost"
msgstr ""
-#: models_treatments.py:153
+#: models_treatments.py:152
msgid "Target a basket"
msgstr ""
-#: models_treatments.py:164 templates/ishtar/sheet_find.html:218
+#: models_treatments.py:163 templates/ishtar/sheet_find.html:218
#: templates/ishtar/sheet_treatmentfile.html:61
msgid "Treatments"
msgstr ""
-#: models_treatments.py:183
+#: models_treatments.py:182
msgid "TREATMENT"
msgstr ""
-#: models_treatments.py:239 templates/ishtar/sheet_treatment.html:61
+#: models_treatments.py:238 templates/ishtar/sheet_treatment.html:61
msgid "Downstream finds"
msgstr ""
-#: models_treatments.py:354 templates/ishtar/sheet_find.html:230
+#: models_treatments.py:353 templates/ishtar/sheet_find.html:230
#: templates/ishtar/sheet_find.html:268
msgid "Doer"
msgstr ""
-#: models_treatments.py:355 models_treatments.py:356
+#: models_treatments.py:354 models_treatments.py:355
msgid "Related finds"
msgstr ""
-#: models_treatments.py:498
+#: models_treatments.py:497
msgid "Is upstream"
msgstr ""
-#: models_treatments.py:510
+#: models_treatments.py:509
msgid "Treatment request types"
msgstr ""
-#: models_treatments.py:571
+#: models_treatments.py:532
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models_treatments.py:536
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models_treatments.py:552
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr ""
+
+#: models_treatments.py:556
+msgctxt "key for text search"
+msgid "applicant"
+msgstr ""
+
+#: models_treatments.py:560
+msgctxt "key for text search"
+msgid "applicant-organisation"
+msgstr ""
+
+#: models_treatments.py:570
msgid "Internal reference"
msgstr ""
-#: models_treatments.py:580
+#: models_treatments.py:579
msgid "Person in charge"
msgstr ""
-#: models_treatments.py:606
+#: models_treatments.py:605
msgid "Treatment requests"
msgstr ""
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 465d57f3a..889138c7f 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -30,8 +30,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.utils.translation import ugettext_lazy as _, pgettext_lazy
from ishtar_common.data_importer import post_importer_action, ImporterError
-from ishtar_common.utils import cached_label_changed, post_save_point, \
- TXT_SEARCH_COMMENT
+from ishtar_common.utils import cached_label_changed, post_save_point
from ishtar_common.models import Document, GeneralType, \
HierarchicalType, BaseHistorizedItem, ShortMenuItem, LightHistorizedItem, \
@@ -716,126 +715,126 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
# alternative names of fields for searches
ALT_NAMES = {
'base_finds__cache_short_id': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"short-id"),
+ pgettext_lazy("key for text search", u"short-id"),
'base_finds__cache_short_id__contains'
),
'base_finds__cache_complete_id': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"complete-id"),
+ pgettext_lazy("key for text search", u"complete-id"),
'base_finds__cache_complete_id__icontains'
),
'label': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"free-id"),
+ pgettext_lazy("key for text search", u"free-id"),
'label__icontains'
),
'denomination': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"denomination"),
+ pgettext_lazy("key for text search", u"denomination"),
'denomination__icontains'
),
'base_finds__context_record__town': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"town"),
+ pgettext_lazy("key for text search", u"town"),
'base_finds__context_record__town__cached_label__iexact'
),
'base_finds__context_record__operation__year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'base_finds__context_record__operation__year'
),
'base_finds__context_record__operation__operation_code': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-code"),
+ pgettext_lazy("key for text search", u"operation-code"),
'base_finds__context_record__operation__operation_code'
),
'base_finds__context_record__operation__code_patriarche': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"code-patriarche"),
+ pgettext_lazy("key for text search", u"code-patriarche"),
'base_finds__context_record__operation__code_patriarche'
),
'base_finds__context_record__operation__operation_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-type"),
+ pgettext_lazy("key for text search", u"operation-type"),
'base_finds__context_record__operation__operation_type'
'__label__iexact'
),
'base_finds__context_record__town__areas': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"area"),
+ pgettext_lazy("key for text search", u"area"),
'base_finds__context_record__town__areas__label__iexact',
),
'archaeological_sites': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"site"),
+ pgettext_lazy("key for text search", u"site"),
'base_finds__context_record__operation__archaeological_sites__'
'cached_label__icontains',
),
'archaeological_sites_context_record': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"context-record-site"),
+ pgettext_lazy("key for text search", u"context-record-site"),
'base_finds__context_record__archaeological_site__'
'cached_label__icontains',
),
'base_finds__context_record': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"context-record"),
+ pgettext_lazy("key for text search", u"context-record"),
'base_finds__context_record__cached_label__icontains',
),
'ope_relation_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-relation-type"),
+ pgettext_lazy("key for text search", u"operation-relation-type"),
'ope_relation_types'
),
'cr_relation_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"context-record-relation-type"),
+ pgettext_lazy("key for text search", u"context-record-relation-type"),
'cr_relation_types'
),
'datings__period': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"period"),
+ pgettext_lazy("key for text search", u"period"),
'datings__period__label__iexact',
),
'material_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"material"),
+ pgettext_lazy("key for text search", u"material"),
'material_types__label__iexact',
),
'object_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"object-type"),
+ pgettext_lazy("key for text search", u"object-type"),
'object_types__label__iexact',
),
'preservation_to_considers': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"preservation"),
+ pgettext_lazy("key for text search", u"preservation"),
'preservation_to_considers__label__iexact',
),
'conservatory_state': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"conservatory"),
+ pgettext_lazy("key for text search", u"conservatory"),
'conservatory_state__label__iexact',
),
'integrities': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"integrity"),
+ pgettext_lazy("key for text search", u"integrity"),
'integrities__label__iexact',
),
'remarkabilities': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"remarkability"),
+ pgettext_lazy("key for text search", u"remarkability"),
'remarkabilities__label__iexact',
),
'base_finds__find__description': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"description"),
+ pgettext_lazy("key for text search", u"description"),
'base_finds__find__description__icontains',
),
'base_finds__batch': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"batch"),
+ pgettext_lazy("key for text search", u"batch"),
'base_finds__batch__label__iexact',
),
'checked_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"checked"),
+ pgettext_lazy("key for text search", u"checked"),
'checked_type__label__iexact',
),
'documents__image__isnull': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"has-image"),
+ pgettext_lazy("key for text search", u"has-image"),
'documents__image__isnull',
),
'container__location': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"location"),
+ pgettext_lazy("key for text search", u"location"),
'container__location__name__iexact',
),
'container__responsible': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"warehouse"),
+ pgettext_lazy("key for text search", u"warehouse"),
'container__responsible__name__iexact',
),
'container__index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"container-index"),
+ pgettext_lazy("key for text search", u"container-index"),
'container__index',
),
'container__reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"container-ref"),
+ pgettext_lazy("key for text search", u"container-ref"),
'container__reference__iexact',
),
}
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 68a6ebb13..4549fdc69 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -33,8 +33,7 @@ from ishtar_common.models import Document, GeneralType, \
ImageModel, BaseHistorizedItem, OwnPerms, HistoricalRecords, Person, \
Organization, ValueGetter, post_save_cache, ShortMenuItem, \
DashboardFormItem
-from ishtar_common.utils import cached_label_changed, get_current_year, \
- TXT_SEARCH_COMMENT
+from ishtar_common.utils import cached_label_changed, get_current_year
class TreatmentState(GeneralType):
@@ -74,27 +73,27 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
# alternative names of fields for searches
ALT_NAMES = {
'label': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"label"),
+ pgettext_lazy("key for text search", u"label"),
'label__icontains'
),
'other_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"other-reference"),
+ pgettext_lazy("key for text search", u"other-reference"),
'other_reference__icontains'
),
'year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'year'
),
'index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"index"),
+ pgettext_lazy("key for text search", u"index"),
'index'
),
'documents__image__isnull': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"has-image"),
+ pgettext_lazy("key for text search", u"has-image"),
'documents__image__isnull'
),
'treatment_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'treatment_types__label__iexact'
),
}
@@ -530,35 +529,35 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem,
# alternative names of fields for searches
ALT_NAMES = {
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name__icontains'
),
'internal_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"),
+ pgettext_lazy("key for text search", u"reference"),
'internal_reference__icontains'
),
'year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'year'
),
'index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"index"),
+ pgettext_lazy("key for text search", u"index"),
'index'
),
'type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'type__label__iexact'
),
'in_charge': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"in-charge"),
+ pgettext_lazy("key for text search", u"in-charge"),
'in_charge__cached_label__iexact'
),
'applicant': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"applicant"),
+ pgettext_lazy("key for text search", u"applicant"),
'applicant__cached_label__iexact'
),
'applicant_organisation': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"applicant-organisation"),
+ pgettext_lazy("key for text search", u"applicant-organisation"),
'applicant_organisation__cached_label__iexact'
),
}
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 477245316..4ab3f237f 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -5,6 +5,7 @@
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
+# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata
msgid ""
msgstr ""
@@ -756,15 +757,78 @@ msgid "Types of report state"
msgstr ""
#: models.py:91
-#| msgid "Record quality"
msgid "Type of record quality"
msgstr ""
#: models.py:92
-#| msgid "Types of report state"
msgid "Types of record quality"
msgstr ""
+#: models.py:126
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models.py:130 models.py:485
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:134 models.py:517 tests.py:1594
+msgctxt "key for text search"
+msgid "period"
+msgstr ""
+
+#: models.py:138 models.py:513 tests.py:1625
+msgctxt "key for text search"
+msgid "remain"
+msgstr ""
+
+#: models.py:142 models.py:473 tests.py:1602
+msgctxt "key for text search"
+msgid "town"
+msgstr ""
+
+#: models.py:146 models.py:541
+msgctxt "key for text search"
+msgid "comment"
+msgstr ""
+
+#: models.py:150
+msgctxt "key for text search"
+msgid "locality-ngi"
+msgstr ""
+
+#: models.py:154
+msgctxt "key for text search"
+msgid "locality-cadastral"
+msgstr ""
+
+#: models.py:158
+msgctxt "key for text search"
+msgid "shipwreck-name"
+msgstr ""
+
+#: models.py:163
+msgctxt "key for text search"
+msgid "oceanographic-service-localisation"
+msgstr ""
+
+#: models.py:167
+msgctxt "key for text search"
+msgid "shipwreck-code"
+msgstr ""
+
+#: models.py:171
+msgctxt "key for text search"
+msgid "sinking-date"
+msgstr ""
+
+#: models.py:175
+msgctxt "key for text search"
+msgid "discovery-area"
+msgstr ""
+
#: models.py:193
msgid "Top operation"
msgstr ""
@@ -833,6 +897,157 @@ msgstr ""
msgid "Archaeological sites (reference)"
msgstr ""
+#: models.py:461 models.py:1376 tests.py:1597
+msgctxt "key for text search"
+msgid "year"
+msgstr ""
+
+#: models.py:465
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr ""
+
+#: models.py:469 models.py:1388
+msgctxt "key for text search"
+msgid "patriarche"
+msgstr ""
+
+#: models.py:477 models.py:1408
+msgctxt "key for text search"
+msgid "parcel"
+msgstr ""
+
+#: models.py:481
+msgctxt "key for text search"
+msgid "department"
+msgstr ""
+
+#: models.py:489
+msgctxt "key for text search"
+msgid "address"
+msgstr ""
+
+#: models.py:493 models.py:1392
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
+#: models.py:497 tests.py:1630
+msgctxt "key for text search"
+msgid "is-open"
+msgstr ""
+
+#: models.py:501
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr ""
+
+#: models.py:505
+msgctxt "key for text search"
+msgid "scientist"
+msgstr ""
+
+#: models.py:509
+msgctxt "key for text search"
+msgid "operator"
+msgstr ""
+
+#: models.py:521
+msgctxt "key for text search"
+msgid "start-before"
+msgstr ""
+
+#: models.py:525
+msgctxt "key for text search"
+msgid "start-after"
+msgstr ""
+
+#: models.py:529
+msgctxt "key for text search"
+msgid "end-before"
+msgstr ""
+
+#: models.py:533
+msgctxt "key for text search"
+msgid "end-after"
+msgstr ""
+
+#: models.py:537
+msgctxt "key for text search"
+msgid "relation-types"
+msgstr ""
+
+#: models.py:545
+msgctxt "key for text search"
+msgid "abstract"
+msgstr ""
+
+#: models.py:550
+msgctxt "key for text search"
+msgid "scientific-documentation-comment"
+msgstr ""
+
+#: models.py:554
+msgctxt "key for text search"
+msgid "record-quality"
+msgstr ""
+
+#: models.py:559
+msgctxt "key for text search"
+msgid "report-processing"
+msgstr ""
+
+#: models.py:564
+#| msgid "Virtual operation"
+msgctxt "key for text search"
+msgid "virtual-operation"
+msgstr ""
+
+#: models.py:569
+msgctxt "key for text search"
+msgid "site"
+msgstr ""
+
+#: models.py:573 models.py:1426
+msgctxt "key for text search"
+msgid "created-by"
+msgstr ""
+
+#: models.py:577 models.py:1430
+msgctxt "key for text search"
+msgid "modified-by"
+msgstr ""
+
+#: models.py:581
+msgctxt "key for text search"
+msgid "documentation-received"
+msgstr ""
+
+#: models.py:585
+msgctxt "key for text search"
+msgid "documentation-deadline-before"
+msgstr ""
+
+#: models.py:589
+msgctxt "key for text search"
+msgid "documentation-deadline-after"
+msgstr ""
+
+#: models.py:593
+msgctxt "key for text search"
+msgid "finds-received"
+msgstr ""
+
+#: models.py:597
+msgctxt "key for text search"
+msgid "finds-deadline-before"
+msgstr ""
+
+#: models.py:601
+msgctxt "key for text search"
+msgid "finds-deadline-after"
+msgstr ""
+
#: models.py:615 templates/ishtar/sheet_operation.html:57
msgid "Closing date"
msgstr ""
@@ -954,6 +1169,146 @@ msgstr ""
msgid "Ref."
msgstr ""
+#: models.py:1380
+msgctxt "key for text search"
+msgid "index"
+msgstr ""
+
+#: models.py:1384
+msgctxt "key for text search"
+msgid "other-ref"
+msgstr ""
+
+#: models.py:1396
+msgctxt "key for text search"
+msgid "indexed"
+msgstr ""
+
+#: models.py:1400
+msgctxt "key for text search"
+msgid "operation-town"
+msgstr ""
+
+#: models.py:1404
+msgctxt "key for text search"
+msgid "file-town"
+msgstr ""
+
+#: models.py:1414
+msgctxt "key for text search"
+msgid "operation-department"
+msgstr ""
+
+#: models.py:1418
+msgctxt "key for text search"
+msgid "file-department"
+msgstr ""
+
+#: models.py:1422
+msgctxt "key for text search"
+msgid "object"
+msgstr ""
+
+#: models.py:1434
+msgctxt "key for text search"
+msgid "signature-before"
+msgstr ""
+
+#: models.py:1438
+msgctxt "key for text search"
+msgid "signature-after"
+msgstr ""
+
+#: models.py:1442
+msgctxt "key for text search"
+msgid "file-name"
+msgstr ""
+
+#: models.py:1446
+msgctxt "key for text search"
+msgid "general-contractor"
+msgstr ""
+
+#: models.py:1451
+msgctxt "key for text search"
+msgid "general-contractor-organization"
+msgstr ""
+
+#: models.py:1456
+msgctxt "key for text search"
+msgid "file-reference"
+msgstr ""
+
+#: models.py:1460
+msgctxt "key for text search"
+msgid "file-year"
+msgstr ""
+
+#: models.py:1464
+msgctxt "key for text search"
+msgid "file-other-reference"
+msgstr ""
+
+#: models.py:1468
+msgctxt "key for text search"
+msgid "file-in-charge"
+msgstr ""
+
+#: models.py:1472
+msgctxt "key for text search"
+msgid "file-permit-reference"
+msgstr ""
+
+#: models.py:1476
+msgctxt "key for text search"
+msgid "treatment-name"
+msgstr ""
+
+#: models.py:1480
+msgctxt "key for text search"
+msgid "treatment-reference"
+msgstr ""
+
+#: models.py:1484
+msgctxt "key for text search"
+msgid "treatment-year"
+msgstr ""
+
+#: models.py:1488
+msgctxt "key for text search"
+msgid "treatment-index"
+msgstr ""
+
+#: models.py:1492
+msgctxt "key for text search"
+msgid "treatment-type"
+msgstr ""
+
+#: models.py:1496
+msgctxt "key for text search"
+msgid "treatment-file-name"
+msgstr ""
+
+#: models.py:1500
+msgctxt "key for text search"
+msgid "treatment-file-reference"
+msgstr ""
+
+#: models.py:1504
+msgctxt "key for text search"
+msgid "treatment-file-year"
+msgstr ""
+
+#: models.py:1508
+msgctxt "key for text search"
+msgid "treatment-file-index"
+msgstr ""
+
+#: models.py:1512
+msgctxt "key for text search"
+msgid "treatment-file-type"
+msgstr ""
+
#: models.py:1530
msgid "Person in charge of the operation"
msgstr ""
@@ -1412,15 +1767,15 @@ msgstr ""
msgid "This act is indexed!"
msgstr ""
-#: tests.py:512
+#: tests.py:511
msgid "New objects will be created."
msgstr ""
-#: tests.py:542
+#: tests.py:541
msgid "This line have been already imported."
msgstr ""
-#: tests.py:578
+#: tests.py:577
msgid ""
"The following error(s) has been encountered while parsing the source file:"
msgstr ""
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 34a3d2a01..7e64a90eb 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -37,7 +37,7 @@ from ishtar_common.models import BaseHistorizedItem, Dashboard, \
post_delete_record_relation, post_save_cache, RelationItem, \
ShortMenuItem, SourceType, Town, ValueGetter
from ishtar_common.utils import cached_label_changed, \
- force_cached_label_changed, mode, TXT_SEARCH_COMMENT
+ force_cached_label_changed, mode
class RemainType(GeneralType):
@@ -123,56 +123,56 @@ class ArchaeologicalSite(BaseHistorizedItem):
# alternative names of fields for searches
ALT_NAMES = {
'reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"),
+ pgettext_lazy("key for text search", u"reference"),
'reference'
),
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name'
),
'periods': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"period"),
+ pgettext_lazy("key for text search", u"period"),
'periods__label__iexact'
),
'remains': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"remain"),
+ pgettext_lazy("key for text search", u"remain"),
'remains__label__iexact'
),
'towns': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"town"),
+ pgettext_lazy("key for text search", u"town"),
'towns__cached_label__iexact'
),
'comment': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"),
+ pgettext_lazy("key for text search", u"comment"),
'comment__icontains'
),
'locality_ngi': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"locality-ngi"),
+ pgettext_lazy("key for text search", u"locality-ngi"),
'locality_ngi__icontains'
),
'locality_cadastral': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"locality-cadastral"),
+ pgettext_lazy("key for text search", u"locality-cadastral"),
'locality_cadastral__icontains'
),
'shipwreck_name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"shipwreck-name"),
+ pgettext_lazy("key for text search", u"shipwreck-name"),
'shipwreck_name__iexact'
),
'oceanographic_service_localisation': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"oceanographic-service-localisation"),
'oceanographic_service_localisation__icontains'
),
'shipwreck_code': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"shipwreck-code"),
+ pgettext_lazy("key for text search", u"shipwreck-code"),
'shipwreck_code__iexact'
),
'sinking_date': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"sinking-date"),
+ pgettext_lazy("key for text search", u"sinking-date"),
'sinking_date'
),
'discovery_area': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"discovery-area"),
+ pgettext_lazy("key for text search", u"discovery-area"),
'discovery_area__icontains'
),
}
@@ -458,147 +458,147 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
# alternative names of fields for searches
ALT_NAMES = {
'year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'year'
),
'operation_code': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-code"),
+ pgettext_lazy("key for text search", u"operation-code"),
'operation_code'
),
'code_patriarche': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"patriarche"),
+ pgettext_lazy("key for text search", u"patriarche"),
'code_patriarche'
),
'towns': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"town"),
+ pgettext_lazy("key for text search", u"town"),
'towns__cached_label__iexact'
),
'parcel': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"),
+ pgettext_lazy("key for text search", u"parcel"),
'parcels__cached_label__iexact'
),
'towns__numero_insee__startswith': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"department"),
+ pgettext_lazy("key for text search", u"department"),
'towns__numero_insee__startswith'
),
'common_name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'common_name__icontains'
),
'address': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"address"),
+ pgettext_lazy("key for text search", u"address"),
'address__icontains'
),
'operation_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'operation_type__label__iexact'
),
'end_date': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"is-open"),
+ pgettext_lazy("key for text search", u"is-open"),
'end_date__isnull'
),
'in_charge': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"in-charge"),
+ pgettext_lazy("key for text search", u"in-charge"),
'in_charge__cached_label__iexact'
),
'scientist': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"scientist"),
+ pgettext_lazy("key for text search", u"scientist"),
'scientist__cached_label__iexact'
),
'operator': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operator"),
+ pgettext_lazy("key for text search", u"operator"),
'operator__cached_label__iexact'
),
'remains': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"remain"),
+ pgettext_lazy("key for text search", u"remain"),
'remains__label__iexact'
),
'periods': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"period"),
+ pgettext_lazy("key for text search", u"period"),
'periods__label__iexact'
),
'start_before': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"start-before"),
+ pgettext_lazy("key for text search", u"start-before"),
'start_date__lte'
),
'start_after': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"start-after"),
+ pgettext_lazy("key for text search", u"start-after"),
'start_date__gte'
),
'end_before': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"end-before"),
+ pgettext_lazy("key for text search", u"end-before"),
'excavation_end_date__lte'
),
'end_after': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"end-after"),
+ pgettext_lazy("key for text search", u"end-after"),
'excavation_end_date__gte'
),
'relation_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"relation-types"),
+ pgettext_lazy("key for text search", u"relation-types"),
'relation_types'
),
'comment': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"),
+ pgettext_lazy("key for text search", u"comment"),
'comment__icontains'
),
'abstract': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"abstract"),
+ pgettext_lazy("key for text search", u"abstract"),
'abstract__icontains'
),
'scientific_documentation_comment': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"scientific-documentation-comment"),
'scientific_documentation_comment__icontains'
),
'record_quality_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"record-quality"),
+ pgettext_lazy("key for text search", u"record-quality"),
'record_quality_type__label__iexact'
),
'report_processing': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"report-processing"),
'report_processing__label__iexact'
),
'virtual_operation': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
- u"virtual_operation"),
+ pgettext_lazy("key for text search",
+ u"virtual-operation"),
'virtual_operation'
),
'archaeological_sites': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"site"),
'archaeological_sites__cached_label__icontains'
),
'history_creator': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"created-by"),
+ pgettext_lazy("key for text search", u"created-by"),
'history_creator__ishtaruser__person__cached_label__iexact'
),
'history_modifier': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"modified-by"),
+ pgettext_lazy("key for text search", u"modified-by"),
'history_modifier__ishtaruser__person__cached_label__iexact'
),
'documentation_received': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-received"),
+ pgettext_lazy("key for text search", u"documentation-received"),
'documentation_received'
),
'documentation_deadline_before': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-deadline-before"),
+ pgettext_lazy("key for text search", u"documentation-deadline-before"),
'documentation_deadline__lte'
),
'documentation_deadline_after': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"documentation-deadline-after"),
+ pgettext_lazy("key for text search", u"documentation-deadline-after"),
'documentation_deadline__gte'
),
'finds_received': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-received"),
+ pgettext_lazy("key for text search", u"finds-received"),
'finds_received'
),
'finds_deadline_before': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-deadline-before"),
+ pgettext_lazy("key for text search", u"finds-deadline-before"),
'finds_deadline__lte'
),
'finds_deadline_after': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"finds-deadline-after"),
+ pgettext_lazy("key for text search", u"finds-deadline-after"),
'finds_deadline__gte'
),
}
@@ -1373,143 +1373,143 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
# alternative names of fields for searches
ALT_NAMES = {
'year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"year"),
+ pgettext_lazy("key for text search", u"year"),
'signature_date__year'
),
'index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"index"),
+ pgettext_lazy("key for text search", u"index"),
'index'
),
'ref_sra': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"other-ref"),
+ pgettext_lazy("key for text search", u"other-ref"),
'ref_sra__iexact'
),
'operation__code_patriarche': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"patriarche"),
+ pgettext_lazy("key for text search", u"patriarche"),
'operation__code_patriarche'
),
'act_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'act_type__label__iexact'
),
'indexed': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"indexed"),
+ pgettext_lazy("key for text search", u"indexed"),
'index__isnull'
),
'operation__towns': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-town"),
+ pgettext_lazy("key for text search", u"operation-town"),
'operation__towns__cached_label__iexact'
),
'associated_file__towns': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-town"),
+ pgettext_lazy("key for text search", u"file-town"),
'associated_file__towns__cached_label__iexact'
),
'parcel': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"parcel"),
+ pgettext_lazy("key for text search", u"parcel"),
('associated_file__parcels__cached_label__iexact',
'operation__parcels__cached_label__iexact',
'operation__associated_file__parcels__cached_label__iexact'),
),
'operation__towns__numero_insee__startswith': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"operation-department"),
+ pgettext_lazy("key for text search", u"operation-department"),
'operation__towns__numero_insee__startswith'
),
'associated_file__towns__numero_insee__startswith': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-department"),
+ pgettext_lazy("key for text search", u"file-department"),
'associated_file__towns__numero_insee__startswith'
),
'act_object': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"object"),
+ pgettext_lazy("key for text search", u"object"),
'act_object__icontains'
),
'history_creator': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"created-by"),
+ pgettext_lazy("key for text search", u"created-by"),
'history_creator__ishtaruser__person__cached_label__iexact'
),
'history_modifier': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"modified-by"),
+ pgettext_lazy("key for text search", u"modified-by"),
'history_modifier__ishtaruser__person__cached_label__iexact'
),
'signature_date_before': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"signature-before"),
+ pgettext_lazy("key for text search", u"signature-before"),
'signature_date__lte'
),
'signature_date_after': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"signature-after"),
+ pgettext_lazy("key for text search", u"signature-after"),
'signature_date__gte'
),
'associated_file__name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-name"),
+ pgettext_lazy("key for text search", u"file-name"),
'associated_file__name__icontains'
),
'associated_file__general_contractor': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"general-contractor"),
+ pgettext_lazy("key for text search", u"general-contractor"),
'associated_file__general_contractor__cached_label__iexact'
),
'associated_file__general_contractor__attached_to': (
- pgettext_lazy(TXT_SEARCH_COMMENT,
+ pgettext_lazy("key for text search",
u"general-contractor-organization"),
'associated_file__general_contractor__attached_to'
'__cached_label__iexact'
),
'associated_file__numeric_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-reference"),
+ pgettext_lazy("key for text search", u"file-reference"),
'associated_file__numeric_reference'
),
'associated_file__year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-year"),
+ pgettext_lazy("key for text search", u"file-year"),
'associated_file__year'
),
'associated_file__internal_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-other-reference"),
+ pgettext_lazy("key for text search", u"file-other-reference"),
'associated_file__internal_reference__iexact'
),
'associated_file__in_charge': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-in-charge"),
+ pgettext_lazy("key for text search", u"file-in-charge"),
'associated_file__in_charge__cached_label__iexact'
),
'associated_file__permit_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"file-permit-reference"),
+ pgettext_lazy("key for text search", u"file-permit-reference"),
'associated_file__permit_reference__iexact'
),
'treatment__name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-name"),
+ pgettext_lazy("key for text search", u"treatment-name"),
'treatment__label__icontains'
),
'treatment__other_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-reference"),
+ pgettext_lazy("key for text search", u"treatment-reference"),
'treatment__other_reference__icontains'
),
'treatment__year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-year"),
+ pgettext_lazy("key for text search", u"treatment-year"),
'treatment__year'
),
'treatment__index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-index"),
+ pgettext_lazy("key for text search", u"treatment-index"),
'treatment__index'
),
'treatment__treatment_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-type"),
+ pgettext_lazy("key for text search", u"treatment-type"),
'treatment__treatment_types__label__iexact'
),
'treatment_file__name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-name"),
+ pgettext_lazy("key for text search", u"treatment-file-name"),
'treatment_file__name__icontains'
),
'treatment_file__internal_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-reference"),
+ pgettext_lazy("key for text search", u"treatment-file-reference"),
'treatment_file__internal_reference__icontains'
),
'treatment_file__year': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-year"),
+ pgettext_lazy("key for text search", u"treatment-file-year"),
'treatment_file__year'
),
'treatment_file__index': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-index"),
+ pgettext_lazy("key for text search", u"treatment-file-index"),
'treatment_file__index'
),
'treatment_file__type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"treatment-file-type"),
+ pgettext_lazy("key for text search", u"treatment-file-type"),
'treatment_file__type__label__iexact'
),
}
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 86fbd0d7b..f50e58eaa 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -50,7 +50,6 @@ from archaeological_context_records.models import Unit, ContextRecord
from ishtar_common import forms_common
from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
create_superuser, create_user, TestCase, OPERATION_FIXTURES
-from ishtar_common.utils import TXT_SEARCH_COMMENT
OPERATION_TOWNS_FIXTURES = \
@@ -1592,15 +1591,15 @@ class OperationSearchTest(TestCase, OperationInitTest):
villa = models.RemainType.objects.get(txt_idx='villa')
ope1.remains.add(villa)
- search_period_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"period"))
+ search_period_q = unicode(pgettext("key for text search", u"period"))
self._test_search(c, search_period_q, final_neo.label, 1, "Simple")
- search_year_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"year"))
+ search_year_q = unicode(pgettext("key for text search", u"year"))
self._test_search(c, search_year_q, "2042", 1, "Integer")
self._test_search(c, search_year_q, '2042";"2020', 2, "Many integer")
- search_town_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"town"))
+ search_town_q = unicode(pgettext("key for text search", u"town"))
self._test_search(c, search_town_q, town.cached_label, 1,
"String search with parenthesis and minus")
@@ -1623,12 +1622,12 @@ class OperationSearchTest(TestCase, OperationInitTest):
u'{}*'.format(neo.label[:3]), 2, "Open search")
# non hierarchic search
- search_remain_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"remain"))
+ search_remain_q = unicode(pgettext("key for text search", u"remain"))
self._test_search(c, search_remain_q, villa.label,
1, "Non hierarchic search")
# boolean search
- search_open_q = unicode(pgettext(TXT_SEARCH_COMMENT, u"is-open"))
+ search_open_q = unicode(pgettext("key for text search", u"is-open"))
self._test_search(c, search_open_q, u"Yes", 2, "Boolean")
def create_relations(self):
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index 9eb0dc1d7..f45ea6e23 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -204,6 +204,16 @@ msgstr ""
msgid "Warehouse types"
msgstr ""
+#: models.py:58
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:62 models.py:323
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
#: models.py:81
msgid "Documents"
msgstr ""
@@ -268,6 +278,21 @@ msgstr ""
msgid "Type"
msgstr ""
+#: models.py:315
+msgctxt "key for text search"
+msgid "location"
+msgstr ""
+
+#: models.py:319
+msgctxt "key for text search"
+msgid "responsible-warehouse"
+msgstr ""
+
+#: models.py:327
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
#: models.py:336
msgid "Location (warehouse)"
msgstr ""
@@ -281,7 +306,6 @@ msgid "Cached location"
msgstr ""
#: models.py:349
-#| msgid "Cached location"
msgid "Cached division"
msgstr ""
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 7ff85f276..0b578755f 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -30,7 +30,7 @@ from ishtar_common.data_importer import post_importer_action
from ishtar_common.models import Document, GeneralType, get_external_id, \
LightHistorizedItem, OwnPerms, Address, Person, post_save_cache, \
ImageModel, DashboardFormItem
-from ishtar_common.utils import cached_label_changed, TXT_SEARCH_COMMENT
+from ishtar_common.utils import cached_label_changed
class WarehouseType(GeneralType):
@@ -55,11 +55,11 @@ class Warehouse(Address, DashboardFormItem, OwnPerms):
# alternative names of fields for searches
ALT_NAMES = {
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name__icontains'
),
'warehouse_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'warehouse_type__label__iexact'
),
}
@@ -312,19 +312,19 @@ class Container(LightHistorizedItem, ImageModel):
# alternative names of fields for searches
ALT_NAMES = {
'location': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"location"),
+ pgettext_lazy("key for text search", u"location"),
'location__name__icontains'
),
'responsible': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"responsible-warehouse"),
+ pgettext_lazy("key for text search", u"responsible-warehouse"),
'responsible__name__icontains'
),
'container_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'container_type__label__iexact'
),
'reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"),
+ pgettext_lazy("key for text search", u"reference"),
'reference__icontains'
),
}
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index db10f3a35..761c7d2b9 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -262,7 +262,6 @@ msgid "Importer configuration error: \"{}\"."
msgstr ""
#: data_importer.py:1497
-#| msgid "Importer configuration error: \"{}\"."
msgid "Import error: {} - \"{}\"."
msgstr ""
@@ -814,12 +813,10 @@ msgid "Is an alert"
msgstr ""
#: forms_common.py:1306
-#| msgid "Created"
msgid "Create"
msgstr ""
#: forms_common.py:1307 templates/ishtar/forms/search_query.html:60
-#| msgid "Updated values"
msgid "Update"
msgstr ""
@@ -1073,17 +1070,14 @@ msgid "Cannot have symmetrical and an inverse_relation"
msgstr ""
#: models.py:1587
-#| msgid "Contact type"
msgid "Content type"
msgstr ""
#: models.py:1592
-#| msgid "Search vector"
msgid "Search query"
msgstr ""
#: models.py:1593
-#| msgid "Search vector"
msgid "Search queries"
msgstr ""
@@ -1456,6 +1450,16 @@ msgstr ""
msgid "Organization types"
msgstr ""
+#: models.py:2522 models.py:2650 models.py:3021
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:2526 models.py:2662 models.py:3033 models.py:3303
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
#: models.py:2537 models.py:2697 models.py:3171 models.py:3616
msgid "Cached name"
msgstr ""
@@ -1465,7 +1469,6 @@ msgid "Organizations"
msgstr ""
#: models.py:2571
-#| msgid "New organization"
msgid "unknown organization"
msgstr ""
@@ -1501,6 +1504,26 @@ msgstr ""
msgid "Doctor"
msgstr ""
+#: models.py:2654 models.py:3025
+msgctxt "key for text search"
+msgid "surname"
+msgstr ""
+
+#: models.py:2658 models.py:3029
+msgctxt "key for text search"
+msgid "email"
+msgstr ""
+
+#: models.py:2666 models.py:3037
+msgctxt "key for text search"
+msgid "organization"
+msgstr ""
+
+#: models.py:2670
+msgctxt "key for text search"
+msgid "has-account"
+msgstr ""
+
#: models.py:2690
msgid "Contact type"
msgstr ""
@@ -1537,6 +1560,11 @@ msgstr ""
msgid " - duplicate"
msgstr ""
+#: models.py:3017
+msgctxt "key for text search"
+msgid "username"
+msgstr ""
+
#: models.py:3050
msgid "Advanced shortcut menu"
msgstr ""
@@ -1585,6 +1613,46 @@ msgstr ""
msgid "License types"
msgstr ""
+#: models.py:3295
+msgctxt "key for text search"
+msgid "author"
+msgstr ""
+
+#: models.py:3299
+msgctxt "key for text search"
+msgid "title"
+msgstr ""
+
+#: models.py:3307
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models.py:3311
+msgctxt "key for text search"
+msgid "internal-reference"
+msgstr ""
+
+#: models.py:3315
+msgctxt "key for text search"
+msgid "description"
+msgstr ""
+
+#: models.py:3319
+msgctxt "key for text search"
+msgid "comment"
+msgstr ""
+
+#: models.py:3323
+msgctxt "key for text search"
+msgid "additional-information"
+msgstr ""
+
+#: models.py:3327
+msgctxt "key for text search"
+msgid "has-duplicate"
+msgstr ""
+
#: models.py:3337
msgid "Index"
msgstr ""
@@ -1623,7 +1691,6 @@ msgid "Authors (raw)"
msgstr ""
#: models.py:3367 templates/ishtar/blocks/window_image_detail.html:118
-#| msgid "Number of line"
msgid "Number of items"
msgstr ""
@@ -2485,7 +2552,6 @@ msgid "help"
msgstr ""
#: templates/blocks/bs_form_snippet.html:47
-#| msgid "Site search"
msgid "Criteria search"
msgstr ""
@@ -2607,8 +2673,6 @@ msgid "Yes"
msgstr ""
#: templates/ishtar/blocks/window_image_detail.html:128
-#| msgctxt "Not directory"
-#| msgid "File"
msgctxt "not directory"
msgid "File"
msgstr ""
@@ -2768,7 +2832,6 @@ msgid "New"
msgstr ""
#: templates/ishtar/forms/success.html:20
-#| msgid "Item successfully saved"
msgid "Form successfully submited"
msgstr ""
@@ -3387,7 +3450,6 @@ msgid "delete"
msgstr ""
#: templates/widgets/search_input.html:12
-#| msgid "Material"
msgid "Criteria"
msgstr ""
@@ -3403,19 +3465,19 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: utils.py:91
+#: utils.py:88
msgid "You don't have sufficient permissions to do this action."
msgstr ""
-#: utils.py:268
+#: utils.py:265
msgid " (...)"
msgstr ""
-#: utils.py:341
+#: utils.py:338
msgid "Information"
msgstr ""
-#: utils.py:342
+#: utils.py:339
msgid "Load another random image?"
msgstr ""
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 81a391b3b..22b90842c 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -64,7 +64,7 @@ from ishtar_common.models_imports import ImporterModel, ImporterType, \
Import, TargetKeyGroup
from ishtar_common.utils import get_cache, disable_for_loaddata, create_slug, \
get_all_field_names, merge_tsvectors, cached_label_changed, \
- generate_relation_graph, TXT_SEARCH_COMMENT
+ generate_relation_graph
__all__ = [
'ImporterModel', 'ImporterType', 'ImporterDefault', 'ImporterDefaultValues',
@@ -2519,11 +2519,11 @@ class Organization(Address, Merge, OwnPerms, ValueGetter):
# alternative names of fields for searches
ALT_NAMES = {
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name__icontains'
),
'organization_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'organization_type__label__iexact'
),
}
@@ -2647,27 +2647,27 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
# alternative names of fields for searches
ALT_NAMES = {
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'name__icontains'
),
'surname': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"surname"),
+ pgettext_lazy("key for text search", u"surname"),
'surname__icontains'
),
'email': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"email"),
+ pgettext_lazy("key for text search", u"email"),
'email__icontains'
),
'person_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'person_types__label__iexact'
),
'attached_to': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"organization"),
+ pgettext_lazy("key for text search", u"organization"),
'attached_to__cached_label__iexact'
),
'ishtaruser__isnull': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"has-account"),
+ pgettext_lazy("key for text search", u"has-account"),
'ishtaruser__isnull'
),
}
@@ -3014,27 +3014,27 @@ class IshtarUser(FullSearch):
# alternative names of fields for searches
ALT_NAMES = {
'username': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"username"),
+ pgettext_lazy("key for text search", u"username"),
'user_ptr__username__icontains'
),
'name': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"name"),
+ pgettext_lazy("key for text search", u"name"),
'person__name__icontains'
),
'surname': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"surname"),
+ pgettext_lazy("key for text search", u"surname"),
'person__surname__icontains'
),
'email': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"email"),
+ pgettext_lazy("key for text search", u"email"),
'person__email__icontains'
),
'person_types': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'person__person_types__label__iexact'
),
'attached_to': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"organization"),
+ pgettext_lazy("key for text search", u"organization"),
'person__attached_to__cached_label__iexact'
),
}
@@ -3292,39 +3292,39 @@ class Document(OwnPerms, ImageModel, FullSearch, Imported):
# alternative names of fields for searches
ALT_NAMES = {
'authors': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"author"),
+ pgettext_lazy("key for text search", u"author"),
'authors__cached_label__icontains'
),
'title': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"title"),
+ pgettext_lazy("key for text search", u"title"),
'title__icontains'
),
'source_type': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"type"),
+ pgettext_lazy("key for text search", u"type"),
'source_type__label__iexact'
),
'reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"reference"),
+ pgettext_lazy("key for text search", u"reference"),
'reference__icontains'
),
'internal_reference': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"internal-reference"),
+ pgettext_lazy("key for text search", u"internal-reference"),
'internal_reference__icontains'
),
'description': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"description"),
+ pgettext_lazy("key for text search", u"description"),
'description__icontains'
),
'comment': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"comment"),
+ pgettext_lazy("key for text search", u"comment"),
'comment__icontains'
),
'additional_information': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"additional-information"),
+ pgettext_lazy("key for text search", u"additional-information"),
'additional_information__icontains'
),
'duplicate': (
- pgettext_lazy(TXT_SEARCH_COMMENT, u"has-duplicate"),
+ pgettext_lazy("key for text search", u"has-duplicate"),
'duplicate'
),
}
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index 0e5dd286a..8cb06aacb 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -62,9 +62,6 @@ class BColors:
CSV_OPTIONS = {'delimiter': ',', 'quotechar': '"', 'quoting': QUOTE_ALL}
-TXT_SEARCH_COMMENT = "key for text search (no accent, no spaces)"
-
-
def check_rights(rights=None, redirect_url='/'):
"""
Decorator that checks the rights to access the view.
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index b5898faa6..36f642170 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -1451,6 +1451,16 @@ msgstr ""
msgid "Organization types"
msgstr ""
+#: models.py:2522 models.py:2650 models.py:3021
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:2526 models.py:2662 models.py:3033 models.py:3303
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
#: models.py:2537 models.py:2697 models.py:3171 models.py:3616
msgid "Cached name"
msgstr ""
@@ -1495,6 +1505,26 @@ msgstr ""
msgid "Doctor"
msgstr ""
+#: models.py:2654 models.py:3025
+msgctxt "key for text search"
+msgid "surname"
+msgstr ""
+
+#: models.py:2658 models.py:3029
+msgctxt "key for text search"
+msgid "email"
+msgstr ""
+
+#: models.py:2666 models.py:3037
+msgctxt "key for text search"
+msgid "organization"
+msgstr ""
+
+#: models.py:2670
+msgctxt "key for text search"
+msgid "has-account"
+msgstr ""
+
#: models.py:2690
msgid "Contact type"
msgstr ""
@@ -1531,6 +1561,11 @@ msgstr ""
msgid " - duplicate"
msgstr ""
+#: models.py:3017
+msgctxt "key for text search"
+msgid "username"
+msgstr ""
+
#: models.py:3050
msgid "Advanced shortcut menu"
msgstr ""
@@ -1579,6 +1614,46 @@ msgstr ""
msgid "License types"
msgstr ""
+#: models.py:3295
+msgctxt "key for text search"
+msgid "author"
+msgstr ""
+
+#: models.py:3299
+msgctxt "key for text search"
+msgid "title"
+msgstr ""
+
+#: models.py:3307
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models.py:3311
+msgctxt "key for text search"
+msgid "internal-reference"
+msgstr ""
+
+#: models.py:3315
+msgctxt "key for text search"
+msgid "description"
+msgstr ""
+
+#: models.py:3319
+msgctxt "key for text search"
+msgid "comment"
+msgstr ""
+
+#: models.py:3323
+msgctxt "key for text search"
+msgid "additional-information"
+msgstr ""
+
+#: models.py:3327
+msgctxt "key for text search"
+msgid "has-duplicate"
+msgstr ""
+
#: models.py:3337
msgid "Index"
msgstr ""
@@ -3392,19 +3467,19 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: utils.py:91
+#: utils.py:88
msgid "You don't have sufficient permissions to do this action."
msgstr ""
-#: utils.py:268
+#: utils.py:265
msgid " (...)"
msgstr ""
-#: utils.py:341
+#: utils.py:338
msgid "Information"
msgstr ""
-#: utils.py:342
+#: utils.py:339
msgid "Load another random image?"
msgstr ""
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index f30e8cf0c..52a6e82ac 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.po
@@ -11,7 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-08-15 02:06+0000\n"
+"PO-Revision-Date: 2018-08-15 03:28+0000\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -376,6 +376,61 @@ msgstr "Parcelle (identifiant)"
msgid "Parcel (year)"
msgstr "Parcelle (année)"
+#: models.py:262
+msgctxt "key for text search"
+msgid "id"
+msgstr "id"
+
+#: models.py:266
+msgctxt "key for text search"
+msgid "town"
+msgstr "commune"
+
+#: models.py:270
+msgctxt "key for text search"
+msgid "operation-year"
+msgstr "operation-annee"
+
+#: models.py:274
+msgctxt "key for text search"
+msgid "patriarche"
+msgstr "patriarche"
+
+#: models.py:278
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr "operation-code"
+
+#: models.py:282
+msgctxt "key for text search"
+msgid "site"
+msgstr "site"
+
+#: models.py:286
+msgctxt "key for text search"
+msgid "operation-relation-type"
+msgstr "operation-type-relation"
+
+#: models.py:290
+msgctxt "key for text search"
+msgid "period"
+msgstr "periode"
+
+#: models.py:294
+msgctxt "key for text search"
+msgid "unit-type"
+msgstr "type"
+
+#: models.py:298
+msgctxt "key for text search"
+msgid "parcel"
+msgstr "parcelle"
+
+#: models.py:302
+msgctxt "key for text search"
+msgid "record-relation-type"
+msgstr "ue-type-relation"
+
#: models.py:310
msgid "External ID"
msgstr "Identifiant"
diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po
index 28a8ca1c3..b7b8d3c5d 100644
--- a/translations/fr/archaeological_files.po
+++ b/translations/fr/archaeological_files.po
@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-08-15 02:07+0000\n"
+"PO-Revision-Date: 2018-08-15 03:30+0000\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -340,6 +340,96 @@ msgstr "Types de permis"
msgid "Delay (in days)"
msgstr "Délai (en jours)"
+#: models.py:127
+msgctxt "key for text search"
+msgid "year"
+msgstr "annee"
+
+#: models.py:131
+msgctxt "key for text search"
+msgid "reference"
+msgstr "reference"
+
+#: models.py:135
+msgctxt "key for text search"
+msgid "other-reference"
+msgstr "autre-reference"
+
+#: models.py:139
+msgctxt "key for text search"
+msgid "town"
+msgstr "commune"
+
+#: models.py:143
+msgctxt "key for text search"
+msgid "parcel"
+msgstr "parcelle"
+
+#: models.py:147
+msgctxt "key for text search"
+msgid "department"
+msgstr "departement"
+
+#: models.py:151
+msgctxt "key for text search"
+msgid "name"
+msgstr "nom"
+
+#: models.py:155
+msgctxt "key for text search"
+msgid "type"
+msgstr "type"
+
+#: models.py:159
+msgctxt "key for text search"
+msgid "active"
+msgstr "actif"
+
+#: models.py:163
+msgctxt "key for text search"
+msgid "saisine-type"
+msgstr "type-saisine"
+
+#: models.py:167
+msgctxt "key for text search"
+msgid "permit-type"
+msgstr "type-permit"
+
+#: models.py:171
+msgctxt "key for text search"
+msgid "permit-reference"
+msgstr "reference-permis"
+
+#: models.py:175
+msgctxt "key for text search"
+msgid "comment"
+msgstr "commentaire"
+
+#: models.py:179
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr "responsable"
+
+#: models.py:183
+msgctxt "key for text search"
+msgid "general-contractor"
+msgstr "amenageur"
+
+#: models.py:188
+msgctxt "key for text search"
+msgid "general-contractor-organization"
+msgstr "amenageur-organisation"
+
+#: models.py:192
+msgctxt "key for text search"
+msgid "created-by"
+msgstr "cree-par"
+
+#: models.py:196
+msgctxt "key for text search"
+msgid "modified-by"
+msgstr "modifie-par"
+
#: models.py:211
msgid "Internal reference"
msgstr "Référence interne"
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 2d878f681..4d39c8ccd 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -11,27 +11,27 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-08-15 02:08+0000\n"
+"PO-Revision-Date: 2018-08-15 03:36+0000\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 4.6.0\n"
-#: admin.py:39 models_finds.py:286
+#: admin.py:39 models_finds.py:285
msgid "Point (2D)"
msgstr "Point (2D)"
-#: admin.py:41 models_finds.py:288
+#: admin.py:41 models_finds.py:287
msgid "Line"
msgstr "Ligne"
-#: admin.py:43 models_finds.py:289
+#: admin.py:43 models_finds.py:288
msgid "Multi polygon"
msgstr "Polygones multi-parties"
-#: forms.py:88 forms.py:94 forms.py:451 models_finds.py:620
-#: models_finds.py:1086 wizards.py:71
+#: forms.py:88 forms.py:94 forms.py:451 models_finds.py:619
+#: models_finds.py:1085 wizards.py:71
msgid "Context record"
msgstr "Unité d'Enregistrement"
@@ -39,8 +39,8 @@ msgstr "Unité d'Enregistrement"
msgid "Find - 010 - Context record choice"
msgstr "Mobilier - 010 - Choix de l'unité d'enregistrement"
-#: forms.py:123 ishtar_menu.py:32 models_finds.py:987 models_finds.py:1580
-#: models_treatments.py:339 templates/ishtar/sheet_find.html:4
+#: forms.py:123 ishtar_menu.py:32 models_finds.py:986 models_finds.py:1579
+#: models_treatments.py:338 templates/ishtar/sheet_find.html:4
msgid "Find"
msgstr "Mobilier"
@@ -52,105 +52,105 @@ msgstr "Mobilier - 020 - Général"
msgid "Identification"
msgstr "Identification"
-#: forms.py:142 forms.py:420 forms.py:702 models_finds.py:251
-#: models_finds.py:856 templates/ishtar/sheet_find.html:19
+#: forms.py:142 forms.py:420 forms.py:702 models_finds.py:250
+#: models_finds.py:855 templates/ishtar/sheet_find.html:19
msgid "Free ID"
msgstr "Identifiant libre"
-#: forms.py:144 forms.py:421 models_finds.py:857
+#: forms.py:144 forms.py:421 models_finds.py:856
#: templates/ishtar/sheet_find.html:18
msgid "Denomination"
msgstr "Dénomination"
-#: forms.py:145 models_finds.py:930
+#: forms.py:145 models_finds.py:929
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:147 models_finds.py:255
+#: forms.py:147 models_finds.py:254
msgid "Excavation ID"
msgstr "Identifiant fouille"
-#: forms.py:148 models_finds.py:858
+#: forms.py:148 models_finds.py:857
msgid "Museum ID"
msgstr "Identifiant musée"
-#: forms.py:149 models_finds.py:853
+#: forms.py:149 models_finds.py:852
msgid "Seal number"
msgstr "Numéro de scellé"
-#: forms.py:150 models_finds.py:926
+#: forms.py:150 models_finds.py:925
msgid "Mark"
msgstr "Marquage"
#: forms.py:152 forms.py:153 forms.py:471 forms_treatments.py:139
-#: models_finds.py:256 models_finds.py:859 models_treatments.py:139
+#: models_finds.py:255 models_finds.py:858 models_treatments.py:138
#: templates/ishtar/sheet_find.html:134
msgid "Description"
msgstr "Description"
-#: forms.py:156 models_finds.py:263
+#: forms.py:156 models_finds.py:262
msgid "Discovery date (exact or TPQ)"
msgstr "Date de découverte (exacte ou TPQ)"
-#: forms.py:159 models_finds.py:265 templates/ishtar/sheet_find.html:78
+#: forms.py:159 models_finds.py:264 templates/ishtar/sheet_find.html:78
msgid "Discovery date (TAQ)"
msgstr "Date de découverte (TAQ)"
-#: forms.py:161 forms.py:473 models_finds.py:267
+#: forms.py:161 forms.py:473 models_finds.py:266
msgid "Batch/object"
msgstr "Lot/objet"
-#: forms.py:163 models_finds.py:891
+#: forms.py:163 models_finds.py:890
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:166 models_finds.py:55 models_finds.py:643 models_finds.py:865
+#: forms.py:166 models_finds.py:54 models_finds.py:642 models_finds.py:864
msgid "Material types"
msgstr "Types de matériau"
-#: forms.py:169 models_finds.py:870
+#: forms.py:169 models_finds.py:869
msgid "Material type quality"
msgstr "Qualité du type de matériaux"
-#: forms.py:171 models_finds.py:150 models_finds.py:644 models_finds.py:894
+#: forms.py:171 models_finds.py:149 models_finds.py:643 models_finds.py:893
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:174 models_finds.py:899
+#: forms.py:174 models_finds.py:898
msgid "Object type quality"
msgstr "Qualité du type d'objet"
-#: forms.py:175 forms.py:709 models_finds.py:877
+#: forms.py:175 forms.py:709 models_finds.py:876
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:177 models_finds.py:912
+#: forms.py:177 models_finds.py:911
msgid "Minimum number of individuals (MNI)"
msgstr "Nombre minimum d'individus (NMI)"
-#: forms.py:179 models_finds.py:860
+#: forms.py:179 models_finds.py:859
msgid "Decoration"
msgstr "Décor"
-#: forms.py:181 models_finds.py:861
+#: forms.py:181 models_finds.py:860
msgid "Inscription"
msgstr "Inscription"
-#: forms.py:184 models_finds.py:863
+#: forms.py:184 models_finds.py:862
msgid "Manufacturing place"
msgstr "Lieu de fabrication"
-#: forms.py:186 models_finds.py:909
+#: forms.py:186 models_finds.py:908
msgid "Communicability"
msgstr "Communicabilité"
#: forms.py:188 forms_treatments.py:141 forms_treatments.py:491
-#: models_finds.py:257 models_finds.py:927 models_treatments.py:138
-#: models_treatments.py:596
+#: models_finds.py:256 models_finds.py:926 models_treatments.py:137
+#: models_treatments.py:595
msgid "Comment"
msgstr "Commentaire général"
-#: forms.py:191 models_finds.py:928
+#: forms.py:191 models_finds.py:927
msgid "Comment on dating"
msgstr "Commentaire relatif aux datations"
@@ -158,27 +158,27 @@ msgstr "Commentaire relatif aux datations"
msgid "Dimensions"
msgstr "Dimensions"
-#: forms.py:194 models_finds.py:913
+#: forms.py:194 models_finds.py:912
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:195 models_finds.py:914
+#: forms.py:195 models_finds.py:913
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:196 models_finds.py:915
+#: forms.py:196 models_finds.py:914
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: forms.py:197 models_finds.py:916
+#: forms.py:197 models_finds.py:915
msgid "Diameter (cm)"
msgstr "Diamètre (cm)"
-#: forms.py:198 models_finds.py:917
+#: forms.py:198 models_finds.py:916
msgid "Thickness (cm)"
msgstr "Épaisseur (cm)"
-#: forms.py:199 forms.py:707 models_finds.py:873
+#: forms.py:199 forms.py:707 models_finds.py:872
msgid "Volume (l)"
msgstr "Volume (l)"
@@ -198,7 +198,7 @@ msgstr "Encombrement petit côté (cm)"
msgid "Clutter height (cm)"
msgstr "Encombrement hauteur (cm)"
-#: forms.py:208 models_finds.py:924
+#: forms.py:208 models_finds.py:923
msgid "Dimensions comment"
msgstr "Commentaire relatif aux dimensions"
@@ -207,35 +207,35 @@ msgstr "Commentaire relatif aux dimensions"
msgid "Coordinates"
msgstr "Coordonnées"
-#: forms.py:213 models_finds.py:272
+#: forms.py:213 models_finds.py:271
msgid "Point of topographic reference"
msgstr "Point topographique"
-#: forms.py:216 models_finds.py:274
+#: forms.py:216 models_finds.py:273
msgid "X"
msgstr "X"
-#: forms.py:217 models_finds.py:275
+#: forms.py:217 models_finds.py:274
msgid "Y"
msgstr "Y"
-#: forms.py:218 models_finds.py:276
+#: forms.py:218 models_finds.py:275
msgid "Z"
msgstr "Z"
-#: forms.py:220 models_finds.py:284
+#: forms.py:220 models_finds.py:283
msgid "Spatial Reference System"
msgstr "Système de référence spatiale"
-#: forms.py:223 models_finds.py:277
+#: forms.py:223 models_finds.py:276
msgid "Estimated error for X"
msgstr "Erreur estimée pour X"
-#: forms.py:225 models_finds.py:279
+#: forms.py:225 models_finds.py:278
msgid "Estimated error for Y"
msgstr "Erreur estimée pour Y"
-#: forms.py:227 models_finds.py:281
+#: forms.py:227 models_finds.py:280
msgid "Estimated error for Z"
msgstr "Erreur estimée pour Z"
@@ -243,11 +243,11 @@ msgstr "Erreur estimée pour Z"
msgid "Sheet"
msgstr "Fiche"
-#: forms.py:230 forms.py:474 models_finds.py:932
+#: forms.py:230 forms.py:474 models_finds.py:931
msgid "Check"
msgstr "Vérification"
-#: forms.py:232 models_finds.py:934
+#: forms.py:232 models_finds.py:933
msgid "Check date"
msgstr "Date de vérification"
@@ -292,51 +292,51 @@ msgstr "Conservation"
msgid "Find - 030 - Preservation"
msgstr "Mobilier - 030 - Conservation"
-#: forms.py:333 forms.py:467 models_finds.py:903
+#: forms.py:333 forms.py:467 models_finds.py:902
msgid "Integrity / interest"
msgstr "Intégrité / intérêt"
-#: forms.py:336 forms.py:469 models_finds.py:906
+#: forms.py:336 forms.py:469 models_finds.py:905
msgid "Remarkability"
msgstr "Remarquabilité"
-#: forms.py:338 forms.py:465 models_finds.py:78 models_finds.py:944
+#: forms.py:338 forms.py:465 models_finds.py:77 models_finds.py:943
msgid "Conservatory state"
msgstr "État sanitaire"
-#: forms.py:341 models_finds.py:953
+#: forms.py:341 models_finds.py:952
msgid "Alteration"
msgstr "Altération"
-#: forms.py:344 models_finds.py:957
+#: forms.py:344 models_finds.py:956
msgid "Alteration cause"
msgstr "Cause d'altération"
-#: forms.py:347 models_finds.py:950
+#: forms.py:347 models_finds.py:949
msgid "Recommended treatments"
msgstr "Traitements recommandés"
-#: forms.py:349 models_finds.py:961
+#: forms.py:349 models_finds.py:960
msgid "Treatment emergency"
msgstr "Urgence du traitement"
-#: forms.py:351 models_finds.py:936
+#: forms.py:351 models_finds.py:935
msgid "Estimated value"
msgstr "Valeur estimée"
-#: forms.py:352 models_finds.py:964
+#: forms.py:352 models_finds.py:963
msgid "Insurance value"
msgstr "Valeur d'assurance"
-#: forms.py:354 models_finds.py:966
+#: forms.py:354 models_finds.py:965
msgid "Appraisal date"
msgstr "Date d'évaluation"
-#: forms.py:356 models_finds.py:946
+#: forms.py:356 models_finds.py:945
msgid "Conservatory comment"
msgstr "Commentaire relatif à la conservation"
-#: forms.py:380 forms.py:404 models_finds.py:885
+#: forms.py:380 forms.py:404 models_finds.py:884
#: templates/ishtar/sheet_find.html:199
msgid "Dating"
msgstr "Datation"
@@ -346,13 +346,13 @@ msgid "Period"
msgstr "Période"
#: forms.py:386 forms_treatments.py:143 forms_treatments.py:284
-#: forms_treatments.py:493 models_finds.py:1585 models_treatments.py:141
-#: models_treatments.py:350 templates/ishtar/sheet_find.html:232
+#: forms_treatments.py:493 models_finds.py:1584 models_treatments.py:140
+#: models_treatments.py:349 templates/ishtar/sheet_find.html:232
#: templates/ishtar/sheet_find.html:270
msgid "Start date"
msgstr "Date de début"
-#: forms.py:388 models_finds.py:1586 models_treatments.py:351
+#: forms.py:388 models_finds.py:1585 models_treatments.py:350
#: templates/ishtar/sheet_find.html:233 templates/ishtar/sheet_find.html:271
msgid "End date"
msgstr "Date de fin"
@@ -382,17 +382,17 @@ msgstr "Mobilier - 001 - Recherche"
msgid "Full text search"
msgstr "Recherche en texte intégral"
-#: forms.py:418 models_finds.py:292
+#: forms.py:418 models_finds.py:291
msgid "Short ID"
msgstr "Identifiant court"
-#: forms.py:419 models_finds.py:295
+#: forms.py:419 models_finds.py:294
msgid "Complete ID"
msgstr "Identifiant complet"
#: forms.py:424 forms_treatments.py:56 forms_treatments.py:101
#: forms_treatments.py:336 forms_treatments.py:411 forms_treatments.py:463
-#: forms_treatments.py:601 models_treatments.py:115 models_treatments.py:569
+#: forms_treatments.py:601 models_treatments.py:114 models_treatments.py:568
msgid "Year"
msgstr "Année"
@@ -428,11 +428,11 @@ msgstr "Rechercher parmi les opérations liées"
msgid "Search within related context records"
msgstr "Recherche parmi les Unités d'Enregistrement associées"
-#: forms.py:461 forms.py:706 models_finds.py:54
+#: forms.py:461 forms.py:706 models_finds.py:53
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:462 models_finds.py:149
+#: forms.py:462 models_finds.py:148
msgid "Object type"
msgstr "Type d'objet"
@@ -464,12 +464,12 @@ msgstr "Réf. contenant"
msgid "Find search"
msgstr "Rechercher un mobilier"
-#: forms.py:582 models_treatments.py:248
+#: forms.py:582 models_treatments.py:247
#: templates/ishtar/sheet_treatment.html:56
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:584 models_finds.py:988
+#: forms.py:584 models_finds.py:987
msgid "Finds"
msgstr "Mobilier"
@@ -493,7 +493,7 @@ msgstr "Mobiliers résultants"
msgid "Would you like to delete this find?"
msgstr "Voulez-vous supprimer ce mobilier ?"
-#: forms.py:727 models_treatments.py:67
+#: forms.py:727 models_treatments.py:66
msgid "Upstream find"
msgstr "Mobilier amont"
@@ -505,25 +505,25 @@ msgstr "Un autre panier existant utilise déjà ce nom."
msgid "Basket"
msgstr "Panier"
-#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:111
+#: forms_treatments.py:54 forms_treatments.py:97 models_treatments.py:110
#: templates/ishtar/sheet_find.html:226 templates/ishtar/sheet_find.html:264
msgid "Label"
msgstr "Dénomination"
-#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:113
+#: forms_treatments.py:55 forms_treatments.py:100 models_treatments.py:112
msgid "Other ref."
msgstr "Autre réf."
#: forms_treatments.py:57 forms_treatments.py:232 forms_treatments.py:337
#: forms_treatments.py:399 forms_treatments.py:412 forms_treatments.py:516
-#: forms_treatments.py:602 forms_treatments.py:669 models_treatments.py:116
-#: models_treatments.py:570
+#: forms_treatments.py:602 forms_treatments.py:669 models_treatments.py:115
+#: models_treatments.py:569
msgid "Index"
msgstr "Index"
#: forms_treatments.py:58 forms_treatments.py:106 forms_treatments.py:292
-#: forms_treatments.py:353 models_finds.py:104 models_treatments.py:121
-#: models_treatments.py:349
+#: forms_treatments.py:353 models_finds.py:103 models_treatments.py:120
+#: models_treatments.py:348
msgid "Treatment type"
msgstr "Type de traitement"
@@ -539,7 +539,7 @@ msgstr "Traitement de base"
msgid "Treatment - 020 - General"
msgstr "Traitement - 020 - Général"
-#: forms_treatments.py:108 models_treatments.py:69 models_treatments.py:123
+#: forms_treatments.py:108 models_treatments.py:68 models_treatments.py:122
#: templates/ishtar/sheet_find.html:228 templates/ishtar/sheet_find.html:266
msgid "State"
msgstr "État"
@@ -548,15 +548,15 @@ msgstr "État"
msgid "Target"
msgstr "Destination"
-#: forms_treatments.py:112 forms_treatments.py:474 models_treatments.py:131
+#: forms_treatments.py:112 forms_treatments.py:474 models_treatments.py:130
msgid "Responsible"
msgstr "Responsable"
-#: forms_treatments.py:118 models_treatments.py:134
+#: forms_treatments.py:118 models_treatments.py:133
msgid "Organization"
msgstr "Organisation"
-#: forms_treatments.py:124 models_treatments.py:126 models_treatments.py:352
+#: forms_treatments.py:124 models_treatments.py:125 models_treatments.py:351
msgid "Location"
msgstr "Localisation"
@@ -568,12 +568,12 @@ msgstr "Contenant (pertinent dans le cadre du conditionnement)"
msgid "External ref."
msgstr "Référence"
-#: forms_treatments.py:137 models_treatments.py:140
+#: forms_treatments.py:137 models_treatments.py:139
msgid "Goal"
msgstr "But"
#: forms_treatments.py:145 forms_treatments.py:284 forms_treatments.py:499
-#: forms_treatments.py:551 models_treatments.py:142 models_treatments.py:590
+#: forms_treatments.py:551 models_treatments.py:141 models_treatments.py:589
msgid "Closing date"
msgstr "Date de clôture"
@@ -622,7 +622,7 @@ msgstr "Un responsable ou une organisation doit être défini."
msgid "Another treatment with this index exists for {}."
msgstr "Un autre traitement avec cet index existe pour {}."
-#: forms_treatments.py:262 models_treatments.py:119
+#: forms_treatments.py:262 models_treatments.py:118
msgid "Associated request"
msgstr "Demande associée"
@@ -631,7 +631,7 @@ msgid "Treatment - 010 - Request choice"
msgstr "Traitement - 010 - Choix de la demande de traitement"
#: forms_treatments.py:268 forms_treatments.py:454 ishtar_menu.py:84
-#: models_treatments.py:605 models_treatments.py:633
+#: models_treatments.py:604 models_treatments.py:632
#: templates/ishtar/sheet_treatmentfile.html:4 wizards.py:195
msgid "Treatment request"
msgstr "Demande de traitement"
@@ -718,7 +718,7 @@ msgstr "Modifié par"
msgid "Treatment - Administrative act - General"
msgstr "Traitement - Acte administratif - Général"
-#: forms_treatments.py:409 forms_treatments.py:461 models_treatments.py:575
+#: forms_treatments.py:409 forms_treatments.py:461 models_treatments.py:574
msgid "Name"
msgstr "Nom"
@@ -726,7 +726,7 @@ msgstr "Nom"
msgid "Internal ref."
msgstr "Réf. interne"
-#: forms_treatments.py:413 forms_treatments.py:472 models_treatments.py:68
+#: forms_treatments.py:413 forms_treatments.py:472 models_treatments.py:67
#: templates/ishtar/sheet_find.html:227 templates/ishtar/sheet_find.html:265
msgid "Type"
msgstr "Type"
@@ -735,12 +735,12 @@ msgstr "Type"
msgid "In charge"
msgstr "Responsable"
-#: forms_treatments.py:422 forms_treatments.py:480 models_treatments.py:584
+#: forms_treatments.py:422 forms_treatments.py:480 models_treatments.py:583
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Applicant"
msgstr "Demandeur"
-#: forms_treatments.py:428 forms_treatments.py:486 models_treatments.py:588
+#: forms_treatments.py:428 forms_treatments.py:486 models_treatments.py:587
#: templates/ishtar/sheet_treatmentfile.html:53
msgid "Applicant organisation"
msgstr "Organisation du demandeur"
@@ -749,7 +749,7 @@ msgstr "Organisation du demandeur"
msgid "Treatment request search"
msgstr "Rechercher une demande de traitement"
-#: forms_treatments.py:497 forms_treatments.py:550 models_treatments.py:594
+#: forms_treatments.py:497 forms_treatments.py:550 models_treatments.py:593
msgid "Reception date"
msgstr "Date de réception"
@@ -765,12 +765,12 @@ msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ? "
msgid "Would you like to delete this treatment request?"
msgstr "Voulez-vous supprimer cette demande de traitement ?"
-#: forms_treatments.py:549 models_treatments.py:592
+#: forms_treatments.py:549 models_treatments.py:591
msgid "Creation date"
msgstr "Date de création"
-#: forms_treatments.py:559 forms_treatments.py:622 models_treatments.py:509
-#: models_treatments.py:577
+#: forms_treatments.py:559 forms_treatments.py:622 models_treatments.py:508
+#: models_treatments.py:576
msgid "Treatment request type"
msgstr "Type de demande de traitement"
@@ -818,16 +818,16 @@ msgstr "Suppression"
msgid "Manage items"
msgstr "Gestion des éléments"
-#: ishtar_menu.py:109 ishtar_menu.py:165 models_finds.py:1582
+#: ishtar_menu.py:109 ishtar_menu.py:165 models_finds.py:1581
msgid "Administrative act"
msgstr "Acte administratif"
-#: ishtar_menu.py:127 ishtar_menu.py:184 models_finds.py:969
-#: models_treatments.py:156 models_treatments.py:598
+#: ishtar_menu.py:127 ishtar_menu.py:184 models_finds.py:968
+#: models_treatments.py:155 models_treatments.py:597
msgid "Documents"
msgstr "Documents"
-#: ishtar_menu.py:136 models_treatments.py:163 models_treatments.py:341
+#: ishtar_menu.py:136 models_treatments.py:162 models_treatments.py:340
#: templates/ishtar/sheet_treatment.html:4
msgid "Treatment"
msgstr "Traitement"
@@ -836,386 +836,581 @@ msgstr "Traitement"
msgid "Simple treatments"
msgstr "Traitements simples"
-#: models_finds.py:49
+#: models_finds.py:48
msgid "Code"
msgstr "Code"
-#: models_finds.py:50
+#: models_finds.py:49
msgid "Recommendation"
msgstr "Recommandation"
-#: models_finds.py:64 models_finds.py:88 models_finds.py:136
-#: models_finds.py:159 models_finds.py:216 models_finds.py:855
-#: models_treatments.py:345
+#: models_finds.py:63 models_finds.py:87 models_finds.py:135
+#: models_finds.py:158 models_finds.py:215 models_finds.py:854
+#: models_treatments.py:344
msgid "Order"
msgstr "Ordre"
-#: models_finds.py:67
+#: models_finds.py:66
msgid "Material type quality type"
msgstr "Type de qualité du type de matériaux"
-#: models_finds.py:68
+#: models_finds.py:67
msgid "Material type quality types"
msgstr "Types de qualité du type de matériaux"
-#: models_finds.py:79
+#: models_finds.py:78
msgid "Conservatory states"
msgstr "États sanitaires"
-#: models_finds.py:89
+#: models_finds.py:88
msgid "Parent type"
msgstr "Type parent"
-#: models_finds.py:91
+#: models_finds.py:90
msgid "Virtual"
msgstr "Virtuel"
-#: models_finds.py:93
+#: models_finds.py:92
msgid "Upstream is many"
msgstr "Les éléments amont sont multiples"
-#: models_finds.py:95
+#: models_finds.py:94
msgid "Check this if for this treatment from many finds you'll get one."
msgstr ""
"Cochez cela si, pour ce traitement, à partir de plusieurs éléments vous en "
"obtenez un seul."
-#: models_finds.py:98
+#: models_finds.py:97
msgid "Downstream is many"
msgstr "Les éléments aval sont multiples"
-#: models_finds.py:100
+#: models_finds.py:99
msgid "Check this if for this treatment from one find you'll get many."
msgstr ""
"Cochez cela si, pour ce traitement, à partir d'un seul élément vous en "
"obtenez plusieurs."
-#: models_finds.py:105 models_treatments.py:230
+#: models_finds.py:104 models_treatments.py:229
msgid "Treatment types"
msgstr "Types de traitement"
-#: models_finds.py:115
+#: models_finds.py:114
msgid "Integrity / interest type"
msgstr "Type d'intégrité / intérêt"
-#: models_finds.py:116
+#: models_finds.py:115
msgid "Integrity / interest types"
msgstr "Types d'intégrité / intérêt"
-#: models_finds.py:126
+#: models_finds.py:125
msgid "Remarkability type"
msgstr "Type de remarquabilité"
-#: models_finds.py:127
+#: models_finds.py:126
msgid "Remarkability types"
msgstr "Types de remarquabilité"
-#: models_finds.py:138
+#: models_finds.py:137
msgid "Batch type"
msgstr "Type de lot"
-#: models_finds.py:139
+#: models_finds.py:138
msgid "Batch types"
msgstr "Types de lot"
-#: models_finds.py:162
+#: models_finds.py:161
msgid "Object type quality type"
msgstr "Type de qualité du type d'objet"
-#: models_finds.py:163
+#: models_finds.py:162
msgid "Object type quality types"
msgstr "Types de qualité du type d'objet"
-#: models_finds.py:173
+#: models_finds.py:172
msgid "Alteration type"
msgstr "Type d'altération"
-#: models_finds.py:174
+#: models_finds.py:173
msgid "Alteration types"
msgstr "Types d'altération"
-#: models_finds.py:184
+#: models_finds.py:183
msgid "Alteration cause type"
msgstr "Type de cause d'altération"
-#: models_finds.py:185
+#: models_finds.py:184
msgid "Alteration cause types"
msgstr "Types de cause d'altération"
-#: models_finds.py:195
+#: models_finds.py:194
msgid "Treatment emergency type"
msgstr "Type d'urgence du traitement"
-#: models_finds.py:196
+#: models_finds.py:195
msgid "Treatment emergency types"
msgstr "Types d'urgence du traitement"
-#: models_finds.py:206
+#: models_finds.py:205
msgid "Communicability type"
msgstr "Type de communicabilité"
-#: models_finds.py:207
+#: models_finds.py:206
msgid "Communicability types"
msgstr "Types de communicabilité"
-#: models_finds.py:219
+#: models_finds.py:218
msgid "Checked type"
msgstr "Type de vérification"
-#: models_finds.py:220
+#: models_finds.py:219
msgid "Checked types"
msgstr "Types de vérification"
-#: models_finds.py:252 models_finds.py:848 models_treatments.py:136
-#: models_treatments.py:573
+#: models_finds.py:251 models_finds.py:847 models_treatments.py:135
+#: models_treatments.py:572
msgid "External ID"
msgstr "Identifiant"
-#: models_finds.py:254 models_finds.py:850
+#: models_finds.py:253 models_finds.py:849
msgid "External ID is set automatically"
msgstr "L'identifiant est attribué automatiquement"
-#: models_finds.py:258
+#: models_finds.py:257
msgid "Special interest"
msgstr "Intérêt spécifique"
-#: models_finds.py:262
+#: models_finds.py:261
msgid "Context Record"
msgstr "Unité d'Enregistrement"
-#: models_finds.py:270
+#: models_finds.py:269
msgid "Material index"
msgstr "Index matériel"
-#: models_finds.py:287
+#: models_finds.py:286
msgid "Point (3D)"
msgstr "Point (3D)"
-#: models_finds.py:293 models_finds.py:296
+#: models_finds.py:292 models_finds.py:295
msgid "Cached value - do not edit"
msgstr "Valeur en cache - ne pas éditer"
-#: models_finds.py:305 models_finds.py:846
+#: models_finds.py:304 models_finds.py:845
msgid "Base find"
msgstr "Mobilier d'origine"
-#: models_finds.py:306
+#: models_finds.py:305
msgid "Base finds"
msgstr "Mobilier d'origine"
-#: models_finds.py:550
+#: models_finds.py:549
msgid "g"
msgstr "g"
-#: models_finds.py:551
+#: models_finds.py:550
msgid "kg"
msgstr "kg"
-#: models_finds.py:621 templates/ishtar/sheet_find.html:21
+#: models_finds.py:620 templates/ishtar/sheet_find.html:21
msgid "Base find - Short ID"
msgstr "Mobilier d'origine - ID court"
-#: models_finds.py:622 templates/ishtar/sheet_find.html:20
+#: models_finds.py:621 templates/ishtar/sheet_find.html:20
msgid "Base find - Complete ID"
msgstr "Mobilier d'origine - ID complet"
-#: models_finds.py:624
+#: models_finds.py:623
msgid "Operation (code)"
msgstr "Opération (code)"
-#: models_finds.py:626
+#: models_finds.py:625
msgid "Town"
msgstr "Ville"
-#: models_finds.py:628
+#: models_finds.py:627
msgid "Operation (name)"
msgstr "Opération (nom)"
-#: models_finds.py:630
+#: models_finds.py:629
msgid "Parcel"
msgstr "Parcelle"
-#: models_finds.py:631
+#: models_finds.py:630
msgid "Batch"
msgstr "Lot"
-#: models_finds.py:632
+#: models_finds.py:631
msgid "Base find - Comment"
msgstr "Mobilier d'origine - Commentaires"
-#: models_finds.py:633
+#: models_finds.py:632
msgid "Base find - Description"
msgstr "Mobilier d'origine - Description"
-#: models_finds.py:634
+#: models_finds.py:633
msgid "Base find - Topographic localisation"
msgstr "Mobilier d'origine - Localisation topographique"
-#: models_finds.py:636
+#: models_finds.py:635
msgid "Base find - Special interest"
msgstr "Mobilier d'origine - Intérêt spécifique"
-#: models_finds.py:638
+#: models_finds.py:637
msgid "Base find - Discovery date (exact or TPQ)"
msgstr "Mobilier d'origine - Date de découverte (exacte ou TPQ)"
-#: models_finds.py:640
+#: models_finds.py:639
msgid "Base find - Discovery date (TAQ)"
msgstr "Mobilier d'origine - Date de découverte (TAQ)"
-#: models_finds.py:641 models_finds.py:888 models_treatments.py:143
-#: models_treatments.py:353 templates/ishtar/sheet_find.html:231
+#: models_finds.py:640 models_finds.py:887 models_treatments.py:142
+#: models_treatments.py:352 templates/ishtar/sheet_find.html:231
#: templates/ishtar/sheet_find.html:269
msgid "Container"
msgstr "Contenant"
-#: models_finds.py:642
+#: models_finds.py:641
msgid "Periods"
msgstr "Périodes"
-#: models_finds.py:874
+#: models_finds.py:718
+msgctxt "key for text search"
+msgid "short-id"
+msgstr "id-court"
+
+#: models_finds.py:722
+msgctxt "key for text search"
+msgid "complete-id"
+msgstr "id-complet"
+
+#: models_finds.py:726
+msgctxt "key for text search"
+msgid "free-id"
+msgstr "id-libre"
+
+#: models_finds.py:730
+msgctxt "key for text search"
+msgid "denomination"
+msgstr "denomination"
+
+#: models_finds.py:734
+msgctxt "key for text search"
+msgid "town"
+msgstr "commune"
+
+#: models_finds.py:738 models_treatments.py:84 models_treatments.py:540
+msgctxt "key for text search"
+msgid "year"
+msgstr "annee"
+
+#: models_finds.py:742
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr "operation-code"
+
+#: models_finds.py:746
+msgctxt "key for text search"
+msgid "code-patriarche"
+msgstr "code-patriarche"
+
+#: models_finds.py:750
+msgctxt "key for text search"
+msgid "operation-type"
+msgstr "operation-type"
+
+#: models_finds.py:755
+msgctxt "key for text search"
+msgid "area"
+msgstr "zone"
+
+#: models_finds.py:759
+msgctxt "key for text search"
+msgid "site"
+msgstr "site"
+
+#: models_finds.py:764
+msgctxt "key for text search"
+msgid "context-record-site"
+msgstr "ue-site"
+
+#: models_finds.py:769
+msgctxt "key for text search"
+msgid "context-record"
+msgstr "ue"
+
+#: models_finds.py:773
+msgctxt "key for text search"
+msgid "operation-relation-type"
+msgstr "operation-type-relation"
+
+#: models_finds.py:777
+msgctxt "key for text search"
+msgid "context-record-relation-type"
+msgstr "ue-type-relation"
+
+#: models_finds.py:781
+msgctxt "key for text search"
+msgid "period"
+msgstr "periode"
+
+#: models_finds.py:785
+msgctxt "key for text search"
+msgid "material"
+msgstr "materiau"
+
+#: models_finds.py:789
+msgctxt "key for text search"
+msgid "object-type"
+msgstr "type-objet"
+
+#: models_finds.py:793
+msgctxt "key for text search"
+msgid "preservation"
+msgstr "preservation"
+
+#: models_finds.py:797
+msgctxt "key for text search"
+msgid "conservatory"
+msgstr "conservation"
+
+#: models_finds.py:801
+msgctxt "key for text search"
+msgid "integrity"
+msgstr "integrite"
+
+#: models_finds.py:805
+msgctxt "key for text search"
+msgid "remarkability"
+msgstr "remarquabilite"
+
+#: models_finds.py:809
+msgctxt "key for text search"
+msgid "description"
+msgstr "description"
+
+#: models_finds.py:813
+msgctxt "key for text search"
+msgid "batch"
+msgstr "lot"
+
+#: models_finds.py:817
+msgctxt "key for text search"
+msgid "checked"
+msgstr "verifie"
+
+#: models_finds.py:821 models_treatments.py:92
+msgctxt "key for text search"
+msgid "has-image"
+msgstr "a-une-image"
+
+#: models_finds.py:825
+msgctxt "key for text search"
+msgid "location"
+msgstr "localisation"
+
+#: models_finds.py:829
+msgctxt "key for text search"
+msgid "warehouse"
+msgstr "depot"
+
+#: models_finds.py:833
+msgctxt "key for text search"
+msgid "container-index"
+msgstr "contenant-index"
+
+#: models_finds.py:837
+msgctxt "key for text search"
+msgid "container-ref"
+msgstr "contenant-ref"
+
+#: models_finds.py:873
msgid "Weight"
msgstr "Poids"
-#: models_finds.py:875
+#: models_finds.py:874
msgid "Weight unit"
msgstr "Unité de poids"
-#: models_finds.py:881 templates/ishtar/sheet_find.html:221
+#: models_finds.py:880 templates/ishtar/sheet_find.html:221
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models_finds.py:884 templates/ishtar/sheet_find.html:259
+#: models_finds.py:883 templates/ishtar/sheet_find.html:259
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models_finds.py:919
+#: models_finds.py:918
msgid "Clutter - long side (cm)"
msgstr "Encombrement - grand côté (cm)"
-#: models_finds.py:921
+#: models_finds.py:920
msgid "Clutter - short side (cm)"
msgstr "Encombrement - petit côté (cm)"
-#: models_finds.py:923
+#: models_finds.py:922
msgid "Clutter - height (cm)"
msgstr "Encombrement - hauteur (cm)"
-#: models_finds.py:939
+#: models_finds.py:938
msgid "Collection"
msgstr "Collection"
-#: models_finds.py:971 models_treatments.py:158 models_treatments.py:600
+#: models_finds.py:970 models_treatments.py:157 models_treatments.py:599
msgid "Cached name"
msgstr "Nom en cache"
-#: models_finds.py:1000
+#: models_finds.py:999
msgid "FIND"
msgstr "MOBILIER"
-#: models_finds.py:1095 wizards.py:70 wizards.py:207
+#: models_finds.py:1094 wizards.py:70 wizards.py:207
msgid "Operation"
msgstr "Opération (OA)"
-#: models_finds.py:1407
+#: models_finds.py:1406
msgid "No container have been set - the localisation cannot be set."
msgstr ""
"Aucun contenant n'a été défini - la localisation ne peut être définie."
-#: models_finds.py:1413
+#: models_finds.py:1412
msgid "The division number {} have not been set for the warehouse {}."
msgstr ""
"La division numéro {} n'a pas été définie pour le lieu de conservation {}."
-#: models_finds.py:1583
+#: models_finds.py:1582
msgid "Person"
msgstr "Individu"
-#: models_finds.py:1589
+#: models_finds.py:1588
msgid "Property"
msgstr "Propriété"
-#: models_finds.py:1590
+#: models_finds.py:1589
msgid "Properties"
msgstr "Propriétés"
-#: models_treatments.py:42
+#: models_treatments.py:41
msgid "Treatment state type"
msgstr "Type d'état de traitement"
-#: models_treatments.py:43
+#: models_treatments.py:42
msgid "Treatment state types"
msgstr "Types d'état de traitement"
-#: models_treatments.py:66
+#: models_treatments.py:65
msgid "Downstream find"
msgstr "Mobilier aval"
-#: models_treatments.py:128
+#: models_treatments.py:76
+msgctxt "key for text search"
+msgid "label"
+msgstr "libelle"
+
+#: models_treatments.py:80
+msgctxt "key for text search"
+msgid "other-reference"
+msgstr "autre-reference"
+
+#: models_treatments.py:88 models_treatments.py:544
+msgctxt "key for text search"
+msgid "index"
+msgstr "index"
+
+#: models_treatments.py:96 models_treatments.py:548
+msgctxt "key for text search"
+msgid "type"
+msgstr "type"
+
+#: models_treatments.py:127
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
"Endroit où le traitement est réalisé. Renseignez le lieu de conservation de "
"destination pour un déplacement."
-#: models_treatments.py:145
+#: models_treatments.py:144
msgid "Estimated cost"
msgstr "Coût estimé"
-#: models_treatments.py:147
+#: models_treatments.py:146
msgid "Quoted cost"
msgstr "Coût devisé"
-#: models_treatments.py:149
+#: models_treatments.py:148
msgid "Realized cost"
msgstr "Coût réalisé"
-#: models_treatments.py:151
+#: models_treatments.py:150
msgid "Insurance cost"
msgstr "Coût d'assurance"
-#: models_treatments.py:153
+#: models_treatments.py:152
msgid "Target a basket"
msgstr "Appliquer à un panier"
-#: models_treatments.py:164 templates/ishtar/sheet_find.html:218
+#: models_treatments.py:163 templates/ishtar/sheet_find.html:218
#: templates/ishtar/sheet_treatmentfile.html:61
msgid "Treatments"
msgstr "Traitements"
-#: models_treatments.py:183
+#: models_treatments.py:182
msgid "TREATMENT"
msgstr "TRAITEMENT"
-#: models_treatments.py:239 templates/ishtar/sheet_treatment.html:61
+#: models_treatments.py:238 templates/ishtar/sheet_treatment.html:61
msgid "Downstream finds"
msgstr "Mobilier aval"
-#: models_treatments.py:354 templates/ishtar/sheet_find.html:230
+#: models_treatments.py:353 templates/ishtar/sheet_find.html:230
#: templates/ishtar/sheet_find.html:268
msgid "Doer"
msgstr "Opérateur"
-#: models_treatments.py:355 models_treatments.py:356
+#: models_treatments.py:354 models_treatments.py:355
msgid "Related finds"
msgstr "Mobilier associé"
-#: models_treatments.py:498
+#: models_treatments.py:497
msgid "Is upstream"
msgstr "Est en amont"
-#: models_treatments.py:510
+#: models_treatments.py:509
msgid "Treatment request types"
msgstr "Types de demande de traitement"
-#: models_treatments.py:571
+#: models_treatments.py:532
+msgctxt "key for text search"
+msgid "name"
+msgstr "nom"
+
+#: models_treatments.py:536
+msgctxt "key for text search"
+msgid "reference"
+msgstr "reference"
+
+#: models_treatments.py:552
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr "responsable"
+
+#: models_treatments.py:556
+msgctxt "key for text search"
+msgid "applicant"
+msgstr "demandeur"
+
+#: models_treatments.py:560
+msgctxt "key for text search"
+msgid "applicant-organisation"
+msgstr "demandeur-organisation"
+
+#: models_treatments.py:570
msgid "Internal reference"
msgstr "Référence interne"
-#: models_treatments.py:580
+#: models_treatments.py:579
msgid "Person in charge"
msgstr "Personne responsable"
-#: models_treatments.py:606
+#: models_treatments.py:605
msgid "Treatment requests"
msgstr "Demandes de traitement"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 51068467e..9f69d99bf 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -11,7 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-08-15 02:07+0000\n"
+"PO-Revision-Date: 2018-08-15 03:38+0000\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -780,6 +780,71 @@ msgstr "Type de qualité d'enregistrement"
msgid "Types of record quality"
msgstr "Types de qualité d'enregistrement"
+#: models.py:126
+msgctxt "key for text search"
+msgid "reference"
+msgstr "reference"
+
+#: models.py:130 models.py:485
+msgctxt "key for text search"
+msgid "name"
+msgstr "nom"
+
+#: models.py:134 models.py:517 tests.py:1594
+msgctxt "key for text search"
+msgid "period"
+msgstr "periode"
+
+#: models.py:138 models.py:513 tests.py:1625
+msgctxt "key for text search"
+msgid "remain"
+msgstr "vestige"
+
+#: models.py:142 models.py:473 tests.py:1602
+msgctxt "key for text search"
+msgid "town"
+msgstr "commune"
+
+#: models.py:146 models.py:541
+msgctxt "key for text search"
+msgid "comment"
+msgstr "commentaire"
+
+#: models.py:150
+msgctxt "key for text search"
+msgid "locality-ngi"
+msgstr "lieu-dit-ign"
+
+#: models.py:154
+msgctxt "key for text search"
+msgid "locality-cadastral"
+msgstr "lieu-dit-cadastre"
+
+#: models.py:158
+msgctxt "key for text search"
+msgid "shipwreck-name"
+msgstr "nom-epave"
+
+#: models.py:163
+msgctxt "key for text search"
+msgid "oceanographic-service-localisation"
+msgstr "localisation-shom"
+
+#: models.py:167
+msgctxt "key for text search"
+msgid "shipwreck-code"
+msgstr "code-epave"
+
+#: models.py:171
+msgctxt "key for text search"
+msgid "sinking-date"
+msgstr "date-naufrage"
+
+#: models.py:175
+msgctxt "key for text search"
+msgid "discovery-area"
+msgstr "zone-decouverte"
+
#: models.py:193
msgid "Top operation"
msgstr "Opération chapeau"
@@ -848,6 +913,156 @@ msgstr "Responsable du suivi scientifique - Organisation (nom)"
msgid "Archaeological sites (reference)"
msgstr "Entités archéologiques (référence)"
+#: models.py:461 models.py:1376 tests.py:1597
+msgctxt "key for text search"
+msgid "year"
+msgstr "annee"
+
+#: models.py:465
+msgctxt "key for text search"
+msgid "operation-code"
+msgstr "code-operation"
+
+#: models.py:469 models.py:1388
+msgctxt "key for text search"
+msgid "patriarche"
+msgstr "patriarche"
+
+#: models.py:477 models.py:1408
+msgctxt "key for text search"
+msgid "parcel"
+msgstr "parcelle"
+
+#: models.py:481
+msgctxt "key for text search"
+msgid "department"
+msgstr "departement"
+
+#: models.py:489
+msgctxt "key for text search"
+msgid "address"
+msgstr "adresse"
+
+#: models.py:493 models.py:1392
+msgctxt "key for text search"
+msgid "type"
+msgstr "type"
+
+#: models.py:497 tests.py:1630
+msgctxt "key for text search"
+msgid "is-open"
+msgstr "est-ouvert"
+
+#: models.py:501
+msgctxt "key for text search"
+msgid "in-charge"
+msgstr "responsable-suivi"
+
+#: models.py:505
+msgctxt "key for text search"
+msgid "scientist"
+msgstr "scientifique"
+
+#: models.py:509
+msgctxt "key for text search"
+msgid "operator"
+msgstr "operateur"
+
+#: models.py:521
+msgctxt "key for text search"
+msgid "start-before"
+msgstr "commence-avant"
+
+#: models.py:525
+msgctxt "key for text search"
+msgid "start-after"
+msgstr "commence-apres"
+
+#: models.py:529
+msgctxt "key for text search"
+msgid "end-before"
+msgstr "fini-apres"
+
+#: models.py:533
+msgctxt "key for text search"
+msgid "end-after"
+msgstr "fini-avant"
+
+#: models.py:537
+msgctxt "key for text search"
+msgid "relation-types"
+msgstr "type-relation"
+
+#: models.py:545
+msgctxt "key for text search"
+msgid "abstract"
+msgstr "resume"
+
+#: models.py:550
+msgctxt "key for text search"
+msgid "scientific-documentation-comment"
+msgstr "commentaire-documentation-scientifique"
+
+#: models.py:554
+msgctxt "key for text search"
+msgid "record-quality"
+msgstr "qualite-enregistrement"
+
+#: models.py:559
+msgctxt "key for text search"
+msgid "report-processing"
+msgstr "traitement-rapport"
+
+#: models.py:564
+msgctxt "key for text search"
+msgid "virtual-operation"
+msgstr "operation-virtuelle"
+
+#: models.py:569
+msgctxt "key for text search"
+msgid "site"
+msgstr "site"
+
+#: models.py:573 models.py:1426
+msgctxt "key for text search"
+msgid "created-by"
+msgstr "cree-par"
+
+#: models.py:577 models.py:1430
+msgctxt "key for text search"
+msgid "modified-by"
+msgstr "modifie-par"
+
+#: models.py:581
+msgctxt "key for text search"
+msgid "documentation-received"
+msgstr "documentation-recue"
+
+#: models.py:585
+msgctxt "key for text search"
+msgid "documentation-deadline-before"
+msgstr "documentation-date-limite-avant"
+
+#: models.py:589
+msgctxt "key for text search"
+msgid "documentation-deadline-after"
+msgstr "documentation-date-limite-après"
+
+#: models.py:593
+msgctxt "key for text search"
+msgid "finds-received"
+msgstr "mobilier-recu"
+
+#: models.py:597
+msgctxt "key for text search"
+msgid "finds-deadline-before"
+msgstr "mobilier-date-limite-avant"
+
+#: models.py:601
+msgctxt "key for text search"
+msgid "finds-deadline-after"
+msgstr "mobilier-date-limite-apres"
+
#: models.py:615 templates/ishtar/sheet_operation.html:57
msgid "Closing date"
msgstr "Date de clôture"
@@ -971,6 +1186,146 @@ msgstr "Types d'acte"
msgid "Ref."
msgstr "Réf."
+#: models.py:1380
+msgctxt "key for text search"
+msgid "index"
+msgstr "index"
+
+#: models.py:1384
+msgctxt "key for text search"
+msgid "other-ref"
+msgstr "autre-ref"
+
+#: models.py:1396
+msgctxt "key for text search"
+msgid "indexed"
+msgstr "indexe"
+
+#: models.py:1400
+msgctxt "key for text search"
+msgid "operation-town"
+msgstr "operation-commune"
+
+#: models.py:1404
+msgctxt "key for text search"
+msgid "file-town"
+msgstr "dossier-commune"
+
+#: models.py:1414
+msgctxt "key for text search"
+msgid "operation-department"
+msgstr "operation-departement"
+
+#: models.py:1418
+msgctxt "key for text search"
+msgid "file-department"
+msgstr "dossier-departement"
+
+#: models.py:1422
+msgctxt "key for text search"
+msgid "object"
+msgstr "objet"
+
+#: models.py:1434
+msgctxt "key for text search"
+msgid "signature-before"
+msgstr "signature-avant"
+
+#: models.py:1438
+msgctxt "key for text search"
+msgid "signature-after"
+msgstr "signature-apres"
+
+#: models.py:1442
+msgctxt "key for text search"
+msgid "file-name"
+msgstr "dossier-nom"
+
+#: models.py:1446
+msgctxt "key for text search"
+msgid "general-contractor"
+msgstr "amenageur"
+
+#: models.py:1451
+msgctxt "key for text search"
+msgid "general-contractor-organization"
+msgstr "amenageur-organisation"
+
+#: models.py:1456
+msgctxt "key for text search"
+msgid "file-reference"
+msgstr "dossier-reference"
+
+#: models.py:1460
+msgctxt "key for text search"
+msgid "file-year"
+msgstr "dossier-annee"
+
+#: models.py:1464
+msgctxt "key for text search"
+msgid "file-other-reference"
+msgstr "dossier-autre-reference"
+
+#: models.py:1468
+msgctxt "key for text search"
+msgid "file-in-charge"
+msgstr "dossier-responsable"
+
+#: models.py:1472
+msgctxt "key for text search"
+msgid "file-permit-reference"
+msgstr "dossier-ref-permis"
+
+#: models.py:1476
+msgctxt "key for text search"
+msgid "treatment-name"
+msgstr "traitement-nom"
+
+#: models.py:1480
+msgctxt "key for text search"
+msgid "treatment-reference"
+msgstr "traitement-reference"
+
+#: models.py:1484
+msgctxt "key for text search"
+msgid "treatment-year"
+msgstr "traitement-annee"
+
+#: models.py:1488
+msgctxt "key for text search"
+msgid "treatment-index"
+msgstr "traitement-index"
+
+#: models.py:1492
+msgctxt "key for text search"
+msgid "treatment-type"
+msgstr "traitement-type"
+
+#: models.py:1496
+msgctxt "key for text search"
+msgid "treatment-file-name"
+msgstr "dossier-traitement-nom"
+
+#: models.py:1500
+msgctxt "key for text search"
+msgid "treatment-file-reference"
+msgstr "dossier-traitement-reference"
+
+#: models.py:1504
+msgctxt "key for text search"
+msgid "treatment-file-year"
+msgstr "dossier-traitement-annee"
+
+#: models.py:1508
+msgctxt "key for text search"
+msgid "treatment-file-index"
+msgstr "dossier-traitement-index"
+
+#: models.py:1512
+msgctxt "key for text search"
+msgid "treatment-file-type"
+msgstr "dossier-traitement-type"
+
#: models.py:1530
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
@@ -1431,15 +1786,15 @@ msgstr "Mobilier par Unités d'Enregistrement"
msgid "This act is indexed!"
msgstr "Cet acte est indexé !"
-#: tests.py:512
+#: tests.py:511
msgid "New objects will be created."
msgstr "De nouveaux objets vont être créés."
-#: tests.py:542
+#: tests.py:541
msgid "This line have been already imported."
msgstr "Cette ligne a déjà été importée."
-#: tests.py:578
+#: tests.py:577
msgid ""
"The following error(s) has been encountered while parsing the source file:"
msgstr ""
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index 5588ece6b..187347a0d 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -11,7 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-08-15 02:09+0000\n"
+"PO-Revision-Date: 2018-08-15 03:31+0000\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -213,6 +213,16 @@ msgstr "Contenants"
msgid "Warehouse types"
msgstr "Types de lieu de conservation"
+#: models.py:58
+msgctxt "key for text search"
+msgid "name"
+msgstr "nom"
+
+#: models.py:62 models.py:323
+msgctxt "key for text search"
+msgid "type"
+msgstr "type"
+
#: models.py:81
msgid "Documents"
msgstr "Documents"
@@ -277,6 +287,21 @@ msgstr "Localisation précise"
msgid "Type"
msgstr "Type"
+#: models.py:315
+msgctxt "key for text search"
+msgid "location"
+msgstr "localisation"
+
+#: models.py:319
+msgctxt "key for text search"
+msgid "responsible-warehouse"
+msgstr "depot"
+
+#: models.py:327
+msgctxt "key for text search"
+msgid "reference"
+msgstr "reference"
+
#: models.py:336
msgid "Location (warehouse)"
msgstr "Localisation (lieu de conservation)"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index a663929ae..15d532bfe 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -1525,6 +1525,16 @@ msgstr "Clé de fusion"
msgid "Organization types"
msgstr "Types d'organisation"
+#: models.py:2522 models.py:2650 models.py:3021
+msgctxt "key for text search"
+msgid "name"
+msgstr ""
+
+#: models.py:2526 models.py:2662 models.py:3033 models.py:3303
+msgctxt "key for text search"
+msgid "type"
+msgstr ""
+
#: models.py:2537 models.py:2697 models.py:3171 models.py:3616
msgid "Cached name"
msgstr "Nom en cache"
@@ -1569,6 +1579,26 @@ msgstr "Mme"
msgid "Doctor"
msgstr "Dr."
+#: models.py:2654 models.py:3025
+msgctxt "key for text search"
+msgid "surname"
+msgstr ""
+
+#: models.py:2658 models.py:3029
+msgctxt "key for text search"
+msgid "email"
+msgstr ""
+
+#: models.py:2666 models.py:3037
+msgctxt "key for text search"
+msgid "organization"
+msgstr ""
+
+#: models.py:2670
+msgctxt "key for text search"
+msgid "has-account"
+msgstr ""
+
#: models.py:2690
msgid "Contact type"
msgstr "Type de contact"
@@ -1605,6 +1635,11 @@ msgstr "Profils d'utilisateurs"
msgid " - duplicate"
msgstr "- copie"
+#: models.py:3017
+msgctxt "key for text search"
+msgid "username"
+msgstr ""
+
#: models.py:3050
msgid "Advanced shortcut menu"
msgstr "Menu de raccourci (avancé)"
@@ -1653,6 +1688,46 @@ msgstr "Type de licence"
msgid "License types"
msgstr "Types de licence"
+#: models.py:3295
+msgctxt "key for text search"
+msgid "author"
+msgstr ""
+
+#: models.py:3299
+msgctxt "key for text search"
+msgid "title"
+msgstr ""
+
+#: models.py:3307
+msgctxt "key for text search"
+msgid "reference"
+msgstr ""
+
+#: models.py:3311
+msgctxt "key for text search"
+msgid "internal-reference"
+msgstr ""
+
+#: models.py:3315
+msgctxt "key for text search"
+msgid "description"
+msgstr ""
+
+#: models.py:3319
+msgctxt "key for text search"
+msgid "comment"
+msgstr ""
+
+#: models.py:3323
+msgctxt "key for text search"
+msgid "additional-information"
+msgstr ""
+
+#: models.py:3327
+msgctxt "key for text search"
+msgid "has-duplicate"
+msgstr ""
+
#: models.py:3337
msgid "Index"
msgstr "Index"
@@ -3515,20 +3590,20 @@ msgstr "Pas de résultats"
msgid "Loading..."
msgstr "Chargement..."
-#: utils.py:91
+#: utils.py:88
msgid "You don't have sufficient permissions to do this action."
msgstr ""
"Vous n'avez pas les permissions suffisantes pour effectuer cette action."
-#: utils.py:268
+#: utils.py:265
msgid " (...)"
msgstr " (...)"
-#: utils.py:341
+#: utils.py:338
msgid "Information"
msgstr "Information"
-#: utils.py:342
+#: utils.py:339
msgid "Load another random image?"
msgstr "Charger une autre image au hasard ?"