diff options
21 files changed, 1330 insertions, 1231 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 522c69deb..91effb397 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -40,7 +40,7 @@ from ishtar_common.forms import FinalForm, FormSet, \ reverse_lazy, get_form_selection, TableSelect, ManageOldType from ishtar_common.forms_common import get_town_field, SourceSelect from archaeological_operations.forms import OperationSelect, ParcelField,\ - RecordRelationsForm as OpeRecordRelationsForm + RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase class OperationFormSelection(forms.Form): @@ -77,7 +77,7 @@ class RecordSelect(TableSelect): datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) parcel = ParcelField(label=_(u"Parcel (section/number/public domain)")) - relation_types = forms.MultipleChoiceField( + cr_relation_types = forms.MultipleChoiceField( label=_(u"Search within relations"), choices=[], widget=forms.CheckboxSelectMultiple) @@ -87,8 +87,8 @@ class RecordSelect(TableSelect): self.fields['datings__period'].help_text = Period.get_help() self.fields['unit'].choices = models.Unit.get_types() self.fields['unit'].help_text = models.Unit.get_help() - self.fields['relation_types'].choices = models.RelationType.get_types( - empty_first=False) + self.fields['cr_relation_types'].choices = \ + models.RelationType.get_types(empty_first=False) self.fields['ope_relation_types'].choices = OpeRelationType.get_types( empty_first=False) @@ -98,9 +98,9 @@ class RecordSelect(TableSelect): ids.append('parcel_0') ids.append('parcel_1') ids.append('parcel_2') - ids.pop(ids.index('relation_types')) - for idx, c in enumerate(self.fields['relation_types'].choices): - ids.append('relation_types_{}'.format(idx)) + ids.pop(ids.index('cr_relation_types')) + for idx, c in enumerate(self.fields['cr_relation_types'].choices): + ids.append('cr_relation_types_{}'.format(idx)) ids.pop(ids.index('ope_relation_types')) for idx, c in enumerate(self.fields['ope_relation_types'].choices): ids.append('ope_relation_types_{}'.format(idx)) @@ -302,7 +302,8 @@ class RecordRelationsForm(OpeRecordRelationsForm): if crs: self.fields['right_record'].choices = [('', '-' * 2)] + crs -RecordRelationsFormSet = formset_factory(RecordRelationsForm, can_delete=True) +RecordRelationsFormSet = formset_factory( + RecordRelationsForm, can_delete=True, formset=RecordRelationsFormSetBase) RecordRelationsFormSet.form_label = _(u"Relations") diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 2e507ce15..1617d6692 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -8,11 +8,11 @@ msgid "" msgstr "" -#: forms.py:47 forms.py:51 models.py:216 models.py:599 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:217 models.py:600 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:141 models.py:218 models.py:567 +#: forms.py:59 forms.py:141 models.py:219 models.py:568 msgid "ID" msgstr "" @@ -52,7 +52,7 @@ msgstr "" msgid "Search within relations" msgstr "" -#: forms.py:111 forms.py:357 views.py:92 +#: forms.py:111 forms.py:358 views.py:92 msgid "Context record search" msgstr "" @@ -64,48 +64,48 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:140 models.py:181 models.py:214 models.py:569 +#: forms.py:140 models.py:181 models.py:215 models.py:570 msgid "Parcel" msgstr "" -#: forms.py:143 models.py:219 models.py:570 +#: forms.py:143 models.py:220 models.py:571 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "" -#: forms.py:145 models.py:220 +#: forms.py:145 models.py:221 msgid "General comment" msgstr "" -#: forms.py:148 models.py:267 +#: forms.py:148 models.py:268 msgid "Excavation technique" msgstr "" -#: forms.py:149 models.py:224 +#: forms.py:149 models.py:225 msgid "Length (m)" msgstr "" -#: forms.py:150 models.py:225 +#: forms.py:150 models.py:226 msgid "Width (m)" msgstr "" -#: forms.py:151 models.py:226 +#: forms.py:151 models.py:227 msgid "Thickness (m)" msgstr "" -#: forms.py:152 models.py:228 +#: forms.py:152 models.py:229 msgid "Diameter (m)" msgstr "" -#: forms.py:153 models.py:229 +#: forms.py:153 models.py:230 msgid "Depth (m)" msgstr "" -#: forms.py:155 models.py:231 +#: forms.py:155 models.py:232 msgid "Depth of appearance (m)" msgstr "" -#: forms.py:156 forms.py:376 models.py:241 models.py:568 +#: forms.py:156 forms.py:377 models.py:242 models.py:569 msgid "Context record type" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: forms.py:162 models.py:233 +#: forms.py:162 models.py:234 msgid "Location" msgstr "" @@ -140,7 +140,7 @@ msgstr "" msgid "Start date" msgstr "" -#: forms.py:256 models.py:58 models.py:223 +#: forms.py:256 models.py:58 models.py:224 msgid "End date" msgstr "" @@ -152,88 +152,88 @@ msgstr "" msgid "Dating type" msgstr "" -#: forms.py:285 ishtar_menu.py:29 models.py:641 +#: forms.py:285 ishtar_menu.py:29 models.py:642 msgid "Context record" msgstr "" -#: forms.py:306 +#: forms.py:307 msgid "Relations" msgstr "" -#: forms.py:310 forms.py:318 models.py:244 +#: forms.py:311 forms.py:319 models.py:245 #: templates/ishtar/sheet_contextrecord.html:44 msgid "Interpretation" msgstr "" -#: forms.py:314 +#: forms.py:315 msgid "Comments on dating" msgstr "" -#: forms.py:316 models.py:243 +#: forms.py:317 models.py:244 msgid "Filling" msgstr "" -#: forms.py:320 models.py:264 +#: forms.py:321 models.py:265 msgid "Activity" msgstr "" -#: forms.py:322 models.py:262 +#: forms.py:323 models.py:263 msgid "Identification" msgstr "" -#: forms.py:324 models.py:247 +#: forms.py:325 models.py:248 msgid "TAQ" msgstr "" -#: forms.py:325 models.py:251 +#: forms.py:326 models.py:252 msgid "Estimated TAQ" msgstr "" -#: forms.py:327 models.py:254 +#: forms.py:328 models.py:255 msgid "TPQ" msgstr "" -#: forms.py:328 models.py:258 +#: forms.py:329 models.py:259 msgid "Estimated TPQ" msgstr "" -#: forms.py:343 +#: forms.py:344 msgid "Operation search" msgstr "" -#: forms.py:345 +#: forms.py:346 msgid "You should select an operation." msgstr "" -#: forms.py:350 +#: forms.py:351 msgid "Would you like to delete this context record?" msgstr "" -#: forms.py:359 +#: forms.py:360 msgid "You should select a context record." msgstr "" -#: forms.py:364 +#: forms.py:365 msgid "Year of the operation" msgstr "" -#: forms.py:366 +#: forms.py:367 msgid "Numeric reference" msgstr "" -#: forms.py:372 +#: forms.py:373 msgid "Town of the operation" msgstr "" -#: forms.py:374 +#: forms.py:375 msgid "Period of the context record" msgstr "" -#: forms.py:389 +#: forms.py:390 msgid "Documentation search" msgstr "" -#: forms.py:391 +#: forms.py:392 msgid "You should select a document." msgstr "" @@ -321,7 +321,7 @@ msgstr "" msgid "Documentation types" msgstr "" -#: models.py:172 models.py:571 +#: models.py:172 models.py:572 msgid "Periods" msgstr "" @@ -345,172 +345,172 @@ msgstr "" msgid "Parcel (year)" msgstr "" -#: models.py:211 +#: models.py:212 msgid "External ID" msgstr "" -#: models.py:213 +#: models.py:214 msgid "External ID is set automatically" msgstr "" -#: models.py:221 +#: models.py:222 msgid "Date d'ouverture" msgstr "" -#: models.py:234 +#: models.py:235 msgid "A short description of the location of the context record" msgstr "" -#: models.py:239 +#: models.py:240 msgid "Comment on datings" msgstr "" -#: models.py:248 +#: models.py:249 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:252 +#: models.py:253 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:255 +#: models.py:256 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:259 +#: models.py:260 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:270 +#: models.py:271 msgid "Point" msgstr "" -#: models.py:271 +#: models.py:272 msgid "Polygon" msgstr "" -#: models.py:272 +#: models.py:273 msgid "Cached name" msgstr "" -#: models.py:276 models.py:277 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:277 models.py:278 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:279 +#: models.py:280 msgid "Can view all Context Records" msgstr "" -#: models.py:281 +#: models.py:282 msgid "Can view own Context Record" msgstr "" -#: models.py:283 +#: models.py:284 msgid "Can add own Context Record" msgstr "" -#: models.py:285 +#: models.py:286 msgid "Can change own Context Record" msgstr "" -#: models.py:287 +#: models.py:288 msgid "Can delete own Context Record" msgstr "" -#: models.py:297 +#: models.py:298 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:501 +#: models.py:502 msgid "Inverse relation" msgstr "" -#: models.py:505 models.py:528 models.py:566 +#: models.py:506 models.py:529 models.py:567 msgid "Relation type" msgstr "" -#: models.py:506 +#: models.py:507 msgid "Relation types" msgstr "" -#: models.py:523 +#: models.py:524 msgid "ID (left)" msgstr "" -#: models.py:524 +#: models.py:525 msgid "Context record type (left)" msgstr "" -#: models.py:525 +#: models.py:526 msgid "Parcel (left)" msgstr "" -#: models.py:526 +#: models.py:527 msgid "Description (left)" msgstr "" -#: models.py:527 +#: models.py:528 msgid "Periods (left)" msgstr "" -#: models.py:529 +#: models.py:530 msgid "ID (right)" msgstr "" -#: models.py:530 +#: models.py:531 msgid "Context record type (right)" msgstr "" -#: models.py:531 +#: models.py:532 msgid "Parcel (right)" msgstr "" -#: models.py:532 +#: models.py:533 msgid "Description (right)" msgstr "" -#: models.py:533 +#: models.py:534 msgid "Periods (right)" msgstr "" -#: models.py:542 +#: models.py:543 msgid "Record relation" msgstr "" -#: models.py:543 +#: models.py:544 msgid "Record relations" msgstr "" -#: models.py:626 +#: models.py:627 msgid "Context record documentation" msgstr "" -#: models.py:627 +#: models.py:628 msgid "Context record documentations" msgstr "" -#: models.py:630 +#: models.py:631 msgid "Can view all Context record sources" msgstr "" -#: models.py:632 +#: models.py:633 msgid "Can view own Context record source" msgstr "" -#: models.py:634 +#: models.py:635 msgid "Can add own Context record source" msgstr "" -#: models.py:636 +#: models.py:637 msgid "Can change own Context record source" msgstr "" -#: models.py:638 +#: models.py:639 msgid "Can delete own Context record source" msgstr "" diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index b838b9a57..883433517 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -204,7 +204,8 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, ImageModel, OwnPerms, 'archaeological_sites': 'operation__archaeological_sites__pk', 'cached_label': 'cached_label__icontains', } - RELATION_TYPES_PREFIX = {'ope_relation_types': 'operation__'} + RELATION_TYPES_PREFIX = {'ope_relation_types': 'operation__', + 'cr_relation_types': ''} RELATIVE_SESSION_NAMES = [ ('operation', 'operation__pk'), ('file', 'operation__associated_file__pk')] diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index e697459b5..df05f4898 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -369,7 +369,7 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase): # test search between relations response = c.get(reverse('get-contextrecord'), {'label': 'cr 1', - 'relation_types_0': self.cr_rel_type.pk}) + 'cr_relation_types_0': self.cr_rel_type.pk}) self.assertEqual(json.loads(response.content)['total'], 2) # test search between related operations first_ope = self.operations[0] diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py index fd48ef3d9..cbeb1c1d2 100644 --- a/archaeological_context_records/wizards.py +++ b/archaeological_context_records/wizards.py @@ -134,6 +134,14 @@ class RecordModifWizard(RecordWizard): model = models.ContextRecord filter_owns = {'selec-record_modification': ['pk']} + def get_form_kwargs(self, step, **kwargs): + kwargs = super(RecordModifWizard, self).get_form_kwargs( + step, **kwargs) + if step != "relations-record_modification": + return kwargs + kwargs["left_record"] = self.get_current_object() + return kwargs + class RecordDeletionWizard(DeletionWizard): model = models.ContextRecord diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 2284a6fb5..c9312712c 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -6,6 +6,7 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index ee010094b..2e7cc75f5 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -36,7 +36,7 @@ from ishtar_common.models import valid_id, valid_ids, get_current_profile, \ from archaeological_operations.models import Period, ArchaeologicalSite, \ RelationType as OpeRelationType from archaeological_context_records.models import DatingType, DatingQuality, \ - ContextRecord + ContextRecord, RelationType as CRRelationType import models from ishtar_common.forms import FormSet, FloatField, \ @@ -361,9 +361,18 @@ class FindSelect(TableSelect): reverse_lazy('autocomplete-archaeologicalsite'), associated_model=ArchaeologicalSite), validators=[valid_id(ArchaeologicalSite)]) + base_finds__context_record = forms.IntegerField( + label=_("Context record"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-contextrecord'), + associated_model=ContextRecord), + validators=[valid_id(ContextRecord)]) ope_relation_types = forms.MultipleChoiceField( label=_(u"Search within related operations"), choices=[], widget=widgets.CheckboxSelectMultiple) + cr_relation_types = forms.MultipleChoiceField( + label=_(u"Search within related context records"), choices=[], + widget=widgets.CheckboxSelectMultiple) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) material_types = forms.ChoiceField(label=_(u"Material type"), choices=[]) object_types = forms.ChoiceField(label=_(u"Object type"), choices=[]) @@ -417,12 +426,17 @@ class FindSelect(TableSelect): models.RemarkabilityType.get_help() self.fields['ope_relation_types'].choices = OpeRelationType.get_types( empty_first=False) + self.fields['cr_relation_types'].choices = CRRelationType.get_types( + empty_first=False) def get_input_ids(self): ids = super(FindSelect, self).get_input_ids() ids.pop(ids.index('ope_relation_types')) for idx, c in enumerate(self.fields['ope_relation_types'].choices): ids.append('ope_relation_types_{}'.format(idx)) + ids.pop(ids.index('cr_relation_types')) + for idx, c in enumerate(self.fields['cr_relation_types'].choices): + ids.append('cr_relation_types_{}'.format(idx)) return ids diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 30d8e51ae..446d67fc1 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -24,7 +24,6 @@ import logging from django import forms from django.conf import settings from django.core import validators -from django.db.models import Max from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ @@ -39,8 +38,7 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \ from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \ ManageOldType, get_form_selection -from ishtar_common.forms_common import SourceForm, SourceSelect, \ - SourceDeletionForm +from ishtar_common.forms_common import SourceSelect from ishtar_common import widgets @@ -185,7 +183,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form): self.fields['treatment_state'].choices = \ models.TreatmentState.get_types( initial=self.init_data.get('treatment_state'), - ) + ) self.fields['treatment_state'].help_text = \ models.TreatmentState.get_help() # TODO @@ -250,6 +248,7 @@ class TreatmentModifyForm(BaseTreatmentForm): fields[key] = value if key == 'year': fields['index'] = idx + fields.pop('target_is_basket') self.fields = fields def clean(self, *args, **kwargs): @@ -489,9 +488,9 @@ class TreatmentFileForm(ManageOldType, forms.Form): creation_date = forms.DateField(label=_(u"Start date"), required=False, widget=widgets.JQueryDate, initial=lambda: datetime.datetime.now()) - reception_date = forms.DateField(label=_(u"Reception date"), required=False, - widget=widgets.JQueryDate, - initial=lambda: datetime.datetime.now()) + reception_date = forms.DateField( + label=_(u"Reception date"), required=False, widget=widgets.JQueryDate, + initial=lambda: datetime.datetime.now()) end_date = forms.DateField(label=_(u"Closing date"), required=False, widget=widgets.JQueryDate) @@ -607,8 +606,8 @@ class AdministrativeActTreatmentFileSelect(TableSelect): label=_(u"Treatment request index")) treatment_file__internal_reference = forms.CharField( max_length=200, label=_(u"Treatment request internal reference")) - treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"), - choices=[]) + treatment_file__type = forms.ChoiceField( + label=_(u"Treatment request type"), choices=[]) history_modifier = forms.IntegerField( label=_(u"Modified by"), widget=widgets.JQueryAutoComplete( @@ -703,8 +702,8 @@ class TreatmentFileSourceSelect(SourceSelect): label=_(u"Treatment request index")) treatment_file__internal_reference = forms.CharField( max_length=200, label=_(u"Treatment request internal reference")) - treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"), - choices=[]) + treatment_file__type = forms.ChoiceField( + label=_(u"Treatment request type"), choices=[]) def __init__(self, *args, **kwargs): super(TreatmentFileSourceSelect, self).__init__(*args, **kwargs) diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index d2c407d1c..4a9cc517c 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -9,63 +9,63 @@ msgid "" msgstr "" -#: forms.py:93 forms.py:97 models_finds.py:519 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:519 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:126 ishtar_menu.py:32 models_finds.py:683 models_finds.py:1114 -#: models_finds.py:1135 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:686 models_finds.py:1117 +#: models_finds.py:1138 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:140 forms.py:337 forms.py:605 models_finds.py:150 -#: models_finds.py:613 +#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:150 +#: models_finds.py:616 msgid "Free ID" msgstr "" -#: forms.py:142 models_finds.py:666 +#: forms.py:144 models_finds.py:669 msgid "Previous ID" msgstr "" -#: forms.py:143 forms.py:368 forms_treatments.py:134 models_finds.py:154 -#: models_finds.py:614 models_treatments.py:128 +#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:154 +#: models_finds.py:617 models_treatments.py:128 msgid "Description" msgstr "" -#: forms.py:146 forms.py:370 models_finds.py:163 +#: forms.py:148 forms.py:389 models_finds.py:163 msgid "Batch/object" msgstr "" -#: forms.py:148 models_finds.py:643 +#: forms.py:150 models_finds.py:646 msgid "Is complete?" msgstr "" -#: forms.py:151 forms.py:358 forms.py:609 models_finds.py:50 +#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:50 msgid "Material type" msgstr "" -#: forms.py:154 forms.py:362 models_finds.py:62 models_finds.py:618 +#: forms.py:155 forms.py:381 models_finds.py:62 models_finds.py:621 msgid "Conservatory state" msgstr "" -#: forms.py:157 models_finds.py:620 +#: forms.py:158 models_finds.py:623 msgid "Conservatory comment" msgstr "" -#: forms.py:160 models_finds.py:112 models_finds.py:646 +#: forms.py:161 models_finds.py:112 models_finds.py:649 msgid "Object types" msgstr "" -#: forms.py:164 forms.py:361 models_finds.py:71 +#: forms.py:164 forms.py:380 models_finds.py:71 msgid "Preservation type" msgstr "" -#: forms.py:167 forms.py:364 models_finds.py:648 +#: forms.py:167 forms.py:383 models_finds.py:651 msgid "Integrity / interest" msgstr "" -#: forms.py:170 forms.py:366 models_finds.py:651 +#: forms.py:170 forms.py:385 models_finds.py:654 msgid "Remarkability" msgstr "" @@ -73,15 +73,15 @@ msgstr "" msgid "Point of topographic reference" msgstr "" -#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:205 +#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:209 msgid "X" msgstr "" -#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:206 +#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:210 msgid "Y" msgstr "" -#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:207 +#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:211 msgid "Z" msgstr "" @@ -101,69 +101,69 @@ msgstr "" msgid "Estimated error for Z" msgstr "" -#: forms.py:188 models_finds.py:655 +#: forms.py:188 models_finds.py:658 msgid "Length (cm)" msgstr "" -#: forms.py:189 models_finds.py:656 +#: forms.py:189 models_finds.py:659 msgid "Width (cm)" msgstr "" -#: forms.py:190 models_finds.py:657 +#: forms.py:190 models_finds.py:660 msgid "Height (cm)" msgstr "" -#: forms.py:191 models_finds.py:658 +#: forms.py:191 models_finds.py:661 msgid "Diameter (cm)" msgstr "" -#: forms.py:192 models_finds.py:659 +#: forms.py:192 models_finds.py:662 msgid "Thickness (cm)" msgstr "" -#: forms.py:193 forms.py:610 models_finds.py:625 +#: forms.py:193 forms.py:634 models_finds.py:628 msgid "Volume (l)" msgstr "" -#: forms.py:194 forms.py:611 models_finds.py:626 +#: forms.py:194 forms.py:635 models_finds.py:629 msgid "Weight (g)" msgstr "" -#: forms.py:196 models_finds.py:660 +#: forms.py:196 models_finds.py:663 msgid "Dimensions comment" msgstr "" -#: forms.py:197 forms.py:612 models_finds.py:629 +#: forms.py:197 forms.py:636 models_finds.py:632 msgid "Find number" msgstr "" -#: forms.py:199 models_finds.py:654 +#: forms.py:199 models_finds.py:657 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:200 models_finds.py:662 +#: forms.py:200 models_finds.py:665 msgid "Mark" msgstr "" -#: forms.py:201 forms.py:371 models_finds.py:668 +#: forms.py:201 forms.py:390 models_finds.py:671 msgid "Check" msgstr "" -#: forms.py:203 models_finds.py:670 +#: forms.py:203 models_finds.py:673 msgid "Check date" msgstr "" -#: forms.py:204 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:155 models_finds.py:663 models_treatments.py:127 +#: forms.py:204 forms_treatments.py:136 forms_treatments.py:478 +#: models_finds.py:155 models_finds.py:666 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "" -#: forms.py:207 models_finds.py:664 +#: forms.py:207 models_finds.py:667 msgid "Comment on dating" msgstr "" -#: forms.py:208 models_finds.py:672 +#: forms.py:208 models_finds.py:675 msgid "Estimated value" msgstr "" @@ -178,181 +178,186 @@ msgid "" "p>" msgstr "" -#: forms.py:285 +#: forms.py:295 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: forms.py:294 +#: forms.py:304 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:300 forms.py:331 models_finds.py:637 +#: forms.py:310 forms.py:341 models_finds.py:640 msgid "Dating" msgstr "" -#: forms.py:305 forms.py:357 +#: forms.py:315 forms.py:376 msgid "Period" msgstr "" -#: forms.py:306 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1140 models_treatments.py:130 models_treatments.py:309 -#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 +#: forms.py:316 forms_treatments.py:138 forms_treatments.py:282 +#: forms_treatments.py:480 models_finds.py:1143 models_treatments.py:130 +#: models_treatments.py:309 templates/ishtar/sheet_find.html:95 +#: templates/ishtar/sheet_find.html:137 msgid "Start date" msgstr "" -#: forms.py:308 models_finds.py:1141 models_treatments.py:310 -#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 +#: forms.py:318 models_finds.py:1144 models_treatments.py:310 +#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 msgid "End date" msgstr "" -#: forms.py:309 +#: forms.py:319 msgid "Quality" msgstr "" -#: forms.py:311 +#: forms.py:321 msgid "Dating type" msgstr "" -#: forms.py:313 +#: forms.py:323 msgid "Precise dating" msgstr "" -#: forms.py:335 models_finds.py:187 +#: forms.py:345 models_finds.py:187 msgid "Short ID" msgstr "" -#: forms.py:336 models_finds.py:190 +#: forms.py:346 models_finds.py:190 msgid "Complete ID" msgstr "" -#: forms.py:340 forms_treatments.py:54 forms_treatments.py:96 -#: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406 -#: forms_treatments.py:489 models_treatments.py:103 models_treatments.py:483 +#: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 +#: forms_treatments.py:328 forms_treatments.py:400 forms_treatments.py:450 +#: forms_treatments.py:578 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "" -#: forms.py:342 +#: forms.py:352 msgid "Operation's number (index by year)" msgstr "" -#: forms.py:345 +#: forms.py:355 msgid "Code PATRIARCHE" msgstr "" -#: forms.py:349 +#: forms.py:359 msgid "Archaeological site" msgstr "" -#: forms.py:355 +#: forms.py:371 msgid "Search within related operations" msgstr "" -#: forms.py:359 models_finds.py:111 +#: forms.py:374 +msgid "Search within related context records" +msgstr "" + +#: forms.py:378 models_finds.py:111 msgid "Object type" msgstr "" -#: forms.py:372 forms_treatments.py:57 +#: forms.py:391 forms_treatments.py:57 msgid "Has an image?" msgstr "" -#: forms.py:421 +#: forms.py:445 msgid "Warehouse (location)" msgstr "" -#: forms.py:427 +#: forms.py:451 msgid "Warehouse (responsible)" msgstr "" -#: forms.py:432 +#: forms.py:456 msgid "Container ID" msgstr "" -#: forms.py:433 +#: forms.py:457 msgid "Container ref." msgstr "" -#: forms.py:437 forms.py:460 views.py:149 +#: forms.py:461 forms.py:484 views.py:149 msgid "Find search" msgstr "" -#: forms.py:485 templates/ishtar/sheet_treatment.html:46 +#: forms.py:509 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "" -#: forms.py:487 models_finds.py:684 +#: forms.py:511 models_finds.py:687 msgid "Finds" msgstr "" -#: forms.py:499 +#: forms.py:523 msgid "You should at least select one archaeological find." msgstr "" -#: forms.py:602 +#: forms.py:626 msgid "Resulting find" msgstr "" -#: forms.py:607 +#: forms.py:631 msgid "Precise description" msgstr "" -#: forms.py:622 +#: forms.py:646 msgid "Resulting finds" msgstr "" -#: forms.py:627 +#: forms.py:651 msgid "Would you like to delete this find?" msgstr "" -#: forms.py:631 models_treatments.py:91 +#: forms.py:655 models_treatments.py:91 msgid "Upstream find" msgstr "" -#: forms.py:644 +#: forms.py:668 msgid "Archaeological find search" msgstr "" -#: forms.py:646 +#: forms.py:670 msgid "You should select an archaeological find." msgstr "" -#: forms.py:651 +#: forms.py:675 msgid "Year of the operation" msgstr "" -#: forms.py:653 +#: forms.py:677 msgid "Numeric reference" msgstr "" -#: forms.py:660 +#: forms.py:684 msgid "Period of the archaeological find" msgstr "" -#: forms.py:662 +#: forms.py:686 msgid "Material type of the archaeological find" msgstr "" -#: forms.py:664 +#: forms.py:688 msgid "Description of the archaeological find" msgstr "" -#: forms.py:676 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:700 forms_treatments.py:679 forms_treatments.py:705 msgid "Documentation search" msgstr "" -#: forms.py:678 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:702 forms_treatments.py:681 forms_treatments.py:707 msgid "You should select a document." msgstr "" -#: forms.py:695 +#: forms.py:719 msgid "Another basket already exists with this name." msgstr "" -#: forms.py:705 forms.py:709 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:729 forms.py:733 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "" #: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:99 -#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127 +#: templates/ishtar/sheet_find.html:89 templates/ishtar/sheet_find.html:131 msgid "Label" msgstr "" @@ -360,20 +365,20 @@ msgstr "" msgid "Other ref." msgstr "" -#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285 -#: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459 -#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:105 +#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:329 +#: forms_treatments.py:392 forms_treatments.py:401 forms_treatments.py:503 +#: forms_treatments.py:579 forms_treatments.py:646 models_treatments.py:105 #: models_treatments.py:485 msgid "Index" msgstr "" -#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301 -#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:110 -#: models_treatments.py:308 +#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:290 +#: forms_treatments.py:345 forms_treatments.py:667 models_treatments.py:56 +#: models_treatments.py:110 models_treatments.py:308 msgid "Treatment type" msgstr "" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:649 views.py:398 msgid "Treatment search" msgstr "" @@ -382,7 +387,7 @@ msgid "Base treatment" msgstr "" #: forms_treatments.py:103 models_treatments.py:93 models_treatments.py:112 -#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129 +#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 msgid "State" msgstr "" @@ -390,7 +395,7 @@ msgstr "" msgid "Target" msgstr "" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:120 +#: forms_treatments.py:107 forms_treatments.py:461 models_treatments.py:120 msgid "Responsible" msgstr "" @@ -406,16 +411,16 @@ msgstr "" msgid "Container (relevant for packaging)" msgstr "" -#: forms_treatments.py:131 forms_treatments.py:413 +#: forms_treatments.py:131 forms_treatments.py:457 msgid "External ref." msgstr "" -#: forms_treatments.py:136 models_treatments.py:129 +#: forms_treatments.py:132 models_treatments.py:129 msgid "Goal" msgstr "" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:131 -#: models_treatments.py:505 +#: forms_treatments.py:140 forms_treatments.py:282 forms_treatments.py:486 +#: forms_treatments.py:534 models_treatments.py:131 models_treatments.py:505 msgid "Closing date" msgstr "" @@ -465,7 +470,7 @@ msgstr "" msgid "Associated request" msgstr "" -#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 +#: forms_treatments.py:266 forms_treatments.py:441 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" @@ -481,121 +486,149 @@ msgstr "" msgid "Would you like to delete this treatment?" msgstr "" -#: forms_treatments.py:286 forms_treatments.py:334 forms_treatments.py:491 -#: forms_treatments.py:542 +#: forms_treatments.py:280 +msgid "months" +msgstr "" + +#: forms_treatments.py:280 +msgid "years" +msgstr "" + +#: forms_treatments.py:286 forms_treatments.py:538 +msgid "Slicing" +msgstr "" + +#: forms_treatments.py:289 forms_treatments.py:541 +msgid "Date get from" +msgstr "" + +#: forms_treatments.py:292 forms_treatments.py:544 +msgid "Date after" +msgstr "" + +#: forms_treatments.py:294 forms_treatments.py:546 +msgid "Date before" +msgstr "" + +#: forms_treatments.py:330 forms_treatments.py:378 forms_treatments.py:580 +#: forms_treatments.py:631 msgid "Act type" msgstr "" -#: forms_treatments.py:287 forms_treatments.py:492 +#: forms_treatments.py:331 forms_treatments.py:581 msgid "Indexed?" msgstr "" -#: forms_treatments.py:288 forms_treatments.py:493 +#: forms_treatments.py:332 forms_treatments.py:582 msgid "Object" msgstr "" -#: forms_treatments.py:292 forms_treatments.py:497 +#: forms_treatments.py:336 forms_treatments.py:586 msgid "Signature date after" msgstr "" -#: forms_treatments.py:294 forms_treatments.py:499 +#: forms_treatments.py:338 forms_treatments.py:588 msgid "Signature date before" msgstr "" -#: forms_treatments.py:296 forms_treatments.py:573 +#: forms_treatments.py:340 forms_treatments.py:662 msgid "Treatment name" msgstr "" -#: forms_treatments.py:297 forms_treatments.py:574 +#: forms_treatments.py:341 forms_treatments.py:663 msgid "Treatment year" msgstr "" -#: forms_treatments.py:298 forms_treatments.py:575 +#: forms_treatments.py:342 forms_treatments.py:664 msgid "Treatment index" msgstr "" -#: forms_treatments.py:300 forms_treatments.py:577 +#: forms_treatments.py:344 forms_treatments.py:666 msgid "Treatment internal reference" msgstr "" -#: forms_treatments.py:304 forms_treatments.py:511 +#: forms_treatments.py:348 forms_treatments.py:600 msgid "Modified by" msgstr "" -#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:490 +#: forms_treatments.py:398 forms_treatments.py:448 models_treatments.py:490 msgid "Name" msgstr "" -#: forms_treatments.py:355 forms_treatments.py:411 +#: forms_treatments.py:399 forms_treatments.py:455 msgid "Internal ref." msgstr "" -#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:92 -#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:228 +#: forms_treatments.py:402 forms_treatments.py:459 models_treatments.py:92 +#: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:132 +#: templates/ishtar/sheet_find.html:232 msgid "Type" msgstr "" -#: forms_treatments.py:360 +#: forms_treatments.py:404 msgid "In charge" msgstr "" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:499 +#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:499 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:503 +#: forms_treatments.py:416 forms_treatments.py:473 models_treatments.py:503 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:502 +#: forms_treatments.py:429 forms_treatments.py:654 views.py:502 msgid "Treatment request search" msgstr "" -#: forms_treatments.py:439 models_treatments.py:509 +#: forms_treatments.py:483 forms_treatments.py:533 models_treatments.py:509 msgid "Reception date" msgstr "" -#: forms_treatments.py:478 +#: forms_treatments.py:522 msgid "Another treatment request with this index exists for {}." msgstr "" -#: forms_treatments.py:484 +#: forms_treatments.py:528 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: forms_treatments.py:485 +#: forms_treatments.py:529 msgid "Would you like to delete this treatment request?" msgstr "" -#: forms_treatments.py:501 forms_treatments.py:597 +#: forms_treatments.py:532 models_treatments.py:507 +msgid "Creation date" +msgstr "" + +#: forms_treatments.py:542 forms_treatments.py:597 forms_treatments.py:693 +#: models_treatments.py:468 models_treatments.py:492 +msgid "Treatment request type" +msgstr "" + +#: forms_treatments.py:590 forms_treatments.py:686 msgid "Treatment request name" msgstr "" -#: forms_treatments.py:503 forms_treatments.py:599 +#: forms_treatments.py:592 forms_treatments.py:688 msgid "Treatment request year" msgstr "" -#: forms_treatments.py:505 forms_treatments.py:601 +#: forms_treatments.py:594 forms_treatments.py:690 msgid "Treatment request index" msgstr "" -#: forms_treatments.py:507 forms_treatments.py:603 +#: forms_treatments.py:596 forms_treatments.py:692 msgid "Treatment request internal reference" msgstr "" -#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:468 -#: models_treatments.py:492 -msgid "Treatment request type" -msgstr "" - -#: forms_treatments.py:562 +#: forms_treatments.py:651 msgid "You should select a treatment." msgstr "" -#: forms_treatments.py:568 +#: forms_treatments.py:657 msgid "You should select a treatment request." msgstr "" @@ -629,12 +662,12 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1137 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1140 msgid "Administrative act" msgstr "" -#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 -#: templates/ishtar/sheet_find.html:224 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:228 msgid "Documents" msgstr "" @@ -664,7 +697,7 @@ msgstr "" msgid "Parent material" msgstr "" -#: models_finds.py:51 models_finds.py:539 models_finds.py:616 +#: models_finds.py:51 models_finds.py:539 models_finds.py:619 msgid "Material types" msgstr "" @@ -696,7 +729,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: models_finds.py:97 models_finds.py:612 models_treatments.py:40 +#: models_finds.py:97 models_finds.py:615 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "" @@ -713,12 +746,12 @@ msgstr "" msgid "Parent" msgstr "" -#: models_finds.py:151 models_finds.py:609 models_treatments.py:125 +#: models_finds.py:151 models_finds.py:612 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "" -#: models_finds.py:153 models_finds.py:611 +#: models_finds.py:153 models_finds.py:614 msgid "External ID is set automatically" msgstr "" @@ -758,7 +791,7 @@ msgstr "" msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:197 models_finds.py:607 +#: models_finds.py:197 models_finds.py:610 msgid "Base find" msgstr "" @@ -854,9 +887,9 @@ msgstr "" msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:537 models_finds.py:640 models_treatments.py:132 -#: models_treatments.py:312 templates/ishtar/sheet_find.html:90 -#: templates/ishtar/sheet_find.html:132 +#: models_finds.py:537 models_finds.py:643 models_treatments.py:132 +#: models_treatments.py:312 templates/ishtar/sheet_find.html:94 +#: templates/ishtar/sheet_find.html:136 msgid "Container" msgstr "" @@ -864,91 +897,91 @@ msgstr "" msgid "Periods" msgstr "" -#: models_finds.py:623 +#: models_finds.py:626 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:627 +#: models_finds.py:630 msgid "Weight unit" msgstr "" -#: models_finds.py:633 templates/ishtar/sheet_find.html:78 +#: models_finds.py:636 templates/ishtar/sheet_find.html:82 msgid "Upstream treatment" msgstr "" -#: models_finds.py:636 templates/ishtar/sheet_find.html:120 +#: models_finds.py:639 templates/ishtar/sheet_find.html:124 msgid "Downstream treatment" msgstr "" -#: models_finds.py:675 +#: models_finds.py:678 msgid "Collection" msgstr "" -#: models_finds.py:677 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:680 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "" -#: models_finds.py:686 +#: models_finds.py:689 msgid "Can view all Finds" msgstr "" -#: models_finds.py:687 +#: models_finds.py:690 msgid "Can view own Find" msgstr "" -#: models_finds.py:688 +#: models_finds.py:691 msgid "Can add own Find" msgstr "" -#: models_finds.py:689 +#: models_finds.py:692 msgid "Can change own Find" msgstr "" -#: models_finds.py:690 +#: models_finds.py:693 msgid "Can delete own Find" msgstr "" -#: models_finds.py:696 +#: models_finds.py:699 msgid "FIND" msgstr "" -#: models_finds.py:1100 +#: models_finds.py:1103 msgid "Find documentation" msgstr "" -#: models_finds.py:1101 +#: models_finds.py:1104 msgid "Find documentations" msgstr "" -#: models_finds.py:1104 +#: models_finds.py:1107 msgid "Can view all Find sources" msgstr "" -#: models_finds.py:1106 +#: models_finds.py:1109 msgid "Can view own Find source" msgstr "" -#: models_finds.py:1108 +#: models_finds.py:1111 msgid "Can add own Find source" msgstr "" -#: models_finds.py:1110 +#: models_finds.py:1113 msgid "Can change own Find source" msgstr "" -#: models_finds.py:1112 +#: models_finds.py:1115 msgid "Can delete own Find source" msgstr "" -#: models_finds.py:1138 +#: models_finds.py:1141 msgid "Person" msgstr "" -#: models_finds.py:1144 +#: models_finds.py:1147 msgid "Property" msgstr "" -#: models_finds.py:1145 +#: models_finds.py:1148 msgid "Properties" msgstr "" @@ -1016,7 +1049,7 @@ msgstr "" msgid "Target a basket" msgstr "" -#: models_treatments.py:149 templates/ishtar/sheet_find.html:75 +#: models_treatments.py:149 templates/ishtar/sheet_find.html:79 #: templates/ishtar/sheet_treatmentfile.html:46 msgid "Treatments" msgstr "" @@ -1045,8 +1078,8 @@ msgstr "" msgid "TREATMENT" msgstr "" -#: models_treatments.py:313 templates/ishtar/sheet_find.html:89 -#: templates/ishtar/sheet_find.html:131 +#: models_treatments.py:313 templates/ishtar/sheet_find.html:93 +#: templates/ishtar/sheet_find.html:135 msgid "Doer" msgstr "" @@ -1070,10 +1103,6 @@ msgstr "" msgid "Person in charge" msgstr "" -#: models_treatments.py:507 -msgid "Creation date" -msgstr "" - #: models_treatments.py:517 msgid "Treatment requests" msgstr "" @@ -1155,30 +1184,18 @@ msgid "Can view Treatment request source" msgstr "" #: models_treatments.py:633 -msgid "Can add Treatment request source" -msgstr "" - -#: models_treatments.py:635 -msgid "Can change Treatment request source" -msgstr "" - -#: models_treatments.py:637 -msgid "Can delete Treatment request source" -msgstr "" - -#: models_treatments.py:639 msgid "Can view own Treatment request source" msgstr "" -#: models_treatments.py:641 +#: models_treatments.py:635 msgid "Can add own Treatment request source" msgstr "" -#: models_treatments.py:643 +#: models_treatments.py:637 msgid "Can change own Treatment request source" msgstr "" -#: models_treatments.py:645 +#: models_treatments.py:639 msgid "Can delete own Treatment request source" msgstr "" @@ -1306,55 +1323,61 @@ msgstr "" msgid "Operation" msgstr "" -#: templates/ishtar/sheet_find.html:25 +#: templates/ishtar/sheet_find.html:14 +msgid "" +"This sheet has a downstream treatment: it is related to an old version of " +"the find." +msgstr "" + +#: templates/ishtar/sheet_find.html:29 msgid "Administrative index" msgstr "" -#: templates/ishtar/sheet_find.html:67 +#: templates/ishtar/sheet_find.html:71 msgid "Warehouse" msgstr "" -#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126 +#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 msgid "Year - index" msgstr "" -#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 +#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "Related finds (max. 15 displayed)" msgstr "" -#: templates/ishtar/sheet_find.html:116 +#: templates/ishtar/sheet_find.html:120 msgid "Export as CSV" msgstr "" -#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159 +#: templates/ishtar/sheet_find.html:120 templates/ishtar/sheet_find.html:163 msgid "CSV" msgstr "" -#: templates/ishtar/sheet_find.html:164 +#: templates/ishtar/sheet_find.html:168 msgid "Associated base finds" msgstr "" -#: templates/ishtar/sheet_find.html:171 +#: templates/ishtar/sheet_find.html:175 msgid "Internal ID" msgstr "" -#: templates/ishtar/sheet_find.html:203 +#: templates/ishtar/sheet_find.html:207 msgid "Coordinates" msgstr "" -#: templates/ishtar/sheet_find.html:210 +#: templates/ishtar/sheet_find.html:214 msgid "SRID" msgstr "" -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:231 msgid "Title" msgstr "" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:233 msgid "Authors" msgstr "" -#: templates/ishtar/sheet_find.html:230 +#: templates/ishtar/sheet_find.html:234 msgid "Link" msgstr "" diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 407270df9..4c02b170f 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -554,7 +554,10 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, REVERSED_BOOL_FIELDS = ['image__isnull'] RELATION_TYPES_PREFIX = { 'ope_relation_types': - 'base_finds__context_record__operation__'} + 'base_finds__context_record__operation__', + 'cr_relation_types': + 'base_finds__context_record__', + } RELATIVE_SESSION_NAMES = [ ('contextrecord', 'base_finds__context_record__pk'), ('operation', 'base_finds__context_record__operation__pk'), diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index a38b62b8c..1604e2018 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -8,6 +8,10 @@ {% if item.image %} <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a> {% endif%} +{% if item.downstream_treatment %} +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> + {% trans "This sheet has a downstream treatment: it is related to an old version of the find." %}</p> +{% endif %} <p class="window-refs">{{ item.label|default:"" }}</p> <p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.complete_id}}{% endfor %}</p> diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 13a161584..fafadea13 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -77,7 +77,7 @@ msgid "Relation type" msgstr "" #: forms.py:383 ishtar_menu.py:30 models.py:372 models.py:847 models.py:882 -#: models.py:922 models.py:1026 models.py:1235 wizards.py:353 wizards.py:364 +#: models.py:922 models.py:1026 models.py:1235 wizards.py:352 wizards.py:363 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 00f39e625..4e5a8bd1c 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -80,7 +80,7 @@ class FloatField(forms.FloatField): Allow the use of comma for separating float fields """ def clean(self, value): - if value: + if value and (isinstance(value, unicode) or isinstance(value, str)): value = value.replace(',', '.').replace('%', '') return super(FloatField, self).clean(value) diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 9611caded..eb5bf2bf1 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -176,12 +176,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:297 models.py:1501 +#: forms.py:297 models.py:1549 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1567 models.py:3030 +#: forms_common.py:408 models.py:1615 models.py:3078 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -197,8 +197,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2630 -#: models.py:2823 models.py:2885 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2678 +#: models.py:2871 models.py:2933 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -209,64 +209,64 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2513 models.py:2604 +#: ishtar_menu.py:75 models.py:2561 models.py:2652 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 -#: forms_common.py:378 forms_common.py:448 models.py:1109 models.py:1500 -#: models.py:1769 models.py:1785 models.py:2023 models.py:2301 models.py:2507 -#: models.py:2616 models.py:3016 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1157 models.py:1548 +#: models.py:1817 models.py:1833 models.py:2071 models.py:2349 models.py:2555 +#: models.py:2664 models.py:3064 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:176 models.py:1722 models.py:2154 +#: forms_common.py:176 models.py:1770 models.py:2202 msgid "Organization type" msgstr "" -#: forms_common.py:178 forms_common.py:402 models.py:1562 +#: forms_common.py:178 forms_common.py:402 models.py:1610 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:180 forms_common.py:405 models.py:1563 +#: forms_common.py:180 forms_common.py:405 models.py:1611 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:182 forms_common.py:406 models.py:1565 +#: forms_common.py:182 forms_common.py:406 models.py:1613 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:185 forms_common.py:409 models.py:1568 +#: forms_common.py:185 forms_common.py:409 models.py:1616 msgid "Country" msgstr "" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1595 +#: forms_common.py:450 forms_common.py:574 models.py:1643 msgid "Email" msgstr "" -#: forms_common.py:188 forms_common.py:385 models.py:1580 +#: forms_common.py:188 forms_common.py:385 models.py:1628 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:189 forms_common.py:394 models.py:1592 +#: forms_common.py:189 forms_common.py:394 models.py:1640 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2192 -#: models.py:2509 models.py:2951 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2240 +#: models.py:2557 models.py:2999 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -274,7 +274,7 @@ msgstr "" msgid "Type" msgstr "" -#: forms_common.py:222 views.py:147 +#: forms_common.py:222 views.py:149 msgid "Organization search" msgstr "" @@ -290,12 +290,12 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2614 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2662 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:341 forms_common.py:436 views.py:112 +#: forms_common.py:341 forms_common.py:436 views.py:114 msgid "Person search" msgstr "" @@ -308,25 +308,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2155 -#: models.py:2608 models.py:2610 models.py:2948 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2203 +#: models.py:2656 models.py:2658 models.py:2996 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2612 +#: forms_common.py:374 models.py:2660 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2618 +#: forms_common.py:380 models.py:2666 msgid "Raw name" msgstr "" -#: forms_common.py:383 models.py:1581 +#: forms_common.py:383 models.py:1629 msgid "Phone description" msgstr "" -#: forms_common.py:386 models.py:1583 models.py:1585 +#: forms_common.py:386 models.py:1631 models.py:1633 msgid "Phone description 2" msgstr "" @@ -334,11 +334,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:390 models.py:1589 +#: forms_common.py:390 models.py:1637 msgid "Phone description 3" msgstr "" -#: forms_common.py:392 models.py:1587 +#: forms_common.py:392 models.py:1635 msgid "Phone 3" msgstr "" @@ -346,23 +346,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:411 models.py:1570 +#: forms_common.py:411 models.py:1618 msgid "Other address: address" msgstr "" -#: forms_common.py:414 models.py:1573 +#: forms_common.py:414 models.py:1621 msgid "Other address: address complement" msgstr "" -#: forms_common.py:416 models.py:1574 +#: forms_common.py:416 models.py:1622 msgid "Other address: postal code" msgstr "" -#: forms_common.py:418 models.py:1576 +#: forms_common.py:418 models.py:1624 msgid "Other address: town" msgstr "" -#: forms_common.py:420 models.py:1578 +#: forms_common.py:420 models.py:1626 msgid "Other address: country" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2561 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2609 msgid "Person type" msgstr "" @@ -410,7 +410,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:3031 +#: forms_common.py:636 forms_common.py:649 models.py:3079 msgid "Towns" msgstr "" @@ -426,7 +426,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2156 models.py:2923 +#: forms_common.py:783 forms_common.py:831 models.py:2204 models.py:2971 msgid "Source type" msgstr "" @@ -438,37 +438,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:2962 +#: forms_common.py:791 models.py:3010 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:2964 +#: forms_common.py:792 models.py:3012 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2327 models.py:2966 +#: forms_common.py:794 models.py:2375 models.py:3014 msgid "Creation date" msgstr "" -#: forms_common.py:797 models.py:2969 +#: forms_common.py:797 models.py:3017 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:799 forms_common.py:835 models.py:381 models.py:698 -#: models.py:2050 models.py:2622 models.py:2976 +#: forms_common.py:799 forms_common.py:835 models.py:419 models.py:746 +#: models.py:2098 models.py:2670 models.py:3024 msgid "Comment" msgstr "" -#: forms_common.py:801 forms_common.py:834 models.py:1111 models.py:1789 -#: models.py:1977 models.py:2024 models.py:2975 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1159 models.py:1837 +#: models.py:2025 models.py:2072 models.py:3023 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:804 models.py:2977 +#: forms_common.py:804 models.py:3025 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:2979 +#: forms_common.py:806 forms_common.py:838 models.py:3027 msgid "Has a duplicate" msgstr "" @@ -483,7 +483,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2890 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2938 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -496,7 +496,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2157 models.py:2877 models.py:2887 +#: forms_common.py:864 models.py:2205 models.py:2925 models.py:2935 msgid "Author type" msgstr "" @@ -508,7 +508,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2891 models.py:2958 +#: forms_common.py:901 models.py:2939 models.py:3006 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -526,7 +526,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1283 views.py:1644 +#: ishtar_menu.py:39 models.py:1331 views.py:1640 msgid "Global variables" msgstr "" @@ -554,278 +554,278 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2335 +#: ishtar_menu.py:109 models.py:2383 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1652 +#: ishtar_menu.py:112 views.py:1648 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1666 +#: ishtar_menu.py:116 views.py:1662 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1705 +#: ishtar_menu.py:120 views.py:1701 msgid "Old imports" msgstr "" -#: models.py:186 +#: models.py:224 msgid "Not a valid item." msgstr "" -#: models.py:201 +#: models.py:239 msgid "A selected item is not a valid item." msgstr "" -#: models.py:212 +#: models.py:250 msgid "This item already exists." msgstr "" -#: models.py:377 models.py:697 models.py:1535 models.py:1547 models.py:1973 +#: models.py:415 models.py:745 models.py:1583 models.py:1595 models.py:2021 msgid "Label" msgstr "" -#: models.py:379 +#: models.py:417 msgid "Textual ID" msgstr "" -#: models.py:382 models.py:700 models.py:1504 +#: models.py:420 models.py:748 models.py:1552 msgid "Available" msgstr "" -#: models.py:724 models.py:2096 +#: models.py:772 models.py:2144 msgid "Key" msgstr "" -#: models.py:730 +#: models.py:778 msgid "Specific key to an import" msgstr "" -#: models.py:826 +#: models.py:874 msgid "Last editor" msgstr "" -#: models.py:829 +#: models.py:877 msgid "Creator" msgstr "" -#: models.py:971 models.py:2874 models.py:3042 models.py:3098 +#: models.py:1019 models.py:2922 models.py:3090 models.py:3146 msgid "Order" msgstr "" -#: models.py:972 +#: models.py:1020 msgid "Symmetrical" msgstr "" -#: models.py:973 +#: models.py:1021 msgid "Tiny label" msgstr "" -#: models.py:987 +#: models.py:1035 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:1103 +#: models.py:1151 msgid "Euro" msgstr "" -#: models.py:1104 +#: models.py:1152 msgid "US dollar" msgstr "" -#: models.py:1110 models.py:1787 +#: models.py:1158 models.py:1835 msgid "Slug" msgstr "" -#: models.py:1113 +#: models.py:1161 msgid "CSS color code for base module" msgstr "" -#: models.py:1115 +#: models.py:1163 msgid "Files module" msgstr "" -#: models.py:1117 +#: models.py:1165 msgid "CSS color code for files module" msgstr "" -#: models.py:1119 +#: models.py:1167 msgid "Context records module" msgstr "" -#: models.py:1122 +#: models.py:1170 msgid "CSS color code for context record module" msgstr "" -#: models.py:1124 +#: models.py:1172 msgid "Finds module" msgstr "" -#: models.py:1125 +#: models.py:1173 msgid "Need context records module" msgstr "" -#: models.py:1127 +#: models.py:1175 msgid "CSS color code for find module" msgstr "" -#: models.py:1130 +#: models.py:1178 msgid "Warehouses module" msgstr "" -#: models.py:1131 +#: models.py:1179 msgid "Need finds module" msgstr "" -#: models.py:1133 +#: models.py:1181 msgid "CSS code for warehouse module" msgstr "" -#: models.py:1135 +#: models.py:1183 msgid "Mapping module" msgstr "" -#: models.py:1137 +#: models.py:1185 msgid "CSS code for mapping module" msgstr "" -#: models.py:1140 +#: models.py:1188 msgid "Home page" msgstr "" -#: models.py:1141 +#: models.py:1189 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1145 +#: models.py:1193 msgid "File external id" msgstr "" -#: models.py:1147 +#: models.py:1195 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1152 +#: models.py:1200 msgid "Parcel external id" msgstr "" -#: models.py:1155 +#: models.py:1203 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1160 +#: models.py:1208 msgid "Context record external id" msgstr "" -#: models.py:1162 +#: models.py:1210 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1167 +#: models.py:1215 msgid "Base find external id" msgstr "" -#: models.py:1169 +#: models.py:1217 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1174 +#: models.py:1222 msgid "Find external id" msgstr "" -#: models.py:1176 +#: models.py:1224 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1181 +#: models.py:1229 msgid "Container external id" msgstr "" -#: models.py:1183 +#: models.py:1231 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1188 +#: models.py:1236 msgid "Warehouse external id" msgstr "" -#: models.py:1190 +#: models.py:1238 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1195 +#: models.py:1243 msgid "Raw name for person" msgstr "" -#: models.py:1197 +#: models.py:1245 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1201 +#: models.py:1249 msgid "Current active" msgstr "" -#: models.py:1202 +#: models.py:1250 msgid "Currency" msgstr "" -#: models.py:1206 +#: models.py:1254 msgid "Ishtar site profile" msgstr "" -#: models.py:1207 +#: models.py:1255 msgid "Ishtar site profiles" msgstr "" -#: models.py:1276 +#: models.py:1324 msgid "Variable name" msgstr "" -#: models.py:1277 +#: models.py:1325 msgid "Description of the variable" msgstr "" -#: models.py:1279 models.py:2097 +#: models.py:1327 models.py:2145 msgid "Value" msgstr "" -#: models.py:1282 +#: models.py:1330 msgid "Global variable" msgstr "" -#: models.py:1405 models.py:1435 +#: models.py:1453 models.py:1483 msgid "Total" msgstr "" -#: models.py:1412 models.py:1536 models.py:1548 +#: models.py:1460 models.py:1584 models.py:1596 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -833,663 +833,663 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1499 +#: models.py:1547 msgid "Administrative Act" msgstr "" -#: models.py:1503 +#: models.py:1551 msgid "Associated object" msgstr "" -#: models.py:1507 +#: models.py:1555 msgid "Document template" msgstr "" -#: models.py:1508 +#: models.py:1556 msgid "Document templates" msgstr "" -#: models.py:1539 models.py:1549 models.py:2321 +#: models.py:1587 models.py:1597 models.py:2369 msgid "State" msgstr "" -#: models.py:1553 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1601 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1554 +#: models.py:1602 msgid "Departments" msgstr "" -#: models.py:1591 +#: models.py:1639 msgid "Raw phone" msgstr "" -#: models.py:1597 +#: models.py:1645 msgid "Alternative address is prefered" msgstr "" -#: models.py:1636 +#: models.py:1684 msgid "Tel: " msgstr "" -#: models.py:1640 +#: models.py:1688 msgid "Mobile: " msgstr "" -#: models.py:1644 +#: models.py:1692 msgid "Email: " msgstr "" -#: models.py:1649 +#: models.py:1697 msgid "Merge key" msgstr "" -#: models.py:1723 +#: models.py:1771 msgid "Organization types" msgstr "" -#: models.py:1770 +#: models.py:1818 msgid "Class name" msgstr "" -#: models.py:1773 +#: models.py:1821 msgid "Importer - Model" msgstr "" -#: models.py:1774 +#: models.py:1822 msgid "Importer - Models" msgstr "" -#: models.py:1791 templates/ishtar/dashboards/dashboard_main.html:34 +#: models.py:1839 templates/ishtar/dashboards/dashboard_main.html:34 msgid "Users" msgstr "" -#: models.py:1794 +#: models.py:1842 msgid "Associated model" msgstr "" -#: models.py:1797 +#: models.py:1845 msgid "Models that can accept new items" msgstr "" -#: models.py:1798 +#: models.py:1846 msgid "Leave blank for no restrictions" msgstr "" -#: models.py:1800 +#: models.py:1848 msgid "Is template" msgstr "" -#: models.py:1801 +#: models.py:1849 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1805 +#: models.py:1853 msgid "Importer - Type" msgstr "" -#: models.py:1806 +#: models.py:1854 msgid "Importer - Types" msgstr "" -#: models.py:1905 +#: models.py:1953 msgid "Importer - Default" msgstr "" -#: models.py:1906 +#: models.py:1954 msgid "Importer - Defaults" msgstr "" -#: models.py:1941 +#: models.py:1989 msgid "Importer - Default value" msgstr "" -#: models.py:1942 +#: models.py:1990 msgid "Importer - Default values" msgstr "" -#: models.py:1976 +#: models.py:2024 msgid "Column number" msgstr "" -#: models.py:1979 +#: models.py:2027 msgid "Required" msgstr "" -#: models.py:1981 +#: models.py:2029 msgid "Export field name" msgstr "" -#: models.py:1982 +#: models.py:2030 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: models.py:1987 +#: models.py:2035 msgid "Importer - Column" msgstr "" -#: models.py:1988 +#: models.py:2036 msgid "Importer - Columns" msgstr "" -#: models.py:2008 +#: models.py:2056 msgid "Field name" msgstr "" -#: models.py:2010 models.py:2044 +#: models.py:2058 models.py:2092 msgid "Force creation of new items" msgstr "" -#: models.py:2012 models.py:2046 +#: models.py:2060 models.py:2094 msgid "Concatenate with existing" msgstr "" -#: models.py:2014 models.py:2048 +#: models.py:2062 models.py:2096 msgid "Concatenate character" msgstr "" -#: models.py:2018 +#: models.py:2066 msgid "Importer - Duplicate field" msgstr "" -#: models.py:2019 +#: models.py:2067 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:2026 +#: models.py:2074 msgid "Regular expression" msgstr "" -#: models.py:2029 +#: models.py:2077 msgid "Importer - Regular expression" msgstr "" -#: models.py:2030 +#: models.py:2078 msgid "Importer - Regular expressions" msgstr "" -#: models.py:2053 +#: models.py:2101 msgid "Importer - Target" msgstr "" -#: models.py:2054 +#: models.py:2102 msgid "Importer - Targets" msgstr "" -#: models.py:2078 views.py:568 +#: models.py:2126 views.py:570 msgid "True" msgstr "" -#: models.py:2079 views.py:570 +#: models.py:2127 views.py:572 msgid "False" msgstr "" -#: models.py:2098 +#: models.py:2146 msgid "Is set" msgstr "" -#: models.py:2105 +#: models.py:2153 msgid "Importer - Target key" msgstr "" -#: models.py:2106 +#: models.py:2154 msgid "Importer - Targets keys" msgstr "" -#: models.py:2158 models.py:2954 +#: models.py:2206 models.py:3002 msgid "Format" msgstr "" -#: models.py:2159 models.py:3046 +#: models.py:2207 models.py:3094 msgid "Operation type" msgstr "" -#: models.py:2160 +#: models.py:2208 msgid "Period" msgstr "" -#: models.py:2161 +#: models.py:2209 msgid "Report state" msgstr "" -#: models.py:2162 +#: models.py:2210 msgid "Remain type" msgstr "" -#: models.py:2163 +#: models.py:2211 msgid "Unit" msgstr "" -#: models.py:2165 +#: models.py:2213 msgid "Activity type" msgstr "" -#: models.py:2166 +#: models.py:2214 msgid "Material" msgstr "" -#: models.py:2168 +#: models.py:2216 msgid "Conservatory state" msgstr "" -#: models.py:2169 +#: models.py:2217 msgid "Container type" msgstr "" -#: models.py:2170 +#: models.py:2218 msgid "Preservation type" msgstr "" -#: models.py:2171 +#: models.py:2219 msgid "Object type" msgstr "" -#: models.py:2172 +#: models.py:2220 msgid "Integrity type" msgstr "" -#: models.py:2174 +#: models.py:2222 msgid "Remarkability type" msgstr "" -#: models.py:2175 +#: models.py:2223 msgid "Batch type" msgstr "" -#: models.py:2177 +#: models.py:2225 msgid "Identification type" msgstr "" -#: models.py:2179 +#: models.py:2227 msgid "Context record relation type" msgstr "" -#: models.py:2180 models.py:3104 +#: models.py:2228 models.py:3152 msgid "Spatial reference system" msgstr "" -#: models.py:2181 models.py:2932 +#: models.py:2229 models.py:2980 msgid "Support type" msgstr "" -#: models.py:2182 models.py:2573 +#: models.py:2230 models.py:2621 msgid "Title type" msgstr "" -#: models.py:2188 +#: models.py:2236 msgid "Integer" msgstr "" -#: models.py:2189 +#: models.py:2237 msgid "Float" msgstr "" -#: models.py:2190 +#: models.py:2238 msgid "String" msgstr "" -#: models.py:2191 templates/sheet_ope.html:86 +#: models.py:2239 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2193 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2241 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2194 +#: models.py:2242 msgid "String to boolean" msgstr "" -#: models.py:2195 +#: models.py:2243 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2196 +#: models.py:2244 msgid "Unknow type" msgstr "" -#: models.py:2212 +#: models.py:2260 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2213 +#: models.py:2261 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2214 +#: models.py:2262 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2224 +#: models.py:2272 msgid "Options" msgstr "" -#: models.py:2226 +#: models.py:2274 msgid "Split character(s)" msgstr "" -#: models.py:2230 +#: models.py:2278 msgid "Importer - Formater type" msgstr "" -#: models.py:2231 +#: models.py:2279 msgid "Importer - Formater types" msgstr "" -#: models.py:2283 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2331 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2284 +#: models.py:2332 msgid "Analyse in progress" msgstr "" -#: models.py:2285 +#: models.py:2333 msgid "Analysed" msgstr "" -#: models.py:2286 +#: models.py:2334 msgid "Import pending" msgstr "" -#: models.py:2287 +#: models.py:2335 msgid "Import in progress" msgstr "" -#: models.py:2288 +#: models.py:2336 msgid "Finished with errors" msgstr "" -#: models.py:2289 +#: models.py:2337 msgid "Finished" msgstr "" -#: models.py:2290 +#: models.py:2338 msgid "Archived" msgstr "" -#: models.py:2305 +#: models.py:2353 msgid "Imported file" msgstr "" -#: models.py:2307 +#: models.py:2355 msgid "Associated images (zip file)" msgstr "" -#: models.py:2309 +#: models.py:2357 msgid "Encoding" msgstr "" -#: models.py:2311 +#: models.py:2359 msgid "Skip lines" msgstr "" -#: models.py:2312 templates/ishtar/import_list.html:51 +#: models.py:2360 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2315 +#: models.py:2363 msgid "Result file" msgstr "" -#: models.py:2318 templates/ishtar/import_list.html:57 +#: models.py:2366 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2324 +#: models.py:2372 msgid "Conservative import" msgstr "" -#: models.py:2328 +#: models.py:2376 msgid "End date" msgstr "" -#: models.py:2331 +#: models.py:2379 msgid "Remaining seconds" msgstr "" -#: models.py:2334 +#: models.py:2382 msgid "Import" msgstr "" -#: models.py:2363 +#: models.py:2411 msgid "Analyse" msgstr "" -#: models.py:2365 models.py:2368 +#: models.py:2413 models.py:2416 msgid "Re-analyse" msgstr "" -#: models.py:2366 +#: models.py:2414 msgid "Launch import" msgstr "" -#: models.py:2369 +#: models.py:2417 msgid "Re-import" msgstr "" -#: models.py:2370 +#: models.py:2418 msgid "Archive" msgstr "" -#: models.py:2372 +#: models.py:2420 msgid "Unarchive" msgstr "" -#: models.py:2373 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2421 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2514 +#: models.py:2562 msgid "Organizations" msgstr "" -#: models.py:2516 +#: models.py:2564 msgid "Can view all Organizations" msgstr "" -#: models.py:2517 +#: models.py:2565 msgid "Can view own Organization" msgstr "" -#: models.py:2518 +#: models.py:2566 msgid "Can add own Organization" msgstr "" -#: models.py:2520 +#: models.py:2568 msgid "Can change own Organization" msgstr "" -#: models.py:2522 +#: models.py:2570 msgid "Can delete own Organization" msgstr "" -#: models.py:2557 +#: models.py:2605 msgid "Groups" msgstr "" -#: models.py:2562 +#: models.py:2610 msgid "Person types" msgstr "" -#: models.py:2574 +#: models.py:2622 msgid "Title types" msgstr "" -#: models.py:2583 +#: models.py:2631 msgid "Mr" msgstr "" -#: models.py:2584 +#: models.py:2632 msgid "Miss" msgstr "" -#: models.py:2585 +#: models.py:2633 msgid "Mr and Mrs" msgstr "" -#: models.py:2586 +#: models.py:2634 msgid "Mrs" msgstr "" -#: models.py:2587 +#: models.py:2635 msgid "Doctor" msgstr "" -#: models.py:2620 +#: models.py:2668 msgid "Contact type" msgstr "" -#: models.py:2623 models.py:2687 +#: models.py:2671 models.py:2735 msgid "Types" msgstr "" -#: models.py:2626 +#: models.py:2674 msgid "Is attached to" msgstr "" -#: models.py:2631 +#: models.py:2679 msgid "Persons" msgstr "" -#: models.py:2633 +#: models.py:2681 msgid "Can view all Persons" msgstr "" -#: models.py:2634 +#: models.py:2682 msgid "Can view own Person" msgstr "" -#: models.py:2635 +#: models.py:2683 msgid "Can add own Person" msgstr "" -#: models.py:2636 +#: models.py:2684 msgid "Can change own Person" msgstr "" -#: models.py:2637 +#: models.py:2685 msgid "Can delete own Person" msgstr "" -#: models.py:2826 +#: models.py:2874 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2829 +#: models.py:2877 msgid "Ishtar user" msgstr "" -#: models.py:2830 +#: models.py:2878 msgid "Ishtar users" msgstr "" -#: models.py:2870 +#: models.py:2918 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2878 +#: models.py:2926 msgid "Author types" msgstr "" -#: models.py:2895 +#: models.py:2943 msgid "Can view all Authors" msgstr "" -#: models.py:2897 +#: models.py:2945 msgid "Can view own Author" msgstr "" -#: models.py:2899 +#: models.py:2947 msgid "Can add own Author" msgstr "" -#: models.py:2901 +#: models.py:2949 msgid "Can change own Author" msgstr "" -#: models.py:2903 +#: models.py:2951 msgid "Can delete own Author" msgstr "" -#: models.py:2924 +#: models.py:2972 msgid "Source types" msgstr "" -#: models.py:2933 +#: models.py:2981 msgid "Support types" msgstr "" -#: models.py:2940 +#: models.py:2988 msgid "Format type" msgstr "" -#: models.py:2941 +#: models.py:2989 msgid "Format types" msgstr "" -#: models.py:2949 +#: models.py:2997 msgid "External ID" msgstr "" -#: models.py:2952 +#: models.py:3000 msgid "Support" msgstr "" -#: models.py:2956 +#: models.py:3004 msgid "Scale" msgstr "" -#: models.py:2970 +#: models.py:3018 msgid "Item number" msgstr "" -#: models.py:2971 +#: models.py:3019 msgid "Ref." msgstr "" -#: models.py:2974 +#: models.py:3022 msgid "Internal ref." msgstr "" -#: models.py:3017 +#: models.py:3065 msgid "Surface (m2)" msgstr "" -#: models.py:3018 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3066 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:3043 +#: models.py:3091 msgid "Is preventive" msgstr "" -#: models.py:3047 +#: models.py:3095 msgid "Operation types" msgstr "" -#: models.py:3076 +#: models.py:3124 msgid "Preventive" msgstr "" -#: models.py:3077 +#: models.py:3125 msgid "Research" msgstr "" -#: models.py:3100 +#: models.py:3148 msgid "Authority name" msgstr "" -#: models.py:3101 +#: models.py:3149 msgid "Authority SRID" msgstr "" -#: models.py:3105 +#: models.py:3153 msgid "Spatial reference systems" msgstr "" @@ -1501,120 +1501,120 @@ msgstr "" msgid "Load another random image?" msgstr "" -#: views.py:119 +#: views.py:121 msgid "New person" msgstr "" -#: views.py:127 +#: views.py:129 msgid "Person modification" msgstr "" -#: views.py:142 +#: views.py:144 msgid "Person deletion" msgstr "" -#: views.py:153 +#: views.py:155 msgid "New organization" msgstr "" -#: views.py:160 +#: views.py:162 msgid "Organization modification" msgstr "" -#: views.py:176 +#: views.py:178 msgid "Organization deletion" msgstr "" -#: views.py:183 +#: views.py:185 msgid "Account management" msgstr "" -#: views.py:189 +#: views.py:191 msgid "Account deletion" msgstr "" -#: views.py:251 +#: views.py:253 msgid "Archaeological file" msgstr "" -#: views.py:252 +#: views.py:254 msgid "Operation" msgstr "" -#: views.py:254 +#: views.py:256 msgid "Context record" msgstr "" -#: views.py:256 +#: views.py:258 msgid "Find" msgstr "" -#: views.py:258 +#: views.py:260 msgid "Treatment request" msgstr "" -#: views.py:259 +#: views.py:261 msgid "Treatment" msgstr "" -#: views.py:1387 views.py:1430 +#: views.py:1376 views.py:1419 msgid "Operation not permitted." msgstr "" -#: views.py:1389 +#: views.py:1378 #, python-format msgid "New %s" msgstr "" -#: views.py:1448 views.py:1501 +#: views.py:1437 views.py:1496 msgid "Archaeological files" msgstr "" -#: views.py:1449 views.py:1505 +#: views.py:1438 views.py:1500 msgid "Operations" msgstr "" -#: views.py:1451 views.py:1509 +#: views.py:1440 views.py:1504 msgid "Context records" msgstr "" -#: views.py:1453 views.py:1512 +#: views.py:1442 views.py:1507 msgid "Finds" msgstr "" -#: views.py:1455 views.py:1517 +#: views.py:1444 views.py:1512 msgid "Treatment requests" msgstr "" -#: views.py:1456 views.py:1521 +#: views.py:1445 views.py:1518 msgid "Treatments" msgstr "" -#: views.py:1719 templates/ishtar/import_list.html:47 +#: views.py:1715 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1734 +#: views.py:1730 msgid "Delete import" msgstr "" -#: views.py:1773 +#: views.py:1769 msgid "Merge persons" msgstr "" -#: views.py:1797 +#: views.py:1793 msgid "Select the main person" msgstr "" -#: views.py:1806 +#: views.py:1802 msgid "Merge organization" msgstr "" -#: views.py:1816 +#: views.py:1812 msgid "Select the main organization" msgstr "" -#: views.py:1856 views.py:1872 +#: views.py:1852 views.py:1868 msgid "Corporation manager" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index ce2f9d82b..803e24ead 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -7,21 +7,23 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:19+0200\n" "PO-Revision-Date: 2017-04-07 06:31-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:47 forms.py:51 models.py:216 models.py:599 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:217 models.py:600 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:141 models.py:218 models.py:567 +#: forms.py:59 forms.py:141 models.py:219 models.py:568 msgid "ID" msgstr "Identifiant" @@ -61,7 +63,7 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:111 forms.py:357 views.py:92 +#: forms.py:111 forms.py:358 views.py:92 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" @@ -73,48 +75,48 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:140 models.py:181 models.py:214 models.py:569 +#: forms.py:140 models.py:181 models.py:215 models.py:570 msgid "Parcel" msgstr "Parcelle" -#: forms.py:143 models.py:219 models.py:570 +#: forms.py:143 models.py:220 models.py:571 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "Description" -#: forms.py:145 models.py:220 +#: forms.py:145 models.py:221 msgid "General comment" msgstr "Commentaire général" -#: forms.py:148 models.py:267 +#: forms.py:148 models.py:268 msgid "Excavation technique" msgstr "Méthode de fouille" -#: forms.py:149 models.py:224 +#: forms.py:149 models.py:225 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:150 models.py:225 +#: forms.py:150 models.py:226 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:151 models.py:226 +#: forms.py:151 models.py:227 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:152 models.py:228 +#: forms.py:152 models.py:229 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: forms.py:153 models.py:229 +#: forms.py:153 models.py:230 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:155 models.py:231 +#: forms.py:155 models.py:232 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition" -#: forms.py:156 forms.py:376 models.py:241 models.py:568 +#: forms.py:156 forms.py:377 models.py:242 models.py:569 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" @@ -122,7 +124,7 @@ msgstr "Type d'Unité d'Enregistrement" msgid "Documentation" msgstr "Documentation" -#: forms.py:162 models.py:233 +#: forms.py:162 models.py:234 msgid "Location" msgstr "Lieu" @@ -151,7 +153,7 @@ msgstr "Datation" msgid "Start date" msgstr "Date de début" -#: forms.py:256 models.py:58 models.py:223 +#: forms.py:256 models.py:58 models.py:224 msgid "End date" msgstr "Date de fin" @@ -163,88 +165,88 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: forms.py:285 ishtar_menu.py:29 models.py:641 +#: forms.py:285 ishtar_menu.py:29 models.py:642 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:306 +#: forms.py:307 msgid "Relations" msgstr "Relations" -#: forms.py:310 forms.py:318 models.py:244 +#: forms.py:311 forms.py:319 models.py:245 #: templates/ishtar/sheet_contextrecord.html:44 msgid "Interpretation" msgstr "Interprétation" -#: forms.py:314 +#: forms.py:315 msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:316 models.py:243 +#: forms.py:317 models.py:244 msgid "Filling" msgstr "Remplissage" -#: forms.py:320 models.py:264 +#: forms.py:321 models.py:265 msgid "Activity" msgstr "Activité" -#: forms.py:322 models.py:262 +#: forms.py:323 models.py:263 msgid "Identification" msgstr "Identification" -#: forms.py:324 models.py:247 +#: forms.py:325 models.py:248 msgid "TAQ" msgstr "TAQ" -#: forms.py:325 models.py:251 +#: forms.py:326 models.py:252 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:327 models.py:254 +#: forms.py:328 models.py:255 msgid "TPQ" msgstr "TPQ" -#: forms.py:328 models.py:258 +#: forms.py:329 models.py:259 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: forms.py:343 +#: forms.py:344 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:345 +#: forms.py:346 msgid "You should select an operation." msgstr "Vous devez sélectionner une Opération." -#: forms.py:350 +#: forms.py:351 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: forms.py:359 +#: forms.py:360 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: forms.py:364 +#: forms.py:365 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:366 +#: forms.py:367 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:372 +#: forms.py:373 msgid "Town of the operation" msgstr "Commune de l'opération" -#: forms.py:374 +#: forms.py:375 msgid "Period of the context record" msgstr "Période de l'Unité d'Enregistrement" -#: forms.py:389 +#: forms.py:390 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:391 +#: forms.py:392 msgid "You should select a document." msgstr "Vous devez sélectionner un document." @@ -332,7 +334,7 @@ msgstr "Type de documentation" msgid "Documentation types" msgstr "Types de documentation" -#: models.py:172 models.py:571 +#: models.py:172 models.py:572 msgid "Periods" msgstr "Périodes" @@ -356,27 +358,27 @@ msgstr "Parcelle (commune)" msgid "Parcel (year)" msgstr "Parcelle (année)" -#: models.py:211 +#: models.py:212 msgid "External ID" msgstr "ID externe" -#: models.py:213 +#: models.py:214 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:221 +#: models.py:222 msgid "Date d'ouverture" msgstr "Date d'ouverture" -#: models.py:234 +#: models.py:235 msgid "A short description of the location of the context record" msgstr "Une courte description de la localisation de l'Unité d'Enregistrement" -#: models.py:239 +#: models.py:240 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:248 +#: models.py:249 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -384,11 +386,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date." -#: models.py:252 +#: models.py:253 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »." -#: models.py:255 +#: models.py:256 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -396,136 +398,136 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date." -#: models.py:259 +#: models.py:260 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:270 +#: models.py:271 msgid "Point" msgstr "Point" -#: models.py:271 +#: models.py:272 msgid "Polygon" msgstr "Polygone" -#: models.py:272 +#: models.py:273 msgid "Cached name" msgstr "Nom en cache" -#: models.py:276 models.py:277 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:277 models.py:278 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:279 +#: models.py:280 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:281 +#: models.py:282 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:283 +#: models.py:284 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:285 +#: models.py:286 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:287 +#: models.py:288 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:297 +#: models.py:298 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:501 +#: models.py:502 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:505 models.py:528 models.py:566 +#: models.py:506 models.py:529 models.py:567 msgid "Relation type" msgstr "Type de relation" -#: models.py:506 +#: models.py:507 msgid "Relation types" msgstr "Types de relation" -#: models.py:523 +#: models.py:524 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:524 +#: models.py:525 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: models.py:525 +#: models.py:526 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:526 +#: models.py:527 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:527 +#: models.py:528 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:529 +#: models.py:530 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:530 +#: models.py:531 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: models.py:531 +#: models.py:532 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:532 +#: models.py:533 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:533 +#: models.py:534 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:542 +#: models.py:543 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:543 +#: models.py:544 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:626 +#: models.py:627 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:627 +#: models.py:628 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" -#: models.py:630 +#: models.py:631 msgid "Can view all Context record sources" msgstr "Peut voir toutes les Documentations d'unité d'enregistrement" -#: models.py:632 +#: models.py:633 msgid "Can view own Context record source" msgstr "Peut voir sa propre Documentation d'unité d'enregistrement" -#: models.py:634 +#: models.py:635 msgid "Can add own Context record source" msgstr "Peut ajouter sa propre Documentation d'unité d'enregistrement" -#: models.py:636 +#: models.py:637 msgid "Can change own Context record source" msgstr "Peut modifier sa propre Documentation d'unité d'enregistrement" -#: models.py:638 +#: models.py:639 msgid "Can delete own Context record source" msgstr "Peut supprimer sa propre Documentation d'unité d'enregistrement" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 69e9d8473..633ee9e86 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -9,13 +9,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:19+0200\n" "PO-Revision-Date: 2017-04-07 06:32-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..0449fc3e9 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:19+0200\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index ce006623e..872063074 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -8,73 +8,75 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:19+0200\n" "PO-Revision-Date: 2017-04-07 06:33-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:93 forms.py:97 models_finds.py:519 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:519 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:126 ishtar_menu.py:32 models_finds.py:683 models_finds.py:1114 -#: models_finds.py:1135 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:686 models_finds.py:1117 +#: models_finds.py:1138 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:140 forms.py:337 forms.py:605 models_finds.py:150 -#: models_finds.py:613 +#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:150 +#: models_finds.py:616 msgid "Free ID" msgstr "ID libre" -#: forms.py:142 models_finds.py:666 +#: forms.py:144 models_finds.py:669 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:143 forms.py:368 forms_treatments.py:134 models_finds.py:154 -#: models_finds.py:614 models_treatments.py:128 +#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:154 +#: models_finds.py:617 models_treatments.py:128 msgid "Description" msgstr "Description" -#: forms.py:146 forms.py:370 models_finds.py:163 +#: forms.py:148 forms.py:389 models_finds.py:163 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:148 models_finds.py:643 +#: forms.py:150 models_finds.py:646 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:151 forms.py:358 forms.py:609 models_finds.py:50 +#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:50 msgid "Material type" msgstr "Type de matériau" -#: forms.py:154 forms.py:362 models_finds.py:62 models_finds.py:618 +#: forms.py:155 forms.py:381 models_finds.py:62 models_finds.py:621 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:157 models_finds.py:620 +#: forms.py:158 models_finds.py:623 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:160 models_finds.py:112 models_finds.py:646 +#: forms.py:161 models_finds.py:112 models_finds.py:649 msgid "Object types" msgstr "Types d'objet" -#: forms.py:164 forms.py:361 models_finds.py:71 +#: forms.py:164 forms.py:380 models_finds.py:71 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:167 forms.py:364 models_finds.py:648 +#: forms.py:167 forms.py:383 models_finds.py:651 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:170 forms.py:366 models_finds.py:651 +#: forms.py:170 forms.py:385 models_finds.py:654 msgid "Remarkability" msgstr "Remarquabilité" @@ -82,15 +84,15 @@ msgstr "Remarquabilité" msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:205 +#: forms.py:176 models_finds.py:170 templates/ishtar/sheet_find.html:209 msgid "X" msgstr "X" -#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:206 +#: forms.py:177 models_finds.py:171 templates/ishtar/sheet_find.html:210 msgid "Y" msgstr "Y" -#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:207 +#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:211 msgid "Z" msgstr "Z" @@ -110,69 +112,69 @@ msgstr "Erreur estimée pour Y" msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:188 models_finds.py:655 +#: forms.py:188 models_finds.py:658 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:189 models_finds.py:656 +#: forms.py:189 models_finds.py:659 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:190 models_finds.py:657 +#: forms.py:190 models_finds.py:660 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:191 models_finds.py:658 +#: forms.py:191 models_finds.py:661 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:192 models_finds.py:659 +#: forms.py:192 models_finds.py:662 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:193 forms.py:610 models_finds.py:625 +#: forms.py:193 forms.py:634 models_finds.py:628 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:194 forms.py:611 models_finds.py:626 +#: forms.py:194 forms.py:635 models_finds.py:629 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:196 models_finds.py:660 +#: forms.py:196 models_finds.py:663 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:197 forms.py:612 models_finds.py:629 +#: forms.py:197 forms.py:636 models_finds.py:632 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:199 models_finds.py:654 +#: forms.py:199 models_finds.py:657 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:200 models_finds.py:662 +#: forms.py:200 models_finds.py:665 msgid "Mark" msgstr "Marque" -#: forms.py:201 forms.py:371 models_finds.py:668 +#: forms.py:201 forms.py:390 models_finds.py:671 msgid "Check" msgstr "Vérification" -#: forms.py:203 models_finds.py:670 +#: forms.py:203 models_finds.py:673 msgid "Check date" msgstr "Date de vérification" -#: forms.py:204 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:155 models_finds.py:663 models_treatments.py:127 +#: forms.py:204 forms_treatments.py:136 forms_treatments.py:478 +#: models_finds.py:155 models_finds.py:666 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "Commentaires" -#: forms.py:207 models_finds.py:664 +#: forms.py:207 models_finds.py:667 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:208 models_finds.py:672 +#: forms.py:208 models_finds.py:675 msgid "Estimated value" msgstr "Valeur estimée" @@ -189,187 +191,191 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms.py:285 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +#: forms.py:295 +msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." -#: forms.py:294 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +#: forms.py:304 +msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." -#: forms.py:300 forms.py:331 models_finds.py:637 +#: forms.py:310 forms.py:341 models_finds.py:640 msgid "Dating" msgstr "Datation" -#: forms.py:305 forms.py:357 +#: forms.py:315 forms.py:376 msgid "Period" msgstr "Période" -#: forms.py:306 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1140 models_treatments.py:130 models_treatments.py:309 -#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 +#: forms.py:316 forms_treatments.py:138 forms_treatments.py:282 +#: forms_treatments.py:480 models_finds.py:1143 models_treatments.py:130 +#: models_treatments.py:309 templates/ishtar/sheet_find.html:95 +#: templates/ishtar/sheet_find.html:137 msgid "Start date" msgstr "Date de début" -#: forms.py:308 models_finds.py:1141 models_treatments.py:310 -#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 +#: forms.py:318 models_finds.py:1144 models_treatments.py:310 +#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 msgid "End date" msgstr "Date de fin" -#: forms.py:309 +#: forms.py:319 msgid "Quality" msgstr "Qualité" -#: forms.py:311 +#: forms.py:321 msgid "Dating type" msgstr "Type de datation" -#: forms.py:313 +#: forms.py:323 msgid "Precise dating" msgstr "Datation précise" -#: forms.py:335 models_finds.py:187 +#: forms.py:345 models_finds.py:187 msgid "Short ID" msgstr "ID court" -#: forms.py:336 models_finds.py:190 +#: forms.py:346 models_finds.py:190 msgid "Complete ID" msgstr "ID complet" -#: forms.py:340 forms_treatments.py:54 forms_treatments.py:96 -#: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406 -#: forms_treatments.py:489 models_treatments.py:103 models_treatments.py:483 +#: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 +#: forms_treatments.py:328 forms_treatments.py:400 forms_treatments.py:450 +#: forms_treatments.py:578 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "Année" -#: forms.py:342 +#: forms.py:352 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: forms.py:345 +#: forms.py:355 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: forms.py:349 +#: forms.py:359 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:355 +#: forms.py:371 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:359 models_finds.py:111 +#: forms.py:374 +#, fuzzy +msgid "Search within related context records" +msgstr "Rechercher parmi les opérations liées" + +#: forms.py:378 models_finds.py:111 msgid "Object type" msgstr "Type d'objet" -#: forms.py:372 forms_treatments.py:57 +#: forms.py:391 forms_treatments.py:57 msgid "Has an image?" msgstr "Dispose d'une image ?" -#: forms.py:421 +#: forms.py:445 msgid "Warehouse (location)" msgstr "Dépôt (lieu)" -#: forms.py:427 +#: forms.py:451 msgid "Warehouse (responsible)" msgstr "Dépôt (responsable)" -#: forms.py:432 +#: forms.py:456 msgid "Container ID" msgstr "Identifiant du contenant" -#: forms.py:433 +#: forms.py:457 msgid "Container ref." msgstr "Réf. contenant" -#: forms.py:437 forms.py:460 views.py:149 +#: forms.py:461 forms.py:484 views.py:149 msgid "Find search" msgstr "Rechercher un mobilier" -#: forms.py:485 templates/ishtar/sheet_treatment.html:46 +#: forms.py:509 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:487 models_finds.py:684 +#: forms.py:511 models_finds.py:687 msgid "Finds" msgstr "Mobilier" -#: forms.py:499 +#: forms.py:523 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: forms.py:602 +#: forms.py:626 msgid "Resulting find" msgstr "Mobilier résultant" -#: forms.py:607 +#: forms.py:631 msgid "Precise description" msgstr "Description précise" -#: forms.py:622 +#: forms.py:646 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: forms.py:627 +#: forms.py:651 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: forms.py:631 models_treatments.py:91 +#: forms.py:655 models_treatments.py:91 msgid "Upstream find" msgstr "Mobilier amont" -#: forms.py:644 +#: forms.py:668 msgid "Archaeological find search" msgstr "Rechercher un mobilier" -#: forms.py:646 +#: forms.py:670 msgid "You should select an archaeological find." msgstr "Vous devez sélectionner du mobilier." -#: forms.py:651 +#: forms.py:675 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:653 +#: forms.py:677 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:660 +#: forms.py:684 msgid "Period of the archaeological find" msgstr "Période du mobilier" -#: forms.py:662 +#: forms.py:686 msgid "Material type of the archaeological find" msgstr "Type de matériau du mobilier" -#: forms.py:664 +#: forms.py:688 msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:676 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:700 forms_treatments.py:679 forms_treatments.py:705 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:678 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:702 forms_treatments.py:681 forms_treatments.py:707 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:695 +#: forms.py:719 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." -#: forms.py:705 forms.py:709 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:729 forms.py:733 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "Panier" #: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:99 -#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127 +#: templates/ishtar/sheet_find.html:89 templates/ishtar/sheet_find.html:131 msgid "Label" msgstr "Intitulé" @@ -377,20 +383,20 @@ msgstr "Intitulé" msgid "Other ref." msgstr "Autre réf." -#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285 -#: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459 -#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:105 +#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:329 +#: forms_treatments.py:392 forms_treatments.py:401 forms_treatments.py:503 +#: forms_treatments.py:579 forms_treatments.py:646 models_treatments.py:105 #: models_treatments.py:485 msgid "Index" msgstr "Index" -#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301 -#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:110 -#: models_treatments.py:308 +#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:290 +#: forms_treatments.py:345 forms_treatments.py:667 models_treatments.py:56 +#: models_treatments.py:110 models_treatments.py:308 msgid "Treatment type" msgstr "Type de traitement" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:398 +#: forms_treatments.py:68 forms_treatments.py:649 views.py:398 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -399,7 +405,7 @@ msgid "Base treatment" msgstr "Traitement de base" #: forms_treatments.py:103 models_treatments.py:93 models_treatments.py:112 -#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129 +#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 msgid "State" msgstr "État" @@ -407,7 +413,7 @@ msgstr "État" msgid "Target" msgstr "Destination" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:120 +#: forms_treatments.py:107 forms_treatments.py:461 models_treatments.py:120 msgid "Responsible" msgstr "Responsable" @@ -423,16 +429,16 @@ msgstr "Lieu" msgid "Container (relevant for packaging)" msgstr "Contenant (pertinent dans le cadre du conditionnement)" -#: forms_treatments.py:131 forms_treatments.py:413 +#: forms_treatments.py:131 forms_treatments.py:457 msgid "External ref." msgstr "Réf. externe" -#: forms_treatments.py:136 models_treatments.py:129 +#: forms_treatments.py:132 models_treatments.py:129 msgid "Goal" msgstr "But" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:131 -#: models_treatments.py:505 +#: forms_treatments.py:140 forms_treatments.py:282 forms_treatments.py:486 +#: forms_treatments.py:534 models_treatments.py:131 models_treatments.py:505 msgid "Closing date" msgstr "Date de clôture" @@ -485,7 +491,7 @@ msgstr "Un autre traitement avec cet index existe pour {}." msgid "Associated request" msgstr "Demande associée" -#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 +#: forms_treatments.py:266 forms_treatments.py:441 ishtar_menu.py:108 #: models_treatments.py:516 models_treatments.py:544 models_treatments.py:619 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" @@ -504,121 +510,151 @@ msgstr "" msgid "Would you like to delete this treatment?" msgstr "Voulez-vous supprimer ce traitement ?" -#: forms_treatments.py:286 forms_treatments.py:334 forms_treatments.py:491 -#: forms_treatments.py:542 +#: forms_treatments.py:280 +msgid "months" +msgstr "" + +#: forms_treatments.py:280 +msgid "years" +msgstr "" + +#: forms_treatments.py:286 forms_treatments.py:538 +msgid "Slicing" +msgstr "" + +#: forms_treatments.py:289 forms_treatments.py:541 +msgid "Date get from" +msgstr "" + +#: forms_treatments.py:292 forms_treatments.py:544 +#, fuzzy +msgid "Date after" +msgstr "Date de signature après" + +#: forms_treatments.py:294 forms_treatments.py:546 +#, fuzzy +msgid "Date before" +msgstr "Date de signature avant" + +#: forms_treatments.py:330 forms_treatments.py:378 forms_treatments.py:580 +#: forms_treatments.py:631 msgid "Act type" msgstr "Type d'acte" -#: forms_treatments.py:287 forms_treatments.py:492 +#: forms_treatments.py:331 forms_treatments.py:581 msgid "Indexed?" msgstr "Indexé ?" -#: forms_treatments.py:288 forms_treatments.py:493 +#: forms_treatments.py:332 forms_treatments.py:582 msgid "Object" msgstr "Objet" -#: forms_treatments.py:292 forms_treatments.py:497 +#: forms_treatments.py:336 forms_treatments.py:586 msgid "Signature date after" msgstr "Date de signature après" -#: forms_treatments.py:294 forms_treatments.py:499 +#: forms_treatments.py:338 forms_treatments.py:588 msgid "Signature date before" msgstr "Date de signature avant" -#: forms_treatments.py:296 forms_treatments.py:573 +#: forms_treatments.py:340 forms_treatments.py:662 msgid "Treatment name" msgstr "Nom du traitement" -#: forms_treatments.py:297 forms_treatments.py:574 +#: forms_treatments.py:341 forms_treatments.py:663 msgid "Treatment year" msgstr "Année du traitement" -#: forms_treatments.py:298 forms_treatments.py:575 +#: forms_treatments.py:342 forms_treatments.py:664 msgid "Treatment index" msgstr "Index du traitement" -#: forms_treatments.py:300 forms_treatments.py:577 +#: forms_treatments.py:344 forms_treatments.py:666 msgid "Treatment internal reference" msgstr "Référence interne du traitement" -#: forms_treatments.py:304 forms_treatments.py:511 +#: forms_treatments.py:348 forms_treatments.py:600 msgid "Modified by" msgstr "Modifié par" -#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:490 +#: forms_treatments.py:398 forms_treatments.py:448 models_treatments.py:490 msgid "Name" msgstr "Nom" -#: forms_treatments.py:355 forms_treatments.py:411 +#: forms_treatments.py:399 forms_treatments.py:455 msgid "Internal ref." msgstr "Réf. interne" -#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:92 -#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:228 +#: forms_treatments.py:402 forms_treatments.py:459 models_treatments.py:92 +#: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:132 +#: templates/ishtar/sheet_find.html:232 msgid "Type" msgstr "Type" -#: forms_treatments.py:360 +#: forms_treatments.py:404 msgid "In charge" msgstr "Responsable" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:499 +#: forms_treatments.py:410 forms_treatments.py:467 models_treatments.py:499 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "Demandeur" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:503 +#: forms_treatments.py:416 forms_treatments.py:473 models_treatments.py:503 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "Organisation du demandeur" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:502 +#: forms_treatments.py:429 forms_treatments.py:654 views.py:502 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: forms_treatments.py:439 models_treatments.py:509 +#: forms_treatments.py:483 forms_treatments.py:533 models_treatments.py:509 msgid "Reception date" msgstr "Date de réception" -#: forms_treatments.py:478 +#: forms_treatments.py:522 msgid "Another treatment request with this index exists for {}." msgstr "Une autre demande de traitement avec cet index existe pour {}." -#: forms_treatments.py:484 +#: forms_treatments.py:528 msgid "Are you sure you want to delete this treatment request?" msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ? " -#: forms_treatments.py:485 +#: forms_treatments.py:529 msgid "Would you like to delete this treatment request?" msgstr "Voulez-vous supprimer cette demande de traitement ?" -#: forms_treatments.py:501 forms_treatments.py:597 +#: forms_treatments.py:532 models_treatments.py:507 +msgid "Creation date" +msgstr "Date de création" + +#: forms_treatments.py:542 forms_treatments.py:597 forms_treatments.py:693 +#: models_treatments.py:468 models_treatments.py:492 +msgid "Treatment request type" +msgstr "Type de demande de traitement" + +#: forms_treatments.py:590 forms_treatments.py:686 msgid "Treatment request name" msgstr "Nom du dossier de traitement" -#: forms_treatments.py:503 forms_treatments.py:599 +#: forms_treatments.py:592 forms_treatments.py:688 msgid "Treatment request year" msgstr "Année du dossier de traitement" -#: forms_treatments.py:505 forms_treatments.py:601 +#: forms_treatments.py:594 forms_treatments.py:690 msgid "Treatment request index" msgstr "Index de la demande de traitement" -#: forms_treatments.py:507 forms_treatments.py:603 +#: forms_treatments.py:596 forms_treatments.py:692 msgid "Treatment request internal reference" msgstr "Référence interne de la demande de traitement" -#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:468 -#: models_treatments.py:492 -msgid "Treatment request type" -msgstr "Type de demande de traitement" - -#: forms_treatments.py:562 +#: forms_treatments.py:651 msgid "You should select a treatment." msgstr "Vous devez sélectionner un traitement." -#: forms_treatments.py:568 +#: forms_treatments.py:657 msgid "You should select a treatment request." msgstr "Vous devez sélectionner une demande de traitement." @@ -652,12 +688,12 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1137 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1140 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 -#: templates/ishtar/sheet_find.html:224 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:228 msgid "Documents" msgstr "Documents" @@ -687,7 +723,7 @@ msgstr "Recommandation" msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:51 models_finds.py:539 models_finds.py:616 +#: models_finds.py:51 models_finds.py:539 models_finds.py:619 msgid "Material types" msgstr "Types de matériau" @@ -719,7 +755,7 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:97 models_finds.py:612 models_treatments.py:40 +#: models_finds.py:97 models_finds.py:615 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "Ordre" @@ -736,12 +772,12 @@ msgstr "Types de lot" msgid "Parent" msgstr "Parent" -#: models_finds.py:151 models_finds.py:609 models_treatments.py:125 +#: models_finds.py:151 models_finds.py:612 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "ID externe" -#: models_finds.py:153 models_finds.py:611 +#: models_finds.py:153 models_finds.py:614 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" @@ -781,7 +817,7 @@ msgstr "Polygon" msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:197 models_finds.py:607 +#: models_finds.py:197 models_finds.py:610 msgid "Base find" msgstr "Mobilier de base" @@ -877,9 +913,9 @@ msgstr "Mobilier de base - Intérêt spécifique" msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:537 models_finds.py:640 models_treatments.py:132 -#: models_treatments.py:312 templates/ishtar/sheet_find.html:90 -#: templates/ishtar/sheet_find.html:132 +#: models_finds.py:537 models_finds.py:643 models_treatments.py:132 +#: models_treatments.py:312 templates/ishtar/sheet_find.html:94 +#: templates/ishtar/sheet_find.html:136 msgid "Container" msgstr "Contenant" @@ -887,91 +923,91 @@ msgstr "Contenant" msgid "Periods" msgstr "Périodes" -#: models_finds.py:623 +#: models_finds.py:626 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:627 +#: models_finds.py:630 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:633 templates/ishtar/sheet_find.html:78 +#: models_finds.py:636 templates/ishtar/sheet_find.html:82 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:636 templates/ishtar/sheet_find.html:120 +#: models_finds.py:639 templates/ishtar/sheet_find.html:124 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:675 +#: models_finds.py:678 msgid "Collection" msgstr "Collection" -#: models_finds.py:677 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:680 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:686 +#: models_finds.py:689 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:687 +#: models_finds.py:690 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:688 +#: models_finds.py:691 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:689 +#: models_finds.py:692 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:690 +#: models_finds.py:693 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:696 +#: models_finds.py:699 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1100 +#: models_finds.py:1103 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1101 +#: models_finds.py:1104 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1104 +#: models_finds.py:1107 msgid "Can view all Find sources" msgstr "Peut voir toutes les Documentations de mobilier" -#: models_finds.py:1106 +#: models_finds.py:1109 msgid "Can view own Find source" msgstr "Peut voir sa propre Documentation de mobilier" -#: models_finds.py:1108 +#: models_finds.py:1111 msgid "Can add own Find source" msgstr "Peut ajouter sa propre Documentation de mobilier" -#: models_finds.py:1110 +#: models_finds.py:1113 msgid "Can change own Find source" msgstr "Peut modifier sa propre Documentation de mobilier" -#: models_finds.py:1112 +#: models_finds.py:1115 msgid "Can delete own Find source" msgstr "Peut suprimer sa propre Documentation de mobilier" -#: models_finds.py:1138 +#: models_finds.py:1141 msgid "Person" msgstr "Individu" -#: models_finds.py:1144 +#: models_finds.py:1147 msgid "Property" msgstr "Propriété" -#: models_finds.py:1145 +#: models_finds.py:1148 msgid "Properties" msgstr "Propriétés" @@ -1045,7 +1081,7 @@ msgstr "Coût d'assurance" msgid "Target a basket" msgstr "Appliquer à un panier" -#: models_treatments.py:149 templates/ishtar/sheet_find.html:75 +#: models_treatments.py:149 templates/ishtar/sheet_find.html:79 #: templates/ishtar/sheet_treatmentfile.html:46 msgid "Treatments" msgstr "Traitements" @@ -1074,8 +1110,8 @@ msgstr "Peut supprimer son propre Traitement" msgid "TREATMENT" msgstr "TRAITEMENT" -#: models_treatments.py:313 templates/ishtar/sheet_find.html:89 -#: templates/ishtar/sheet_find.html:131 +#: models_treatments.py:313 templates/ishtar/sheet_find.html:93 +#: templates/ishtar/sheet_find.html:135 msgid "Doer" msgstr "Opérateur" @@ -1099,10 +1135,6 @@ msgstr "Référence interne" msgid "Person in charge" msgstr "Personne responsable" -#: models_treatments.py:507 -msgid "Creation date" -msgstr "Date de création" - #: models_treatments.py:517 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -1184,30 +1216,18 @@ msgid "Can view Treatment request source" msgstr "Peut voir une Documentation de demande de traitement" #: models_treatments.py:633 -msgid "Can add Treatment request source" -msgstr "Peut ajouter une Documentation de demande de traitement" - -#: models_treatments.py:635 -msgid "Can change Treatment request source" -msgstr "Peut modifier une Documentation de demande de traitement" - -#: models_treatments.py:637 -msgid "Can delete Treatment request source" -msgstr "Peut supprimer une Documentation de demande de traitement" - -#: models_treatments.py:639 msgid "Can view own Treatment request source" msgstr "Peut voir sa propre Documentation de demande de traitement" -#: models_treatments.py:641 +#: models_treatments.py:635 msgid "Can add own Treatment request source" msgstr "Peut ajouter sa propre Documentation de demande de traitement" -#: models_treatments.py:643 +#: models_treatments.py:637 msgid "Can change own Treatment request source" msgstr "Peut modifier sa propre Documentation de demande de traitement" -#: models_treatments.py:645 +#: models_treatments.py:639 msgid "Can delete own Treatment request source" msgstr "Peut supprimer sa propre Documentation de demande de traitement" @@ -1335,55 +1355,61 @@ msgstr "Demande de traitement : supprimer une documentation associée" msgid "Operation" msgstr "Opération" -#: templates/ishtar/sheet_find.html:25 +#: templates/ishtar/sheet_find.html:14 +msgid "" +"This sheet has a downstream treatment: it is related to an old version of " +"the find." +msgstr "" + +#: templates/ishtar/sheet_find.html:29 msgid "Administrative index" msgstr "Index administratif" -#: templates/ishtar/sheet_find.html:67 +#: templates/ishtar/sheet_find.html:71 msgid "Warehouse" msgstr "Dépôt" -#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126 +#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 msgid "Year - index" msgstr "Année - index" -#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 +#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: templates/ishtar/sheet_find.html:116 +#: templates/ishtar/sheet_find.html:120 msgid "Export as CSV" msgstr "Export en CSV" -#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159 +#: templates/ishtar/sheet_find.html:120 templates/ishtar/sheet_find.html:163 msgid "CSV" msgstr "CSV" -#: templates/ishtar/sheet_find.html:164 +#: templates/ishtar/sheet_find.html:168 msgid "Associated base finds" msgstr "Mobilier de base associé" -#: templates/ishtar/sheet_find.html:171 +#: templates/ishtar/sheet_find.html:175 msgid "Internal ID" msgstr "ID interne" -#: templates/ishtar/sheet_find.html:203 +#: templates/ishtar/sheet_find.html:207 msgid "Coordinates" msgstr "Coordonnées" -#: templates/ishtar/sheet_find.html:210 +#: templates/ishtar/sheet_find.html:214 msgid "SRID" msgstr "SRID" -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:231 msgid "Title" msgstr "Titre" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:233 msgid "Authors" msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:230 +#: templates/ishtar/sheet_find.html:234 msgid "Link" msgstr "Lien" @@ -1452,3 +1478,12 @@ msgstr "Documentation de traitement" #: templates/ishtar/sheet_treatmentsource.html:11 msgid "Related treatment" msgstr "Traitement associé" + +#~ msgid "Can add Treatment request source" +#~ msgstr "Peut ajouter une Documentation de demande de traitement" + +#~ msgid "Can change Treatment request source" +#~ msgstr "Peut modifier une Documentation de demande de traitement" + +#~ msgid "Can delete Treatment request source" +#~ msgstr "Peut supprimer une Documentation de demande de traitement" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index ae6b3cc90..9a38552d7 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -9,13 +9,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:18+0200\n" "PO-Revision-Date: 2017-04-07 06:34-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -86,7 +88,7 @@ msgid "Relation type" msgstr "Type de relation" #: forms.py:383 ishtar_menu.py:30 models.py:372 models.py:847 models.py:882 -#: models.py:922 models.py:1026 models.py:1235 wizards.py:353 wizards.py:364 +#: models.py:922 models.py:1026 models.py:1235 wizards.py:352 wizards.py:363 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -404,8 +406,7 @@ msgstr "" #: forms.py:929 msgid "The excavation end date cannot be before the start date." -msgstr "" -"La date de fin de chantier ne peut être antérieure à la date de début." +msgstr "La date de fin de chantier ne peut être antérieure à la date de début." #: forms.py:957 #, python-format diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 61fe82a60..a37e5c875 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -7,13 +7,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:19+0200\n" "PO-Revision-Date: 2017-04-07 06:34-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 1e09aba03..07090f7cb 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-15 10:18+0200\n" "PO-Revision-Date: 2017-04-07 05:56-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -196,12 +198,12 @@ msgstr "Vous devez sélectionner un élément." msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:297 models.py:1501 +#: forms.py:297 models.py:1549 msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1567 models.py:3030 +#: forms_common.py:408 models.py:1615 models.py:3078 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -224,8 +226,8 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2630 -#: models.py:2823 models.py:2885 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2678 +#: models.py:2871 models.py:2933 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -238,64 +240,64 @@ msgstr "" "pas possible." #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2513 models.py:2604 +#: ishtar_menu.py:75 models.py:2561 models.py:2652 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 -#: forms_common.py:378 forms_common.py:448 models.py:1109 models.py:1500 -#: models.py:1769 models.py:1785 models.py:2023 models.py:2301 models.py:2507 -#: models.py:2616 models.py:3016 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1157 models.py:1548 +#: models.py:1817 models.py:1833 models.py:2071 models.py:2349 models.py:2555 +#: models.py:2664 models.py:3064 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:176 models.py:1722 models.py:2154 +#: forms_common.py:176 models.py:1770 models.py:2202 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:178 forms_common.py:402 models.py:1562 +#: forms_common.py:178 forms_common.py:402 models.py:1610 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:180 forms_common.py:405 models.py:1563 +#: forms_common.py:180 forms_common.py:405 models.py:1611 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:182 forms_common.py:406 models.py:1565 +#: forms_common.py:182 forms_common.py:406 models.py:1613 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:185 forms_common.py:409 models.py:1568 +#: forms_common.py:185 forms_common.py:409 models.py:1616 msgid "Country" msgstr "Pays" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1595 +#: forms_common.py:450 forms_common.py:574 models.py:1643 msgid "Email" msgstr "Courriel" -#: forms_common.py:188 forms_common.py:385 models.py:1580 +#: forms_common.py:188 forms_common.py:385 models.py:1628 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:189 forms_common.py:394 models.py:1592 +#: forms_common.py:189 forms_common.py:394 models.py:1640 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2192 -#: models.py:2509 models.py:2951 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2240 +#: models.py:2557 models.py:2999 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -303,7 +305,7 @@ msgstr "Téléphone portable" msgid "Type" msgstr "Type" -#: forms_common.py:222 views.py:147 +#: forms_common.py:222 views.py:149 msgid "Organization search" msgstr "Rechercher une organisation" @@ -319,12 +321,12 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2614 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2662 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" -#: forms_common.py:341 forms_common.py:436 views.py:112 +#: forms_common.py:341 forms_common.py:436 views.py:114 msgid "Person search" msgstr "Rechercher une personne" @@ -337,25 +339,25 @@ msgstr "Personne à fusionner" msgid "Identity" msgstr "Identité" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2155 -#: models.py:2608 models.py:2610 models.py:2948 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2203 +#: models.py:2656 models.py:2658 models.py:2996 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:374 models.py:2612 +#: forms_common.py:374 models.py:2660 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:380 models.py:2618 +#: forms_common.py:380 models.py:2666 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:383 models.py:1581 +#: forms_common.py:383 models.py:1629 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:386 models.py:1583 models.py:1585 +#: forms_common.py:386 models.py:1631 models.py:1633 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -363,11 +365,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:390 models.py:1589 +#: forms_common.py:390 models.py:1637 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:392 models.py:1587 +#: forms_common.py:392 models.py:1635 msgid "Phone 3" msgstr "Téléphone 3" @@ -375,23 +377,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:411 models.py:1570 +#: forms_common.py:411 models.py:1618 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:414 models.py:1573 +#: forms_common.py:414 models.py:1621 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:416 models.py:1574 +#: forms_common.py:416 models.py:1622 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:418 models.py:1576 +#: forms_common.py:418 models.py:1624 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:420 models.py:1578 +#: forms_common.py:420 models.py:1626 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -407,7 +409,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Rechercher un compte" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2561 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2609 msgid "Person type" msgstr "Type de personne" @@ -439,7 +441,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:636 forms_common.py:649 models.py:3031 +#: forms_common.py:636 forms_common.py:649 models.py:3079 msgid "Towns" msgstr "Communes" @@ -455,7 +457,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:783 forms_common.py:831 models.py:2156 models.py:2923 +#: forms_common.py:783 forms_common.py:831 models.py:2204 models.py:2971 msgid "Source type" msgstr "Type de document" @@ -467,37 +469,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:791 models.py:2962 +#: forms_common.py:791 models.py:3010 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:792 models.py:2964 +#: forms_common.py:792 models.py:3012 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:794 models.py:2327 models.py:2966 +#: forms_common.py:794 models.py:2375 models.py:3014 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:797 models.py:2969 +#: forms_common.py:797 models.py:3017 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: forms_common.py:799 forms_common.py:835 models.py:381 models.py:698 -#: models.py:2050 models.py:2622 models.py:2976 +#: forms_common.py:799 forms_common.py:835 models.py:419 models.py:746 +#: models.py:2098 models.py:2670 models.py:3024 msgid "Comment" msgstr "Commentaire" -#: forms_common.py:801 forms_common.py:834 models.py:1111 models.py:1789 -#: models.py:1977 models.py:2024 models.py:2975 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1159 models.py:1837 +#: models.py:2025 models.py:2072 models.py:3023 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:804 models.py:2977 +#: forms_common.py:804 models.py:3025 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:806 forms_common.py:838 models.py:2979 +#: forms_common.py:806 forms_common.py:838 models.py:3027 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -514,7 +516,7 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2890 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2938 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -527,7 +529,7 @@ msgstr "Informations supplémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:864 models.py:2157 models.py:2877 models.py:2887 +#: forms_common.py:864 models.py:2205 models.py:2925 models.py:2935 msgid "Author type" msgstr "Type d'auteur" @@ -539,7 +541,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:901 models.py:2891 models.py:2958 +#: forms_common.py:901 models.py:2939 models.py:3006 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -557,7 +559,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1283 views.py:1644 +#: ishtar_menu.py:39 models.py:1331 views.py:1640 msgid "Global variables" msgstr "Variables globales" @@ -585,147 +587,147 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2335 +#: ishtar_menu.py:109 models.py:2383 msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1652 +#: ishtar_menu.py:112 views.py:1648 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1666 +#: ishtar_menu.py:116 views.py:1662 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1705 +#: ishtar_menu.py:120 views.py:1701 msgid "Old imports" msgstr "Anciens imports" -#: models.py:186 +#: models.py:224 msgid "Not a valid item." msgstr "Élément invalide." -#: models.py:201 +#: models.py:239 msgid "A selected item is not a valid item." msgstr "Un élément sélectionné n'est pas valide." -#: models.py:212 +#: models.py:250 msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:377 models.py:697 models.py:1535 models.py:1547 models.py:1973 +#: models.py:415 models.py:745 models.py:1583 models.py:1595 models.py:2021 msgid "Label" msgstr "Libellé" -#: models.py:379 +#: models.py:417 msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:382 models.py:700 models.py:1504 +#: models.py:420 models.py:748 models.py:1552 msgid "Available" msgstr "Disponible" -#: models.py:724 models.py:2096 +#: models.py:772 models.py:2144 msgid "Key" msgstr "Clé" -#: models.py:730 +#: models.py:778 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: models.py:826 +#: models.py:874 msgid "Last editor" msgstr "Dernier éditeur" -#: models.py:829 +#: models.py:877 msgid "Creator" msgstr "Créateur" -#: models.py:971 models.py:2874 models.py:3042 models.py:3098 +#: models.py:1019 models.py:2922 models.py:3090 models.py:3146 msgid "Order" msgstr "Ordre" -#: models.py:972 +#: models.py:1020 msgid "Symmetrical" msgstr "Symétrique" -#: models.py:973 +#: models.py:1021 msgid "Tiny label" msgstr "Libellé court" -#: models.py:987 +#: models.py:1035 msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: models.py:1103 +#: models.py:1151 msgid "Euro" msgstr "Euro" -#: models.py:1104 +#: models.py:1152 msgid "US dollar" msgstr "Dollar US" -#: models.py:1110 models.py:1787 +#: models.py:1158 models.py:1835 msgid "Slug" msgstr "Identifiant texte" -#: models.py:1113 +#: models.py:1161 msgid "CSS color code for base module" msgstr "Code couleur CSS pour le tronc commun" -#: models.py:1115 +#: models.py:1163 msgid "Files module" msgstr "Module Dossiers" -#: models.py:1117 +#: models.py:1165 msgid "CSS color code for files module" msgstr "Code couleur CSS pour le module Dossier" -#: models.py:1119 +#: models.py:1167 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:1122 +#: models.py:1170 msgid "CSS color code for context record module" msgstr "Code couleur CSS pour le module Unité d'Enregistrement" -#: models.py:1124 +#: models.py:1172 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:1125 +#: models.py:1173 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:1127 +#: models.py:1175 msgid "CSS color code for find module" msgstr "Code couleur CSS pour le module Mobilier" -#: models.py:1130 +#: models.py:1178 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:1131 +#: models.py:1179 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:1133 +#: models.py:1181 msgid "CSS code for warehouse module" msgstr "Code couleur CSS pour le module Dépôt" -#: models.py:1135 +#: models.py:1183 msgid "Mapping module" msgstr "Module cartographique" -#: models.py:1137 +#: models.py:1185 msgid "CSS code for mapping module" msgstr "Code couleur CSS pour le module cartographique" -#: models.py:1140 +#: models.py:1188 msgid "Home page" msgstr "Page d'accueil" -#: models.py:1141 +#: models.py:1189 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -735,11 +737,11 @@ msgstr "" "défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: models.py:1145 +#: models.py:1193 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:1147 +#: models.py:1195 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -749,11 +751,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1152 +#: models.py:1200 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:1155 +#: models.py:1203 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -763,11 +765,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1160 +#: models.py:1208 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:1162 +#: models.py:1210 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -777,11 +779,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1167 +#: models.py:1215 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:1169 +#: models.py:1217 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -791,11 +793,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1174 +#: models.py:1222 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:1176 +#: models.py:1224 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -805,11 +807,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1181 +#: models.py:1229 msgid "Container external id" msgstr "ID externe du contenant" -#: models.py:1183 +#: models.py:1231 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -819,11 +821,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1188 +#: models.py:1236 msgid "Warehouse external id" msgstr "ID externe du dépôt" -#: models.py:1190 +#: models.py:1238 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -833,11 +835,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1195 +#: models.py:1243 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: models.py:1197 +#: models.py:1245 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -847,43 +849,43 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: models.py:1201 +#: models.py:1249 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:1202 +#: models.py:1250 msgid "Currency" msgstr "Devise" -#: models.py:1206 +#: models.py:1254 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:1207 +#: models.py:1255 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:1276 +#: models.py:1324 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1277 +#: models.py:1325 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1279 models.py:2097 +#: models.py:1327 models.py:2145 msgid "Value" msgstr "Valeur" -#: models.py:1282 +#: models.py:1330 msgid "Global variable" msgstr "Variable globale" -#: models.py:1405 models.py:1435 +#: models.py:1453 models.py:1483 msgid "Total" msgstr "Total" -#: models.py:1412 models.py:1536 models.py:1548 +#: models.py:1460 models.py:1584 models.py:1596 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -891,135 +893,135 @@ msgstr "Total" msgid "Number" msgstr "Nombre" -#: models.py:1499 +#: models.py:1547 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1503 +#: models.py:1551 msgid "Associated object" msgstr "Objet associé" -#: models.py:1507 +#: models.py:1555 msgid "Document template" msgstr "Patron de document" -#: models.py:1508 +#: models.py:1556 msgid "Document templates" msgstr "Patrons de document" -#: models.py:1539 models.py:1549 models.py:2321 +#: models.py:1587 models.py:1597 models.py:2369 msgid "State" msgstr "État" -#: models.py:1553 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1601 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1554 +#: models.py:1602 msgid "Departments" msgstr "Départements" -#: models.py:1591 +#: models.py:1639 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1597 +#: models.py:1645 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1636 +#: models.py:1684 msgid "Tel: " msgstr "Tél :" -#: models.py:1640 +#: models.py:1688 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1644 +#: models.py:1692 msgid "Email: " msgstr "Courriel :" -#: models.py:1649 +#: models.py:1697 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1723 +#: models.py:1771 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1770 +#: models.py:1818 msgid "Class name" msgstr "Nom de la classe" -#: models.py:1773 +#: models.py:1821 msgid "Importer - Model" msgstr "Importeur - Modèle" -#: models.py:1774 +#: models.py:1822 msgid "Importer - Models" msgstr "Importeur - Modèles" -#: models.py:1791 templates/ishtar/dashboards/dashboard_main.html:34 +#: models.py:1839 templates/ishtar/dashboards/dashboard_main.html:34 msgid "Users" msgstr "Utilisateurs" -#: models.py:1794 +#: models.py:1842 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1797 +#: models.py:1845 msgid "Models that can accept new items" msgstr "Modèles qui peuvent accepter de nouveaux éléments" -#: models.py:1798 +#: models.py:1846 msgid "Leave blank for no restrictions" msgstr "Laissez vide pour aucune restriction" -#: models.py:1800 +#: models.py:1848 msgid "Is template" msgstr "Est un patron" -#: models.py:1801 +#: models.py:1849 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1805 +#: models.py:1853 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1806 +#: models.py:1854 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1905 +#: models.py:1953 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1906 +#: models.py:1954 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1941 +#: models.py:1989 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1942 +#: models.py:1990 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:1976 +#: models.py:2024 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:1979 +#: models.py:2027 msgid "Required" msgstr "Requis" -#: models.py:1981 +#: models.py:2029 msgid "Export field name" msgstr "Exporter le nom du champ" -#: models.py:1982 +#: models.py:2030 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." @@ -1027,531 +1029,531 @@ msgstr "" "Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple " "dans le cas de champs concaténés." -#: models.py:1987 +#: models.py:2035 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:1988 +#: models.py:2036 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:2008 +#: models.py:2056 msgid "Field name" msgstr "Nom du champ" -#: models.py:2010 models.py:2044 +#: models.py:2058 models.py:2092 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:2012 models.py:2046 +#: models.py:2060 models.py:2094 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:2014 models.py:2048 +#: models.py:2062 models.py:2096 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:2018 +#: models.py:2066 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:2019 +#: models.py:2067 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:2026 +#: models.py:2074 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:2029 +#: models.py:2077 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:2030 +#: models.py:2078 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:2053 +#: models.py:2101 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:2054 +#: models.py:2102 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:2078 views.py:568 +#: models.py:2126 views.py:570 msgid "True" msgstr "Oui" -#: models.py:2079 views.py:570 +#: models.py:2127 views.py:572 msgid "False" msgstr "Non" -#: models.py:2098 +#: models.py:2146 msgid "Is set" msgstr "Est défini" -#: models.py:2105 +#: models.py:2153 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: models.py:2106 +#: models.py:2154 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2158 models.py:2954 +#: models.py:2206 models.py:3002 msgid "Format" msgstr "Format" -#: models.py:2159 models.py:3046 +#: models.py:2207 models.py:3094 msgid "Operation type" msgstr "Type d'opération" -#: models.py:2160 +#: models.py:2208 msgid "Period" msgstr "Période" -#: models.py:2161 +#: models.py:2209 msgid "Report state" msgstr "État de rapport" -#: models.py:2162 +#: models.py:2210 msgid "Remain type" msgstr "Type de vestige" -#: models.py:2163 +#: models.py:2211 msgid "Unit" msgstr "Unité" -#: models.py:2165 +#: models.py:2213 msgid "Activity type" msgstr "Type d'activité" -#: models.py:2166 +#: models.py:2214 msgid "Material" msgstr "Matériau" -#: models.py:2168 +#: models.py:2216 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:2169 +#: models.py:2217 msgid "Container type" msgstr "Type de contenant" -#: models.py:2170 +#: models.py:2218 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:2171 +#: models.py:2219 msgid "Object type" msgstr "Type d'objet" -#: models.py:2172 +#: models.py:2220 msgid "Integrity type" msgstr "Type d'intégrité" -#: models.py:2174 +#: models.py:2222 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models.py:2175 +#: models.py:2223 msgid "Batch type" msgstr "Type de lot" -#: models.py:2177 +#: models.py:2225 msgid "Identification type" msgstr "Type d'identification" -#: models.py:2179 +#: models.py:2227 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2180 models.py:3104 +#: models.py:2228 models.py:3152 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2181 models.py:2932 +#: models.py:2229 models.py:2980 msgid "Support type" msgstr "Type de support" -#: models.py:2182 models.py:2573 +#: models.py:2230 models.py:2621 msgid "Title type" msgstr "Type de titre" -#: models.py:2188 +#: models.py:2236 msgid "Integer" msgstr "Entier" -#: models.py:2189 +#: models.py:2237 msgid "Float" msgstr "Nombre à virgule" -#: models.py:2190 +#: models.py:2238 msgid "String" msgstr "Chaîne de caractères" -#: models.py:2191 templates/sheet_ope.html:86 +#: models.py:2239 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:2193 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2241 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:2194 +#: models.py:2242 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:2195 +#: models.py:2243 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:2196 +#: models.py:2244 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:2212 +#: models.py:2260 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:2213 +#: models.py:2261 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:2214 +#: models.py:2262 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2224 +#: models.py:2272 msgid "Options" msgstr "Options" -#: models.py:2226 +#: models.py:2274 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2230 +#: models.py:2278 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2231 +#: models.py:2279 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2283 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2331 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2284 +#: models.py:2332 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2285 +#: models.py:2333 msgid "Analysed" msgstr "Analysé" -#: models.py:2286 +#: models.py:2334 msgid "Import pending" msgstr "Import en attente" -#: models.py:2287 +#: models.py:2335 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2288 +#: models.py:2336 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2289 +#: models.py:2337 msgid "Finished" msgstr "Terminé" -#: models.py:2290 +#: models.py:2338 msgid "Archived" msgstr "Archivé" -#: models.py:2305 +#: models.py:2353 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2307 +#: models.py:2355 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2309 +#: models.py:2357 msgid "Encoding" msgstr "Codage" -#: models.py:2311 +#: models.py:2359 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2312 templates/ishtar/import_list.html:51 +#: models.py:2360 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2315 +#: models.py:2363 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2318 templates/ishtar/import_list.html:57 +#: models.py:2366 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2324 +#: models.py:2372 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2328 +#: models.py:2376 msgid "End date" msgstr "Date de fin" -#: models.py:2331 +#: models.py:2379 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2334 +#: models.py:2382 msgid "Import" msgstr "Import" -#: models.py:2363 +#: models.py:2411 msgid "Analyse" msgstr "Analyser" -#: models.py:2365 models.py:2368 +#: models.py:2413 models.py:2416 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2366 +#: models.py:2414 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2369 +#: models.py:2417 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2370 +#: models.py:2418 msgid "Archive" msgstr "Archiver" -#: models.py:2372 +#: models.py:2420 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2373 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2421 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2514 +#: models.py:2562 msgid "Organizations" msgstr "Organisations" -#: models.py:2516 +#: models.py:2564 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2517 +#: models.py:2565 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2518 +#: models.py:2566 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2520 +#: models.py:2568 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2522 +#: models.py:2570 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2557 +#: models.py:2605 msgid "Groups" msgstr "Groupes" -#: models.py:2562 +#: models.py:2610 msgid "Person types" msgstr "Types de personne" -#: models.py:2574 +#: models.py:2622 msgid "Title types" msgstr "Types de titre" -#: models.py:2583 +#: models.py:2631 msgid "Mr" msgstr "M." -#: models.py:2584 +#: models.py:2632 msgid "Miss" msgstr "Mlle" -#: models.py:2585 +#: models.py:2633 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2586 +#: models.py:2634 msgid "Mrs" msgstr "Mme" -#: models.py:2587 +#: models.py:2635 msgid "Doctor" msgstr "Dr." -#: models.py:2620 +#: models.py:2668 msgid "Contact type" msgstr "Type de contact" -#: models.py:2623 models.py:2687 +#: models.py:2671 models.py:2735 msgid "Types" msgstr "Types" -#: models.py:2626 +#: models.py:2674 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2631 +#: models.py:2679 msgid "Persons" msgstr "Personnes" -#: models.py:2633 +#: models.py:2681 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2634 +#: models.py:2682 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2635 +#: models.py:2683 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2636 +#: models.py:2684 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2637 +#: models.py:2685 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2826 +#: models.py:2874 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2829 +#: models.py:2877 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2830 +#: models.py:2878 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2870 +#: models.py:2918 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2878 +#: models.py:2926 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2895 +#: models.py:2943 msgid "Can view all Authors" msgstr "Peut voir tous les Auteurs" -#: models.py:2897 +#: models.py:2945 msgid "Can view own Author" msgstr "Peut voir son propre Auteur" -#: models.py:2899 +#: models.py:2947 msgid "Can add own Author" msgstr "Peut ajouter son propre Auteur" -#: models.py:2901 +#: models.py:2949 msgid "Can change own Author" msgstr "Peut modifier son propre Auteur" -#: models.py:2903 +#: models.py:2951 msgid "Can delete own Author" msgstr "Peut supprimer son propre Auteur" -#: models.py:2924 +#: models.py:2972 msgid "Source types" msgstr "Types de document" -#: models.py:2933 +#: models.py:2981 msgid "Support types" msgstr "Types de support" -#: models.py:2940 +#: models.py:2988 msgid "Format type" msgstr "Type de format" -#: models.py:2941 +#: models.py:2989 msgid "Format types" msgstr "Types de format" -#: models.py:2949 +#: models.py:2997 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2952 +#: models.py:3000 msgid "Support" msgstr "Support" -#: models.py:2956 +#: models.py:3004 msgid "Scale" msgstr "Échelle" -#: models.py:2970 +#: models.py:3018 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2971 +#: models.py:3019 msgid "Ref." msgstr "Réf." -#: models.py:2974 +#: models.py:3022 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:3017 +#: models.py:3065 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:3018 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3066 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:3043 +#: models.py:3091 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:3047 +#: models.py:3095 msgid "Operation types" msgstr "Types d'opération" -#: models.py:3076 +#: models.py:3124 msgid "Preventive" msgstr "Préventif" -#: models.py:3077 +#: models.py:3125 msgid "Research" msgstr "Programmé" -#: models.py:3100 +#: models.py:3148 msgid "Authority name" msgstr "Registre" -#: models.py:3101 +#: models.py:3149 msgid "Authority SRID" msgstr "SRID" -#: models.py:3105 +#: models.py:3153 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1563,120 +1565,120 @@ msgstr " (...)" msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: views.py:119 +#: views.py:121 msgid "New person" msgstr "Ajouter une personne" -#: views.py:127 +#: views.py:129 msgid "Person modification" msgstr "Modifier une personne" -#: views.py:142 +#: views.py:144 msgid "Person deletion" msgstr "Supprimer une personne" -#: views.py:153 +#: views.py:155 msgid "New organization" msgstr "Ajouter une organisation" -#: views.py:160 +#: views.py:162 msgid "Organization modification" msgstr "Modifier une organisation" -#: views.py:176 +#: views.py:178 msgid "Organization deletion" msgstr "Supprimer une organisation" -#: views.py:183 +#: views.py:185 msgid "Account management" msgstr "Gérer les comptes" -#: views.py:189 +#: views.py:191 msgid "Account deletion" msgstr "Supprimer un compte" -#: views.py:251 +#: views.py:253 msgid "Archaeological file" msgstr "Dossier" -#: views.py:252 +#: views.py:254 msgid "Operation" msgstr "Opération" -#: views.py:254 +#: views.py:256 msgid "Context record" msgstr "Unité d'Enregistrement" -#: views.py:256 +#: views.py:258 msgid "Find" msgstr "Mobilier" -#: views.py:258 +#: views.py:260 msgid "Treatment request" msgstr "Demande de traitement" -#: views.py:259 +#: views.py:261 msgid "Treatment" msgstr "Traitement" -#: views.py:1387 views.py:1430 +#: views.py:1376 views.py:1419 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1389 +#: views.py:1378 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1448 views.py:1501 +#: views.py:1437 views.py:1496 msgid "Archaeological files" msgstr "Dossiers" -#: views.py:1449 views.py:1505 +#: views.py:1438 views.py:1500 msgid "Operations" msgstr "Opérations" -#: views.py:1451 views.py:1509 +#: views.py:1440 views.py:1504 msgid "Context records" msgstr "Unités d'Enregistrement" -#: views.py:1453 views.py:1512 +#: views.py:1442 views.py:1507 msgid "Finds" msgstr "Mobilier" -#: views.py:1455 views.py:1517 +#: views.py:1444 views.py:1512 msgid "Treatment requests" msgstr "Demandes de traitement" -#: views.py:1456 views.py:1521 +#: views.py:1445 views.py:1518 msgid "Treatments" msgstr "Traitements" -#: views.py:1719 templates/ishtar/import_list.html:47 +#: views.py:1715 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1734 +#: views.py:1730 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1773 +#: views.py:1769 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1797 +#: views.py:1793 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1806 +#: views.py:1802 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1816 +#: views.py:1812 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1856 views.py:1872 +#: views.py:1852 views.py:1868 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1745,8 +1747,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "" -"Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2422,8 +2423,8 @@ msgid "" "Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s -" -" logiciel libre sous licence AGPL v3." +"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s " +"- logiciel libre sous licence AGPL v3." #: templates/ishtar/blocks/sheet_creation_section.html:3 msgctxt "Sheet" |