diff options
| -rw-r--r-- | Makefile.example | 12 | ||||
| -rw-r--r-- | archaeological_files/models.py | 21 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_findbasket.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 6 | ||||
| -rw-r--r-- | changelog/fr/changelog_2023-01-25.md | 3 | ||||
| -rw-r--r-- | docs/fr/source/_templates/annexe-tech-3-variables-gen.jinja | 39 | ||||
| -rw-r--r-- | docs/fr/source/annexe-1-champs.rst | 6 | ||||
| -rw-r--r-- | docs/fr/source/annexe-tech-3-variables-gen.rst | 215 | ||||
| -rw-r--r-- | docs/generate_values_doc.py | 33 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 1795 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 1789 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 1798 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 1789 |
16 files changed, 3906 insertions, 3608 deletions
diff --git a/Makefile.example b/Makefile.example index 0ec951651..ece0024e7 100644 --- a/Makefile.example +++ b/Makefile.example @@ -58,11 +58,15 @@ compilemessages: ## compile translations cd $(CURDIR); \ $(PYTHON) $(project)/manage.py compilemessages; \ -build_doc_values: +##@ Documentation + +build_doc: build_doc_values build_doc_model_graph build_doc_changelog ## generate all documentation + +build_doc_values: ## generate technical annex 3 - values cd $(project);\ echo 'exec(open("../docs/generate_values_doc.py").read())' | $(PYTHON) ./manage.py shell -build_doc_model_graph: +build_doc_model_graph: ## generate graph models cd $(project);\ $(PYTHON) manage.py graph_models --pydot -g -I "ImporterModel,ImporterType,ImporterDefault,ImporterDefaultValues,ImporterColumn,Regexp,ImportTarget,FormaterType,Import" ishtar_common > /tmp/ishtar-imports.dot ;\ dot -Tsvg /tmp/ishtar-imports.dot -o ../docs/source/_static/db-imports.svg @@ -74,7 +78,7 @@ build_doc_model_graph: rm /tmp/ishtar-$$APP.dot ; \ done -build_doc_changelog: +build_doc_changelog: ## generate changelog - deprecated? mkdir -p docs/changelog/build/ cp -r docs/changelog/css docs/changelog/build/ cp -r docs/changelog/img docs/changelog/build/ @@ -110,8 +114,6 @@ build_doc_changelog: done ;\ done -build_doc: build_doc_values build_doc_model_graph build_doc_changelog ## generate documentation - ##@ Development: tests test: clean ## launch tests diff --git a/archaeological_files/models.py b/archaeological_files/models.py index dcee68e88..29c5188eb 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -253,6 +253,21 @@ class EquipmentServiceCost(models.Model): ) ADMIN_SECTION = _("Preventive") + @classmethod + def get_documentation_string(cls): + """ + Used for automatic documentation generation + """ + s = [] + exclude = ["id", "order", "availabel"] + for field in cls._meta.get_fields(): + if field.name in exclude: + continue + if hasattr(field, "verbose_name"): + s.append(f"**{field.name}** {field.verbose_name}") + s = ", ".join(s) + return s + def __str__(self): lbl = "" if self.parent: @@ -1419,6 +1434,8 @@ class PreventiveFileGroundJob(ManDays): class Meta: ordering = ("job",) + verbose_name = _("Human requirement on field") + verbose_name_plural = _("Human requirements on field") ADMIN_SECTION = _("Preventive") @property @@ -1436,6 +1453,8 @@ class PreventiveFileJob(ManDays): class Meta: ordering = ("job",) + verbose_name = _("Human requirement for post-excavation") + verbose_name_plural = _("Human requirements for post-excavation") ADMIN_SECTION = _("Preventive") @property @@ -1461,6 +1480,8 @@ class PreventiveFileEquipmentServiceCost(models.Model): class Meta: ordering = ("equipment_service_cost",) + verbose_name = _("Equipment requirement") + verbose_name_plural = _("Equipment requirements") ADMIN_SECTION = _("Preventive") @property diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 35ba0f5c0..fff692917 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -906,7 +906,7 @@ WEIGHT_UNIT = ( class FindBasket(Basket, MainItem, ValueGetter): SHOW_URL = "show-findbasket" SLUG = "findbasket" - items = models.ManyToManyField("Find", blank=True, related_name="basket") + items = models.ManyToManyField("Find", blank=True, related_name="basket", verbose_name=_("Associated finds")) QA_EDIT = QuickAction( url="findbasket-qa-bulk-update", diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 3d1759b54..04747e3a1 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -1109,7 +1109,7 @@ class TreatmentFile( _("Internal reference"), blank=True, null=True, max_length=200 ) external_id = models.CharField( - _("External ID"), blank=True, null=True, max_length=200 + _("Reference"), blank=True, null=True, max_length=200 ) name = models.TextField(_("Name"), blank=True, default="") type = models.ForeignKey( diff --git a/archaeological_finds/templates/ishtar/sheet_findbasket.html b/archaeological_finds/templates/ishtar/sheet_findbasket.html index af5baea5d..4b3d9321e 100644 --- a/archaeological_finds/templates/ishtar/sheet_findbasket.html +++ b/archaeological_finds/templates/ishtar/sheet_findbasket.html @@ -11,7 +11,7 @@ <div class='row'> {% field_flex "Label" item.label %} - {% field_flex_detail "Owned by" item.user.person %} + {% field_flex_detail _("Owned by") item.user.person %} {% field_flex "Slug" item.slug %} {% field_flex "Is public" item.public %} {% field_flex "Comment" item.comment %} diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 333128c06..760ce1b4b 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1358,7 +1358,7 @@ class Operation( Person, blank=True, null=True, - verbose_name=_("Scientific manager"), + verbose_name=_("Head scientist"), on_delete=models.SET_NULL, related_name="operation_scientist_responsability", ) @@ -1374,7 +1374,7 @@ class Operation( Person, blank=True, null=True, - verbose_name=_("Operation monitor"), + verbose_name=_("Scientific monitor"), on_delete=models.SET_NULL, related_name="operation_monitoring", ) @@ -2849,7 +2849,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, null=True, related_name="adminact_scientist", on_delete=models.SET_NULL, - verbose_name=_("Scientist in charge"), + verbose_name=_("Head scientist"), ) signatory = models.ForeignKey( Person, diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md index 0ffd90abc..366a8d392 100644 --- a/changelog/fr/changelog_2023-01-25.md +++ b/changelog/fr/changelog_2023-01-25.md @@ -10,9 +10,6 @@ v4.1.15 - 2024-06-11 - Document : champ cache auteurs pour affichage dans les tables (#5709) - Files d'attente d'imports - modification du script de lancement par défaut afin de traiter les demandes de faible priorité (#5679) -Traduit avec DeepL.com (version gratuite) - - v4.1.14 - 2024-06-05 -------------------- diff --git a/docs/fr/source/_templates/annexe-tech-3-variables-gen.jinja b/docs/fr/source/_templates/annexe-tech-3-variables-gen.jinja index 667b4bd2c..fbc4f85de 100644 --- a/docs/fr/source/_templates/annexe-tech-3-variables-gen.jinja +++ b/docs/fr/source/_templates/annexe-tech-3-variables-gen.jinja @@ -22,7 +22,7 @@ On peut passer d'un élément lié à un autre (par exemple, accéder à l'opér Ci-dessous la liste des variables pour chaque type d'éléments. -..warning:: Cette documentation liste tous les champs en base de données (moins quelques champs de gestion interne). Certains sont des champs historiques obsolètes voués à disparaître, d'autres sont des champs mis en place pour des futures fonctionnalités et peuvent encore faire l'objet de modifications. Tout champ listé ci-dessous qui ne correspond pas à un champ accessible depuis l'interface d'Ishtar ne doit normalement pas être utilisé. +.. warning:: Cette documentation liste tous les champs en base de données (moins quelques champs de gestion interne). Certains sont des champs historiques obsolètes voués à disparaître, d'autres sont des champs mis en place pour des futures fonctionnalités et peuvent encore faire l'objet de modifications. Tout champ listé ci-dessous qui ne correspond pas à un champ accessible depuis l'interface d'Ishtar ne doit normalement pas être utilisé. .. _valeurs-champs-adresse: @@ -96,6 +96,11 @@ Datation {{ archaeological_context_records['dating']['render'] }} +Panier (mobilier) +***************** + +{{ archaeological_finds['findbasket']['render'] }} + Modèles des éléments principaux ------------------------------- @@ -106,6 +111,11 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : {{ archaeological_operations['operation']['render'] }} +Relations entre opérations +++++++++++++++++++++++++++ + +{{ archaeological_operations['recordrelations']['render'] }} + Site/Entité archéologique ************************* @@ -120,6 +130,22 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui {{ archaeological_files['file']['render'] }} + +Besoins humains terrains +++++++++++++++++++++++++ + +{{ archaeological_files['preventivefilegroundjob']['render'] }} + +Besoins humains post-fouille +++++++++++++++++++++++++++++ + +{{ archaeological_files['preventivefilejob']['render'] }} + +Besoins en équipements +++++++++++++++++++++++ + +{{ archaeological_files['preventivefileequipmentservicecost']['render'] }} + Unité d'enregistrement ********************** @@ -127,6 +153,11 @@ Chaque unité d'enregistrement dispose du champ `data__` ainsi que des champs su {{ archaeological_context_records['contextrecord']['render'] }} +Relations entre unités d'enregistrement ++++++++++++++++++++++++++++++++++++++++ + +{{ archaeological_context_records['recordrelations']['render'] }} + Mobilier d'origine ****************** @@ -155,10 +186,10 @@ Chaque demande de traitement dispose du champ `data__` ainsi que des champs suiv {{ archaeological_finds['treatmentfile']['render'] }} -Dépot -***** +Lieu de conservation +******************** -Chaque dépot dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du champ `data__` ainsi que des champs suivants : +Chaque lieu de conservation dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du champ `data__` ainsi que des champs suivants : {{ archaeological_warehouse['warehouse']['render'] }} diff --git a/docs/fr/source/annexe-1-champs.rst b/docs/fr/source/annexe-1-champs.rst index b06350485..820269442 100644 --- a/docs/fr/source/annexe-1-champs.rst +++ b/docs/fr/source/annexe-1-champs.rst @@ -7,7 +7,7 @@ Annexe 1 - Liste et description des champs ========================================== :Auteur: Perrine Pautrat, Valérie-Emma Leroux, Étienne Loks -:Date: 2024-06-06 +:Date: 2024-06-19 :Copyright: CC-BY 3.0 ---------------------------------- @@ -405,12 +405,12 @@ Unité d'enregistrement | `Module Unité d'enregistrement` - | Numéro de parcelle comme enregistré dans l'élément d'opération archéologique. | `Table opérations / parcelles.` - * - | **Site \*** + * - | **Site** | `Lien vers autre table` | `Module Unité d'enregistrement` - | Crée un lien avec un site présentant des caractéristiques similaires à cette ue. | `Table sites.` - * - | **Identifiant** + * - | **Identifiant \*** | `Texte` | `Module Unité d'enregistrement` - | Nom de l'UE comme indiqué par le RO lors de la fouille. diff --git a/docs/fr/source/annexe-tech-3-variables-gen.rst b/docs/fr/source/annexe-tech-3-variables-gen.rst index b9c206c0e..656b4d4c1 100644 --- a/docs/fr/source/annexe-tech-3-variables-gen.rst +++ b/docs/fr/source/annexe-tech-3-variables-gen.rst @@ -7,8 +7,9 @@ Annexe technique 3 - Variables ============================== :Auteurs: Étienne Loks, Ishtar team -:Date: 2024-05-10 +:Date: 2024-06-17 :Copyright: CC-BY 3.0 +:Ishtar Version: v4.1.15 ---------------------------------- @@ -21,7 +22,7 @@ On peut passer d'un élément lié à un autre (par exemple, accéder à l'opér Ci-dessous la liste des variables pour chaque type d'éléments. -..warning:: Cette documentation liste tous les champs en base de données (moins quelques champs de gestion interne). Certains sont des champs historiques obsolètes voués à disparaître, d'autres sont des champs mis en place pour des futures fonctionnalités et peuvent encore faire l'objet de modifications. Tout champ listé ci-dessous qui ne correspond pas à un champ accessible depuis l'interface d'Ishtar ne doit normalement pas être utilisé. +.. warning:: Cette documentation liste tous les champs en base de données (moins quelques champs de gestion interne). Certains sont des champs historiques obsolètes voués à disparaître, d'autres sont des champs mis en place pour des futures fonctionnalités et peuvent encore faire l'objet de modifications. Tout champ listé ci-dessous qui ne correspond pas à un champ accessible depuis l'interface d'Ishtar ne doit normalement pas être utilisé. .. _valeurs-champs-adresse: @@ -61,8 +62,6 @@ Les champs adresse sont une liste de variables partagées par plusieurs élémen - **postal_code** : *Chaîne de caractères (10)* - Code postal - **precise_town_id** : *Entier positif* - Commune (précis) - **raw_phone** : *Texte* - Téléphone brut -- **timestamp_geo** : *Entier* - Horodatage géographique -- **timestamp_label** : *Entier* - Horodatage libellé - **town** : *Chaîne de caractères (150)* - Commune (saisie libre) Personne @@ -90,7 +89,7 @@ Chaque personne dispose des :ref:`champs adresse <valeurs-champs-adresse>`, ains - **operation_collaborator__** : *→ Opérations (collaborateurs)* - **operation_monitoring__** : *→ Opérations (responsable de suivi scientifique)* - **operation_protagonist__** : *→ Opérations (nom du protagoniste)* -- **operation_scientist_responsability__** : *→ Opérations (responsable de suivi scientifique)* +- **operation_scientist_responsability__** : *→ Opérations (responsable d'opération)* - **person_types__** : *→ Type de personne* (**label** Dénomination, **txt_idx** Identifiant textuel) - Types - **raw_name** : *Chaîne de caractères (300)* - Nom brut - **responsible_town_planning_service_files__** : *→ Dossiers archéologiques (responsable pour le service instructeur)* @@ -151,11 +150,12 @@ Documentation - **additional_information** : *Texte* - Information supplémentaire - **administrativeacts__** : *→ Actes administratifs (documents)* - **areas__** : *→ Zones* (documents - **label** Dénomination, **txt_idx** Identifiant textuel) -- **associated_file** : *Image (255)* - Dossier associé - La taille maximale supportée pour le fichier est de 100 Mo. +- **associated_file** : *Fichier (255)* - Fichier associé - La taille maximale supportée pour le fichier est de 100 Mo. - **associated_links** : *Texte* - Liens symboliques - **associated_url** : *Adresse web (1000)* - Ressource numérique (adresse web) - **authors__** : *→ Auteur* - Auteurs - **authors_raw** : *Chaîne de caractères (250)* - Auteurs (brut) +- **cache_authors** : *Texte* - Auteurs - Valeur en cache - ne pas éditer - **cache_related_label** : *Texte* - Lié - Valeur en cache - ne pas éditer - **cached_label** : *Texte* - Nom en cache - Généré automatiquement - ne pas éditer - **children__** : *→ Documents (source)* @@ -167,7 +167,7 @@ Documentation - **context_records__** : *→ Unité d'Enregistrement (documents)* - **copyright** : *Texte* - Crédit photographique / mentions obligatoires - **creation_date** : *Date* - Date de création -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **description** : *Texte* - Description - **duplicate** : *Booléen* - Existe en doublon - **external_id** : *Texte* - Identifiant @@ -176,11 +176,11 @@ Documentation - **format_type__** : *→ Type de format* (**label** Dénomination, **txt_idx** Identifiant textuel) - Format - **image** : *Image (255)* - image - La taille maximale supportée pour le fichier est de 100 Mo. - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **internal_reference** : *Texte* - Réf. interne - **isbn** : *Chaîne de caractères (17)* - ISBN - **issn** : *Chaîne de caractères (10)* - ISSN -- **item_number** : *Entier* - Nombre d'éléments +- **item_number** : *Entier positif* - Nombre d'éléments - **language__** : *→ Type de langue* (**label** Dénomination, **txt_idx** Identifiant textuel) - Langue - **licenses__** : *→ Type de licence* (**label** Dénomination, **txt_idx** Identifiant textuel) - Droit d’utilisation / licence - **main_image_administrativeacts__** : *→ Actes administratifs (image principale)* @@ -228,6 +228,9 @@ Documentation - **buffer_type__** : *→ Géographie - Type de tampon* (**label** Dénomination, **txt_idx** Identifiant textuel) - buffer type - **comment** : *Texte* - Commentaire - **data_type__** : *→ Géographie - Type de données* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de donnée - Par exemple : contour, Z-supérieur, ... +- **estimated_error_x** : *Nombre à virgule* - Erreur estimée pour X +- **estimated_error_y** : *Nombre à virgule* - Erreur estimée pour Y +- **estimated_error_z** : *Nombre à virgule* - Erreur estimée pour Z - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports - **main_related_items_archaeological_context_records_contextrecord__** : *→ Unité d'Enregistrement (élément géographique principal)* - **main_related_items_archaeological_finds_basefind__** : *→ Mobilier d'origine (élément géographique principal)* @@ -238,8 +241,10 @@ Documentation - **main_related_items_ishtar_common_town__** : *→ Communes* (élément géographique principal - **name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - **multi_line** : *Multi-lignes* - Lignes multiples - **multi_points** : *Multi-points* - Points multiples +- **multi_polygon** : *Multi-polygones* - Polygones multi-parties - **name** : *Texte* - Nom - **origin__** : *→ Géographie - Type d'origine* (**label** Dénomination, **txt_idx** Identifiant textuel) - Origine - Par exemple : levé topographiques, géoréférencement, ... +- **point_2d** : *Point* - Point (2D) - **point_3d** : *Point* - Point (3D) - **provider__** : *→ Géographie - Type de fournisseur* (**label** Dénomination, **txt_idx** Identifiant textuel) - Fournisseur - Fournisseur de données - **related_items_archaeological_context_records_contextrecord__** : *→ Unité d'Enregistrement (élément géographique)* @@ -252,6 +257,9 @@ Documentation - **source_content_type__** : *→ type de contenu* - source content type - **source_id** : *Entier positif* - source id - **spatial_reference_system__** : *→ Géographie - Système de référence spatiale* (**label** Dénomination, **txt_idx** Identifiant textuel, **srid** SRID, **auth_name** Registre) - Système de référence spatiale +- **x** : *Nombre à virgule* - X/Long - Saisie utilisateur +- **y** : *Nombre à virgule* - Y/Lat - Saisie utilisateur +- **z** : *Nombre à virgule* - Z - Saisie utilisateur Acte administratif ****************** @@ -265,7 +273,7 @@ Acte administratif - **documents__** : *→ Document* - Documents - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports - **in_charge__** : *→ Personne* - Responsable de suivi scientifique -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **main_image__** : *→ Document* - Image principale - **operation__** : *→ Opération* - Opération - **operator__** : *→ Organisation* - Opérateur d'archéologie préventive @@ -277,7 +285,7 @@ Acte administratif - **towns_label** : *Texte* - Communes - Valeur en cache des communes associées - **treatment__** : *→ Traitement* - Traitement - **treatment_file__** : *→ Demande de traitement* - Demande de traitement -- **year** : *Entier* - Année +- **year** : *Entier positif* - Année Commune ******* @@ -302,8 +310,8 @@ Commune - **parcels__** : *→ Parcelles (commune)* - **parents__** : *→ Communes* (communes enfants - **name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - **sites__** : *→ Entités archéologiques (communes)* -- **surface** : *Entier* - Surface (m2) -- **year** : *Entier* - Année de création - Remplir ce champ est nécessaire pour distinguer les anciennes communes des nouvelles communes. +- **surface** : *Entier positif* - Surface (m2) +- **year** : *Entier positif* - Année de création - Remplir ce champ est nécessaire pour distinguer les anciennes communes des nouvelles communes. Zone géographique ***************** @@ -324,6 +332,7 @@ Parcelle ******** +- **address** : *Texte* - Adresse - Lieu-dit - **associated_file__** : *→ Dossier archéologique* - Dossier - **cached_label** : *Texte* - Nom en cache - **context_record__** : *→ Unité d'Enregistrement (parcelle)* @@ -334,7 +343,8 @@ Parcelle - **parcel_number** : *Chaîne de caractères (6)* - Numéro de parcelle - **public_domain** : *Booléen* - Domaine public - **section** : *Chaîne de caractères (4)* - Section -- **year** : *Entier* - Année +- **town__** : *→ Commune* (**name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - Commune +- **year** : *Entier positif* - Année Datation ******** @@ -342,12 +352,27 @@ Datation - **context_records__** : *→ Unité d'Enregistrement (datings)* - **dating_type__** : *→ Type de datation* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de datation -- **end_date** : *Entier* - Date de fin +- **end_date** : *Entier positif* - Date de fin - **find__** : *→ Mobilier (datation)* - **period__** : *→ Type de période* (**label** Dénomination, **txt_idx** Identifiant textuel) - Période chronologique - **precise_dating** : *Texte* - Précision sur cette datation - **quality__** : *→ Type de qualité de datation* (**label** Dénomination, **txt_idx** Identifiant textuel) - Qualité -- **start_date** : *Entier* - Date de début +- **start_date** : *Entier positif* - Date de début + +Panier (mobilier) +***************** + + +- **available** : *Booléen* - Disponible +- **comment** : *Texte* - Commentaire +- **items__** : *→ Mobilier* - Mobilier associé +- **label** : *Chaîne de caractères (1000)* - Dénomination +- **public** : *Booléen* - Public +- **shared_with__** : *→ Utilisateur d'Ishtar* - Partagé (lecture) avec +- **shared_write_with__** : *→ Utilisateur d'Ishtar* - Partagé (lecture/édition) avec +- **slug** : *Chaîne de caractères (50)* - Identifiant textuel +- **treatment_files__** : *→ Demandes de traitement (associated basket)* +- **user__** : *→ Utilisateur d'Ishtar* - Propriétaire Modèles des éléments principaux ------------------------------- @@ -359,6 +384,7 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : - **abstract** : *Texte* - Résumé +- **address** : *Texte* - Adresse / Lieu-dit - **administrative_act__** : *→ Actes administratifs (opération)* - **all_containers** : Liste des contenants avec du mobilier ou des documents liés à cette opération - **Champ non disponible pour les imports** - **applicant_authority__** : *→ Organisation* - Autorité requérante @@ -378,9 +404,9 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : - **containers** : Liste des contenants avec du mobilier lié à cette opération - **Champ non disponible pour les imports** - **context_record__** : *→ Unité d'Enregistrement (opération)* - **context_records** : Liste des unités d'enregistrement associées - **Champ non disponible pour les imports** -- **cost** : *Entier* - Coût (euros) +- **cost** : *Entier positif* - Coût (euros) - **creation_date** : *Date* - Date de création -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **document_containers** : Liste des contenants avec des documents liés à cette opération - **Champ non disponible pour les imports** - **documentation_deadline** : *Date* - Date limite de versement de la documentation - **documentation_deposit_date** : *Date* - Date de versement de la documentation @@ -388,13 +414,13 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : - **documents__** : *→ Document* - Documents - **drassm_code** : *Chaîne de caractères (100)* - Code DRASSM - **eas_number** : *Chaîne de caractères (20)* - Numéro de l'EA -- **effective_man_days** : *Entier* - Jours-hommes effectifs +- **effective_man_days** : *Entier positif* - Jours-hommes effectifs - **end_date** : *Date* - Date de clôture - **excavation_end_date** : *Date* - Date de fin de chantier - **finds_deadline** : *Date* - Date limite de versement du mobilier - **finds_deposit_date** : *Date* - Date de versement du mobilier - **finds_received** : *Booléen* - Mobilier versé -- **fnap_cost** : *Entier* - Financement FNAP (€) +- **fnap_cost** : *Entier positif* - Financement FNAP (€) - **fnap_financing** : *Nombre à virgule* - Financement FNAP (%) - **geoarchaeological_context_prescription** : *Booléen* - Prescription sur un contexte géoarchéologique - **geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique @@ -408,26 +434,26 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : - **negative_result** : *Booléen* - Résultat considéré comme négatif - **official_report_number** : *Texte* - Numéro de procès-verbal ou de saisine - **old_code** : *Chaîne de caractères (200)* - Ancien code -- **operation_code** : *Entier* - Index annuel +- **operation_code** : *Entier positif* - Index annuel - **operation_type__** : *→ Type d'opération* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type d'opération - **operationbydepartment__** : *→ operation by departments (opération)* - **operator__** : *→ Organisation* - Opérateur -- **operator_reference** : *Chaîne de caractères (20)* - Référence de l'opérateur -- **optional_man_days** : *Entier* - Jours-hommes optionnels +- **operator_reference** : *Chaîne de caractères (200)* - Référence de l'opérateur +- **optional_man_days** : *Entier positif* - Jours-hommes optionnels - **parcels__** : *→ Parcelles (opération)* - **periods__** : *→ Type de période* (**label** Dénomination, **txt_idx** Identifiant textuel) - Périodes - **protagonist__** : *→ Personne* - Nom du protagoniste - **qrcode** : *Image (255)* - qrcode - **record_quality_type__** : *→ Type de qualité d'enregistrement* (**label** Dénomination, **txt_idx** Identifiant textuel) - Qualité d'enregistrement -- **relation_bitmap_image** : *Image (100)* - Image des relations (PNG généré) - La taille maximale supportée pour le fichier est de 100 Mo. -- **relation_image** : *Image (100)* - Image des relations (SVG généré) - La taille maximale supportée pour le fichier est de 100 Mo. +- **relation_bitmap_image** : *Fichier (100)* - Image des relations (PNG généré) - La taille maximale supportée pour le fichier est de 100 Mo. +- **relation_image** : *Fichier (100)* - Image des relations (SVG généré) - La taille maximale supportée pour le fichier est de 100 Mo. - **remains__** : *→ Type de vestige* (**label** Dénomination, **txt_idx** Identifiant textuel) - Vestiges - **report_delivery_date** : *Date* - Date de livraison du rapport - **report_processing__** : *→ Type d'état de rapport* (**label** Dénomination, **txt_idx** Identifiant textuel) - Traitement du rapport - **right_relations__** : *→ Relations entre opérations (left record)* -- **scheduled_man_days** : *Entier* - Jours-hommes prévus +- **scheduled_man_days** : *Entier positif* - Jours-hommes prévus - **scientific_documentation_comment** : *Texte* - Précisions sur la documentation scientifique -- **scientist__** : *→ Personne* - Responsable de suivi scientifique +- **scientist__** : *→ Personne* - Responsable d'opération - **seizure_name** : *Texte* - Nom de la saisie - **spatial_reference_system__** : *→ Géographie - Système de référence spatiale* (**label** Dénomination, **txt_idx** Identifiant textuel, **srid** SRID, **auth_name** Registre) - Système de référence spatiale - **start_date** : *Date* - Date de début @@ -435,9 +461,18 @@ Chaque opération dispose du champ `data__` ainsi que des champs suivants : - **top_sites__** : *→ Entité archéologique* - Sites pour lesquels cette opération est une opération chapeau - **towns__** : *→ Commune* (**name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - Communes - **virtual_operation** : *Booléen* - Opération virtuelle - Si coché, cela signifie que cette opération n'a pas été officiellement enregistrée. -- **year** : *Entier* - Année +- **year** : *Entier positif* - Année - **zoning_prescription** : *Booléen* - Prescription sur zonage +Relations entre opérations +++++++++++++++++++++++++++ + + +- **imports_updated__** : *→ Import - Import* - Mis à jour par les imports +- **left_record__** : *→ Opération* - left record +- **relation_type__** : *→ Type de relation entre opérations* (**label** Dénomination, **txt_idx** Identifiant textuel) - relation type +- **right_record__** : *→ Opération* - right record + Site/Entité archéologique ************************* @@ -454,7 +489,7 @@ Chaque site/entité archéologique dispose du champ `data__` ainsi que des champ - **complete_identifier** : *Texte* - Identifiant complet - **context_records__** : *→ Unité d'Enregistrement (entité archéologique)* - **cultural_attributions__** : *→ Type d'attribution culturelle* (**label** Dénomination, **txt_idx** Identifiant textuel) - Attribution culturelle -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **discovery_area** : *Texte* - Zone de découverte - **documents__** : *→ Document* - Documents - **drassm_number** : *Chaîne de caractères (100)* - Numéro DRASSM @@ -485,6 +520,7 @@ Dossier archéologique Chaque dossier archéologique dispose du champ `data__` ainsi que des champs suivants : +- **address** : *Texte* - Adresse des terrains - **administrative_act__** : *→ Actes administratifs (dossier archéologique)* - **cached_label** : *Texte* - Nom en cache - Généré automatiquement - ne pas éditer - **cira_advised** : *Booléen* - Passage en CIRA @@ -493,11 +529,11 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui - **complete_identifier** : *Texte* - Identifiant complet - **corporation_general_contractor__** : *→ Organisation* - Organisation de l'aménageur - **creation_date** : *Date* - Date de création -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **departments__** : *→ Département* - Départements - **documents__** : *→ Document* - Documents - **end_date** : *Date* - Date de fin -- **equipment_costs__** : *→ preventive file equipment service costs (file)* +- **equipment_costs__** : *→ Besoins en équipements (file)* - **execution_report_date** : *Date* - Date du rapport d'exécution - **external_id** : *Chaîne de caractères (120)* - Identifiant - **file__** : *→ Dossiers archéologiques (dossier associé)* @@ -505,7 +541,7 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui - **filebydepartment__** : *→ file by departments (dossier)* - **general_contractor__** : *→ Personne* - Aménageur - **ground_end_date** : *Date* - Date de fin de la fouille -- **ground_jobs__** : *→ preventive file ground jobs (file)* +- **ground_jobs__** : *→ Besoins humains terrains (file)* - **ground_start_date** : *Date* - Date de début de la fouille - **imported_line** : *Texte* - Ligne importée - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports @@ -513,15 +549,15 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui - **instruction_deadline** : *Date* - Date limite d'instruction - **internal_reference** : *Chaîne de caractères (60)* - Référence interne - **intervention_period** : *Chaîne de caractères (200)* - Période d'intervention -- **jobs__** : *→ preventive file jobs (file)* -- **linear_meter** : *Entier* - Mètre linéaire +- **jobs__** : *→ Besoins humains post-fouille (file)* +- **linear_meter** : *Entier positif* - Mètre linéaire - **locality** : *Chaîne de caractères (100)* - Lieu-dit - **main_image__** : *→ Document* - Image principale - **main_town__** : *→ Commune* (**name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - Commune principale - **mh_listing** : *Booléen* - Sur Monument Historique inscrit - **mh_register** : *Booléen* - Sur Monument Historique classé - **name** : *Texte* - Nom -- **numeric_reference** : *Entier* - Identifiant numérique +- **numeric_reference** : *Entier positif* - Identifiant numérique - **operation_type_for_royalties__** : *→ Type d'opération pour les redevances - France* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type d'opération pour la redevance - **operations__** : *→ Opérations (dossier)* - **organization__** : *→ Organisation* - Organisation @@ -530,6 +566,7 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui - **permit_type__** : *→ Type de permis* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de permis - **planning_service__** : *→ Organisation* - Service instructeur - **planning_service_date** : *Date* - Date du dossier du service instructeur +- **postal_code** : *Chaîne de caractères (10)* - Adresse des terrains - code postal - **price_agreement__** : *→ Contrat tarifaire* (**label** Dénomination, **txt_idx** Identifiant textuel) - Contrat tarifaire - **protected_area** : *Booléen* - Au sein d'un secteur sauvegardé - **qrcode** : *Image (255)* - qrcode @@ -549,7 +586,41 @@ Chaque dossier archéologique dispose du champ `data__` ainsi que des champs sui - **total_surface** : *Nombre à virgule* - Surface totale (m2) - **towns__** : *→ Commune* (**name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - Communes - **type_of_agreement__** : *→ Type de convention - France* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de convention -- **year** : *Entier* - Année +- **year** : *Entier positif* - Année + + +Besoins humains terrains +++++++++++++++++++++++++ + + +- **days_planned** : *Nombre à virgule* - Jours - planifiés +- **days_worked** : *Nombre à virgule* - Jours - travaillés +- **file__** : *→ Dossier archéologique* - file +- **job__** : *→ Emploi* (**label** Dénomination, **txt_idx** Identifiant textuel) - Emploi +- **man_by_day_planned** : *Nombre à virgule* - Personnes par jour - planifiés +- **man_by_day_worked** : *Nombre à virgule* - Personnes par jour - travaillés + +Besoins humains post-fouille +++++++++++++++++++++++++++++ + + +- **days_planned** : *Nombre à virgule* - Jours - planifiés +- **days_worked** : *Nombre à virgule* - Jours - travaillés +- **file__** : *→ Dossier archéologique* - file +- **job__** : *→ Emploi* (**label** Dénomination, **txt_idx** Identifiant textuel) - Emploi +- **man_by_day_planned** : *Nombre à virgule* - Personnes par jour - planifiés +- **man_by_day_worked** : *Nombre à virgule* - Personnes par jour - travaillés + +Besoins en équipements +++++++++++++++++++++++ + + +- **days_planned** : *Nombre à virgule* - Jours - planifiés +- **days_worked** : *Nombre à virgule* - Jours - travaillés +- **equipment_service_cost__** : *→ Coût équipement/service* (**price_agreement** Contrat tarifaire, **equipment_service_type** Équipement/Service, **slug** Identifiant textuel, **service_provider** Fournisseur de service, **flat_rate** Tarif forfaitaire, **unitary_cost** Coût unitaire, **unit** Unité, **specificity** Spécificité, **default_quantity_by_day** Quantité par défaut par jour, **available** Disponible, **parent** Parent) - equipment service cost +- **file__** : *→ Dossier archéologique* - file +- **quantity_by_day_planned** : *Nombre à virgule* - Quantité par jour - planifié +- **quantity_by_day_worked** : *Nombre à virgule* - Quantité par jour - travaillé Unité d'enregistrement ********************** @@ -571,7 +642,7 @@ Chaque unité d'enregistrement dispose du champ `data__` ainsi que des champs su - **context_record_tree_parent__** : *→ context record trees (unité d'enregistrement)* - **contextrecord__** : *→ Unité d'Enregistrement (related context records)* - **cultural_attributions__** : *→ Type d'attribution culturelle* (**label** Dénomination, **txt_idx** Identifiant textuel) - Attribution culturelle -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **datings__** : *→ Datation* - datings - **datings_comment** : *Texte* - Précisions sur les datations - **depth** : *Nombre à virgule* - Profondeur (m) @@ -598,19 +669,29 @@ Chaque unité d'enregistrement dispose du champ `data__` ainsi que des champs su - **parcel__** : *→ Parcelle* - Parcelle - **qrcode** : *Image (255)* - qrcode - **related_context_records__** : *→ Unité d'Enregistrement* - related context records -- **relation_bitmap_image** : *Image (100)* - Image des relations (PNG généré) - La taille maximale supportée pour le fichier est de 100 Mo. -- **relation_image** : *Image (100)* - Image des relations (SVG généré) - La taille maximale supportée pour le fichier est de 100 Mo. +- **relation_bitmap_image** : *Fichier (100)* - Image des relations (PNG généré) - La taille maximale supportée pour le fichier est de 100 Mo. +- **relation_image** : *Fichier (100)* - Image des relations (SVG généré) - La taille maximale supportée pour le fichier est de 100 Mo. - **right_relations__** : *→ Relations entre Unités d'Enregistrement (left record)* - **spatial_reference_system__** : *→ Géographie - Système de référence spatiale* (**label** Dénomination, **txt_idx** Identifiant textuel, **srid** SRID, **auth_name** Registre) - Système de référence spatiale - **surface** : *Nombre à virgule* - Surface (m2) -- **taq** : *Entier* - TAQ - « Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée après cette date -- **taq_estimated** : *Entier* - TAQ estimé - Estimation d'un « Terminus Ante Quem » +- **taq** : *Entier positif* - TAQ - « Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée après cette date +- **taq_estimated** : *Entier positif* - TAQ estimé - Estimation d'un « Terminus Ante Quem » - **thickness** : *Nombre à virgule* - Épaisseur (m) -- **tpq** : *Entier* - TPQ - « Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée avant cette date -- **tpq_estimated** : *Entier* - TPQ estimé - Estimation d'un « Terminus Post Quem » +- **town__** : *→ Commune* (**name** Nom, **numero_insee** Code commune (numéro INSEE), **cached_label** Nom en cache) - Commune +- **tpq** : *Entier positif* - TPQ - « Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée avant cette date +- **tpq_estimated** : *Entier positif* - TPQ estimé - Estimation d'un « Terminus Post Quem » - **unit__** : *→ Type d'Unité d'Enregistrement* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type d'Unité d'Enregistrement - **width** : *Nombre à virgule* - Largeur (m) +Relations entre unités d'enregistrement ++++++++++++++++++++++++++++++++++++++++ + + +- **imports_updated__** : *→ Import - Import* - Mis à jour par les imports +- **left_record__** : *→ Unité d'Enregistrement* - left record +- **relation_type__** : *→ Type de relation* (**label** Dénomination, **txt_idx** Identifiant textuel) - relation type +- **right_record__** : *→ Unité d'Enregistrement* - right record + Mobilier d'origine ****************** @@ -624,7 +705,7 @@ Chaque mobilier d'origine dispose du champ `data__` ainsi que des champs suivant - **comment** : *Texte* - Précisions sur les circonstances de découverte - **complete_identifier** : *Texte* - Identifiant complet - **context_record__** : *→ Unité d'Enregistrement* - Unité d'Enregistrement -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **description** : *Texte* - Description - **discovery_date** : *Date* - Date de découverte (exacte ou début) - **discovery_date_taq** : *Date* - Date de découverte (fin) @@ -633,11 +714,11 @@ Chaque mobilier d'origine dispose du champ `data__` ainsi que des champs suivant - **find__** : *→ Mobilier (mobilier d'origine)* - **geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **label** : *Texte* - Identifiant libre - **line** : *Ligne* - Ligne - **main_geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique principal -- **material_index** : *Entier* - Index matériel +- **material_index** : *Entier positif* - Index matériel - **material_type_label** : Concaténation des types de matériaux associés - **Champ non disponible pour les imports** - **qrcode** : *Image (255)* - qrcode - **spatial_reference_system__** : *→ Géographie - Système de référence spatiale* (**label** Dénomination, **txt_idx** Identifiant textuel, **srid** SRID, **auth_name** Registre) - Système de référence spatiale @@ -655,7 +736,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **appraisal_date** : *Date* - Date d'évaluation - **base_finds** : Liste du mobilier de base associé - **Champ non disponible pour les imports** - **base_finds__** : *→ Mobilier d'origine* - Mobilier d'origine -- **basket__** : *→ Paniers (items)* +- **basket__** : *→ Paniers (mobilier associé)* - **cache_complete_museum_id** : *Texte* - Numéro d’inventaire complet - Valeur en cache - ne pas éditer - **cached_label** : *Texte* - Nom en cache - Généré automatiquement - ne pas éditer - **cached_materials** : *Texte* - Nom en cache des types de matériaux - Généré automatiquement - ne pas éditer @@ -678,7 +759,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **container_ref__** : *→ Contenant* - Contenant de référence - **context_record_label** : Dénomination des unités d'enregistrement associées - **Champ non disponible pour les imports** - **cultural_attributions__** : *→ Type d'attribution culturelle* (**label** Dénomination, **txt_idx** Identifiant textuel) - Attribution culturelle -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **dating_comment** : *Texte* - Précisions sur les datations - **datings__** : *→ Datation* - Datation - **decoration** : *Texte* - Décor @@ -690,7 +771,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **downstream_treatment__** : *→ Traitement* - Traitement aval - **estimated_value** : *Nombre à virgule* - Valeur estimée - **external_id** : *Texte* - Identifiant -- **find_number** : *Entier* - Nombre de restes (NR) +- **find_number** : *Entier positif* - Nombre de restes (NR) - **finddownstreamtreatments_related__** : *→ find downstream treatmentss (mobilier)* - **findnonmodiftreatments_related__** : *→ find non modif treatmentss (mobilier)* - **findtreatments_related__** : *→ find treatmentss (mobilier)* @@ -698,7 +779,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **functional_areas__** : *→ Type de domaine fonctionnel* (**label** Dénomination, **txt_idx** Identifiant textuel) - Domaines fonctionnels - **height** : *Nombre à virgule* - Hauteur (cm) - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **inscription** : *Texte* - Inscription - **inside_container__** : *→ find inside container (mobilier)* - **insurance_value** : *Nombre à virgule* - Valeur d'assurance @@ -716,7 +797,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **material_types_code** : Code des types de matériau - **Champ non disponible pour les imports** - **material_types_label** : Chaîne de caractère des types de matériau - **Champ non disponible pour les imports** - **material_types_recommendations** : Chaîne de caractères - recommandations pour le matériau - **Champ non disponible pour les imports** -- **min_number_of_individuals** : *Entier* - Nombre minimum d'individus (NMI) +- **min_number_of_individuals** : *Entier positif* - Nombre minimum d'individus (NMI) - **museum_allocation_date** : *Date* - Date d’affectation au musée - **museum_assigned_institution__** : *→ Organisation* - Institution affectataire - **museum_collection__** : *→ Type de collection muséale* (**label** Dénomination, **txt_idx** Identifiant textuel) - Collection @@ -746,7 +827,7 @@ Chaque élément mobilier dispose du champ `data__` ainsi que des champs suivant - **museum_purchase_price** : *Texte* - Prix d’achat - **object_type_quality__** : *→ Type de qualité du type d'objet* (**label** Dénomination, **txt_idx** Identifiant textuel) - Qualité du type d'objet - **object_types__** : *→ Type d'objet* (**label** Dénomination, **txt_idx** Identifiant textuel) - Types d'objet -- **order** : *Entier* - Ordre +- **order** : *Entier positif* - Ordre - **preservation_to_considers__** : *→ Type de traitement* (**label** Dénomination, **txt_idx** Identifiant textuel) - Traitements recommandés - **previous_id** : *Texte* - Identifiant précédent - **property__** : *→ Propriétés (mobilier)* @@ -778,7 +859,7 @@ Chaque traitement dispose du champ `data__` ainsi que des champs suivants : - **complete_identifier** : *Texte* - Identifiant complet - **container__** : *→ Contenant* - Contenant - **creation_date** : *Date/heure* - creation date -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **description** : *Texte* - Description - **documents__** : *→ Document* - Documents - **downstream__** : *→ Mobilier (traitement amont)* @@ -795,7 +876,7 @@ Chaque traitement dispose du champ `data__` ainsi que des champs suivants : - **goal** : *Texte* - But - **image** : *Image (255)* - image - La taille maximale supportée pour le fichier est de 100 Mo. - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **insurance_cost** : *Nombre à virgule* - Coût d'assurance - **label** : *Chaîne de caractères (200)* - Dénomination - **location__** : *→ Lieu de conservation* - Localisation - Endroit où le traitement est réalisé. Renseignez le lieu de conservation de destination pour un déplacement. @@ -812,7 +893,7 @@ Chaque traitement dispose du champ `data__` ainsi que des champs suivants : - **treatment_state__** : *→ Type d'état de traitement* (**label** Dénomination, **txt_idx** Identifiant textuel) - État - **treatment_types__** : *→ Type de traitement* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de traitement - **upstream__** : *→ Mobilier (traitement aval)* -- **year** : *Entier* - Année +- **year** : *Entier positif* - Année Demande de traitement ********************* @@ -828,16 +909,16 @@ Chaque demande de traitement dispose du champ `data__` ainsi que des champs suiv - **comment** : *Texte* - Commentaire - **complete_identifier** : *Texte* - Identifiant complet - **creation_date** : *Date* - Date de création -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **documents__** : *→ Document* - Documents - **end_date** : *Date* - Date de clôture - **exhibition_end_date** : *Date* - Date de fin de l'exposition - **exhibition_name** : *Texte* - Nom d'exposition - **exhibition_start_date** : *Date* - Date de commencement de l'exposition -- **external_id** : *Chaîne de caractères (200)* - Identifiant +- **external_id** : *Chaîne de caractères (200)* - Référence - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports - **in_charge__** : *→ Personne* - Personne responsable -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **internal_reference** : *Chaîne de caractères (200)* - Référence interne - **main_image__** : *→ Document* - Image principale - **name** : *Texte* - Nom @@ -845,12 +926,12 @@ Chaque demande de traitement dispose du champ `data__` ainsi que des champs suiv - **reception_date** : *Date* - Date de réception - **treatments__** : *→ Traitements (demande associée)* - **type__** : *→ Type de demande de traitement* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de demande de traitement -- **year** : *Entier* - Année +- **year** : *Entier positif* - Année -Dépot -***** +Lieu de conservation +******************** -Chaque dépot dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du champ `data__` ainsi que des champs suivants : +Chaque lieu de conservation dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du champ `data__` ainsi que des champs suivants : - **associated_divisions__** : *→ Type de division de lieu de conservation* (**label** Dénomination, **txt_idx** Identifiant textuel) - Divisions @@ -859,7 +940,7 @@ Chaque dépot dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du cha - **comment** : *Texte* - Commentaire - **complete_identifier** : *Texte* - Identifiant complet - **containers__** : *→ Contenants (lieu de conservation)* -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **divisions__** : *→ warehouse division links (warehouse)* - **documents__** : *→ Document* - Documents - **external_id** : *Texte* - Identifiant @@ -868,14 +949,14 @@ Chaque dépot dispose des :ref:`champs adresse <valeurs-champs-adresse>`, du cha - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports - **main_geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique principal - **main_image__** : *→ Document* - Image principale -- **max_division_number** : *Entier* - Nombre maximum de divisions - Généré automatiquement +- **max_division_number** : *Entier positif* - Nombre maximum de divisions - Généré automatiquement - **name** : *Chaîne de caractères (200)* - Nom - **organization__** : *→ Organisation* - Organisation - **owned_containers__** : *→ Contenants (lieu de conservation responsable)* - **person_in_charge__** : *→ Personne* - Personne responsable - **qrcode** : *Image (255)* - qrcode - **responsibilities__** : *→ Contenants (responsabilité)* -- **slug** : * (200)* - Identifiant textuel +- **slug** : *Chaîne de caractères (200)* - Identifiant textuel - **spatial_reference_system__** : *→ Géographie - Système de référence spatiale* (**label** Dénomination, **txt_idx** Identifiant textuel, **srid** SRID, **auth_name** Registre) - Système de référence spatiale - **treatment__** : *→ Traitements (localisation)* - **warehouse_type__** : *→ Type de lieu de conservation* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de lieu de conservation @@ -902,7 +983,7 @@ Chaque contenant dispose du champ `data__` ainsi que des champs suivants : - **container_tree_parent__** : *→ container trees (contenant parent)* - **container_type__** : *→ Type de contenant* (**label** Dénomination, **txt_idx** Identifiant textuel) - Type de contenant - **context_record_** : Unité d'Enregistrement associée - à utiliser avec précaution seule la première unité d'enregistrement trouvée est retournée - **Champ non disponible pour les imports** -- **custom_index** : *Entier* - Custom index +- **custom_index** : *Entier positif* - Custom index - **division__** : *→ Localisations de contenant (contenant)* - **documents__** : *→ Document* - Documents - **external_id** : *Texte* - Identifiant @@ -912,7 +993,7 @@ Chaque contenant dispose du champ `data__` ainsi que des champs suivants : - **geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique - **history_date_deprecated** : *Date/heure* - history date deprecated - **imports_updated__** : *→ Import - Import* - Mis à jour par les imports -- **index** : *Entier* - Index +- **index** : *Entier positif* - Index - **location__** : *→ Lieu de conservation* - Lieu de conservation - **main_geodata__** : *→ Géographie - Donnée vectorielle* - Élément géographique principal - **main_image__** : *→ Document* - Image principale diff --git a/docs/generate_values_doc.py b/docs/generate_values_doc.py index 6cd56ad83..dac4539b1 100644 --- a/docs/generate_values_doc.py +++ b/docs/generate_values_doc.py @@ -13,15 +13,15 @@ from ishtar_common.models_common import Address, GeoItem # TODO: à traduire -TYPES = { +TYPES = { # put more precise fields after generic field. e.g. IntegerField before PositiveIntegerField 'IntegerField': "Entier", 'PositiveIntegerField': "Entier positif", 'PositiveSmallIntegerField': "Entier positif", 'FloatField': "Nombre à virgule", 'TextField': "Texte", 'CharField': "Chaîne de caractères", - 'DateField': "Date", 'DateTimeField': "Date/heure", + 'DateField': "Date", 'EmailField': "Courriel", 'NullBooleanField': "Booléen", 'BooleanField': "Booléen", @@ -32,7 +32,8 @@ TYPES = { 'LineStringField': "Ligne", 'MultiPolygonField': "Multi-polygones", 'MultiPointField': "Multi-points", - 'MultiLineStringField': "Multi-lignes" + 'MultiLineStringField': "Multi-lignes", + "SlugField": "Chaîne de caractères", } TEMPLATES = ( @@ -55,20 +56,23 @@ EXCLUDED = [ "relation_dot", "relation_dot_above", "relation_dot_below", "relation_image_above", "relation_image_below", "auto_external_id", "history_date", "created", "cached_x", "cached_y", "cached_z", - "import_key", "departement", + "import_key", "departement", "timestamp_geo", "timestamp_label" ] EXCLUDED += ["parcel_owner"] # temporary MODELS = { "ishtar_common": ["person", "organization", "author", "document", "geovectordata", "area", "town"], "archaeological_operations": ["operation", "archaeologicalsite", - "parcel", "administrativeact"], - "archaeological_files": ["file"], - "archaeological_context_records": ["dating", "contextrecord"], - "archaeological_finds": ["basefind", "find", "treatment", "treatmentfile"], + "parcel", "administrativeact", "recordrelations"], + "archaeological_files": ["file", "preventivefilegroundjob", "preventivefilejob", + "preventivefileequipmentservicecost"], + "archaeological_context_records": ["dating", "contextrecord", "recordrelations"], + "archaeological_finds": ["basefind", "find", "findbasket", "treatment", "treatmentfile"], "archaeological_warehouse": ["warehouse", "container"], } +ADDRESS_EXCLUDED = ["person", "organization", "warehouse"] + lc = settings.LANGUAGE_CODE lc = lc[:2] + "_" + lc[-2:].upper() + ".UTF-8" locale.setlocale(locale.LC_ALL, lc) @@ -134,7 +138,6 @@ def get_values(tpl_model, model, excluded, model_types, messages): for model_class in model_types: if model_class in field_classes: type_desc = model_types[model_class] - break if getattr(field, "max_length", None): type_desc += " ({})".format(field.max_length) if not type_desc: @@ -170,20 +173,24 @@ for template_name, template_name_dest, language in TEMPLATES: address_values = get_values(tpl_model, Address, excluded=excluded, model_types=TYPES, messages=MESSAGES) render_dct["ishtar_common"]["address"] = address_values - excluded += address_values["fields"] + address_excluded = address_values["fields"] geo_values = get_values(tpl_model, GeoItem, excluded=excluded, model_types=TYPES, messages=MESSAGES) - #render_dct["ishtar_common"]["geoitem"] = geo_values - excluded += geo_values["fields"] + geo_excluded = geo_values["fields"] for app_name in MODELS: # print([m._meta.model_name # for m in apps.get_app_config(app_name).get_models()]) for model_name in MODELS[app_name]: model = apps.get_app_config(app_name).get_model(model_name) + exc = excluded[:] + if model_name != "geovectordata": + exc += geo_excluded + if model_name in ADDRESS_EXCLUDED: + exc += address_excluded render_dct[app_name][model_name] = get_values( - tpl_model, model, excluded, TYPES, messages=MESSAGES) + tpl_model, model, exc, TYPES, messages=MESSAGES) template_name = os.path.abspath( settings.ROOT_PATH + "../docs/" + template_name) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index ed7df17c2..c14d59920 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4571,7 +4571,7 @@ class Document( title = models.TextField(_("Title"), blank=True, default="") associated_file = models.FileField( - verbose_name=_("Associated file"), + verbose_name=pgettext_lazy("pdf, odt, zip, ...", "Associated file"), upload_to=get_image_path, blank=True, null=True, diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 735fdc50a..e9aaefbe2 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-07 15:30+0200\n" +"POT-Creation-Date: 2024-06-17 12:47+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -30,7 +30,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1256 #: archaeological_operations/ishtar_menu.py:35 #: archaeological_operations/models.py:1589 #: archaeological_operations/models.py:2534 @@ -42,7 +42,7 @@ msgstr "" #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 #: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 -#: ishtar_common/models.py:5590 ishtar_common/views.py:500 +#: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" @@ -89,15 +89,15 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 -#: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1230 -#: archaeological_operations/forms.py:1443 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1447 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 @@ -105,16 +105,16 @@ msgid "Full text search" msgstr "" #: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:304 -#: archaeological_context_records/forms.py:567 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/forms.py:571 +#: archaeological_context_records/forms.py:625 #: archaeological_context_records/models.py:752 #: archaeological_context_records/models.py:1390 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1762 +#: archaeological_operations/forms.py:1766 msgid "Code PATRIARCHE" msgstr "" @@ -136,10 +136,10 @@ msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:732 #: archaeological_context_records/models.py:746 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5591 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" @@ -149,12 +149,12 @@ msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:719 +#: archaeological_context_records/forms.py:723 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:532 #: archaeological_context_records/models.py:830 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 @@ -162,7 +162,7 @@ msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/forms.py:523 #: archaeological_context_records/models.py:531 #: archaeological_context_records/models.py:823 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 @@ -185,25 +185,25 @@ msgstr "" #: archaeological_context_records/models.py:786 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2096 -#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1244 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:295 -#: archaeological_context_records/forms.py:569 -#: archaeological_context_records/forms.py:622 +#: archaeological_context_records/forms.py:297 +#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:518 #: archaeological_context_records/models.py:519 #: archaeological_context_records/models.py:724 #: archaeological_context_records/models.py:1392 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1080 -#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1084 +#: archaeological_operations/forms.py:1461 #: archaeological_operations/models.py:3180 #: archaeological_operations/models.py:3474 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 @@ -221,26 +221,26 @@ msgid "Search within relations" msgstr "" #: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:317 #: archaeological_context_records/models.py:533 #: archaeological_context_records/models.py:835 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:209 -#: archaeological_context_records/forms.py:230 +#: archaeological_context_records/forms.py:211 +#: archaeological_context_records/forms.py:232 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:279 +#: archaeological_context_records/forms.py:281 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:689 #: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1516 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -255,38 +255,38 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:280 +#: archaeological_context_records/forms.py:282 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:296 -#: archaeological_context_records/forms.py:559 -#: archaeological_context_records/forms.py:623 -#: archaeological_context_records/forms.py:721 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:627 +#: archaeological_context_records/forms.py:725 #: archaeological_context_records/models.py:515 #: archaeological_context_records/models.py:516 #: archaeological_context_records/models.py:732 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1056 #: archaeological_operations/models.py:3161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:301 -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:303 +#: archaeological_context_records/forms.py:568 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:570 -#: archaeological_context_records/forms.py:625 +#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:574 +#: archaeological_context_records/forms.py:629 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:528 #: archaeological_context_records/models.py:777 @@ -294,7 +294,7 @@ msgstr "" msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:310 #: archaeological_context_records/models.py:753 #: archaeological_context_records/models.py:1393 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 @@ -310,7 +310,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2447 -#: ishtar_common/models.py:1089 ishtar_common/models.py:4690 +#: ishtar_common/models.py:1089 ishtar_common/models.py:4689 #: ishtar_common/models_imports.py:160 ishtar_common/models_imports.py:439 #: ishtar_common/models_imports.py:707 ishtar_common/models_imports.py:807 #: ishtar_common/models_imports.py:826 @@ -321,12 +321,12 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:310 +#: archaeological_context_records/forms.py:312 #: archaeological_context_records/models.py:783 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:312 +#: archaeological_context_records/forms.py:314 #: archaeological_context_records/models.py:754 #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 #: archaeological_finds/models_finds.py:2175 @@ -336,51 +336,51 @@ msgstr "" msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:646 archaeological_operations/forms.py:744 +#: archaeological_context_records/forms.py:325 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:818 +#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:757 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:330 +#: archaeological_context_records/forms.py:332 #: archaeological_context_records/models.py:758 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/forms.py:333 #: archaeological_context_records/models.py:759 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/forms.py:334 #: archaeological_context_records/models.py:760 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:333 +#: archaeological_context_records/forms.py:335 #: archaeological_context_records/models.py:761 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/forms.py:337 #: archaeological_context_records/models.py:763 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:338 +#: archaeological_context_records/forms.py:340 #: archaeological_context_records/models.py:755 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:341 +#: archaeological_context_records/forms.py:343 #: archaeological_context_records/models.py:756 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:609 +#: archaeological_files/models.py:624 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 @@ -395,12 +395,12 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/forms.py:346 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/forms.py:352 #: archaeological_context_records/models.py:767 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:226 @@ -411,16 +411,16 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:434 +#: archaeological_context_records/forms.py:438 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:439 +#: archaeological_context_records/forms.py:443 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:444 -#: archaeological_context_records/forms.py:466 +#: archaeological_context_records/forms.py:448 +#: archaeological_context_records/forms.py:470 #: archaeological_context_records/models.py:165 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 #: archaeological_finds/models_finds.py:2093 @@ -434,7 +434,7 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:451 +#: archaeological_context_records/forms.py:455 #: archaeological_context_records/models.py:109 #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 @@ -456,11 +456,11 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:452 +#: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:786 archaeological_files/models.py:76 -#: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:190 +#: archaeological_files/forms.py:782 archaeological_files/models.py:76 +#: archaeological_files/models.py:730 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 @@ -502,10 +502,10 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:457 #: archaeological_context_records/models.py:112 -#: archaeological_files/forms.py:791 archaeological_files/models.py:77 -#: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 +#: archaeological_files/forms.py:787 archaeological_files/models.py:77 +#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:396 @@ -549,7 +549,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:454 +#: archaeological_context_records/forms.py:458 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -562,7 +562,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -576,7 +576,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:460 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -584,11 +584,11 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:467 +#: archaeological_context_records/forms.py:471 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:479 +#: archaeological_context_records/forms.py:483 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:276 #: archaeological_context_records/models.py:1521 @@ -600,11 +600,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1724 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 -#: ishtar_common/models.py:5592 ishtar_common/views.py:504 +#: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:497 +#: archaeological_context_records/forms.py:501 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -616,86 +616,86 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:502 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:504 -#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/forms.py:508 +#: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/forms.py:509 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/forms.py:525 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:522 +#: archaeological_context_records/forms.py:526 #: archaeological_context_records/models.py:789 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:527 #: archaeological_context_records/models.py:798 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/forms.py:528 #: archaeological_context_records/models.py:804 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:529 #: archaeological_context_records/models.py:813 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_operations/forms.py:1146 -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1866 +#: archaeological_context_records/forms.py:531 +#: archaeological_operations/forms.py:1150 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1870 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:535 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:548 #: archaeological_operations/forms.py:624 #: archaeological_operations/forms.py:637 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:549 +#: archaeological_context_records/forms.py:553 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:559 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:657 +#: archaeological_context_records/forms.py:661 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1832 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:687 +#: archaeological_context_records/forms.py:691 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:707 +#: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:1282 #: archaeological_context_records/models.py:1321 #: archaeological_context_records/models.py:1389 @@ -703,23 +703,23 @@ msgstr "" msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/forms.py:715 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:736 +#: archaeological_context_records/forms.py:740 #, fuzzy #| msgid "email address" msgid "Associated parcel" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:761 +#: archaeological_context_records/forms.py:765 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:780 +#: archaeological_context_records/forms.py:784 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -869,7 +869,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5593 +#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5602 #: ishtar_common/views.py:508 man_app/templates/ishtar/sheet_museum_find.html:4 #: na_app/templates/ishtar/sheet_find.html:4 #: pdl_app/templates/ishtar/sheet_find.html:4 @@ -899,10 +899,10 @@ msgstr "" #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 -#: ishtar_common/models.py:5365 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2095 ishtar_common/models_common.py:2131 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2165 -#: ishtar_common/models_common.py:2178 ishtar_common/models_imports.py:474 +#: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 +#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 +#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" @@ -957,9 +957,9 @@ msgstr "" #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1237 -#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1144 +#: archaeological_operations/forms.py:1241 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:495 @@ -1017,7 +1017,7 @@ msgstr "" #: archaeological_context_records/models.py:577 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:475 archaeological_finds/models_finds.py:1307 +#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1307 #: archaeological_operations/models.py:378 #: archaeological_operations/models.py:1143 #: archaeological_operations/tests.py:3107 @@ -1108,7 +1108,7 @@ msgid "identification" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:478 archaeological_operations/models.py:1149 +#: archaeological_files/models.py:493 archaeological_operations/models.py:1149 #: archaeological_operations/models.py:2716 msgctxt "key for text search" msgid "parcel" @@ -1174,24 +1174,23 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1691 #: ishtar_common/admin.py:1834 ishtar_common/models.py:4556 -#: ishtar_common/models.py:4929 ishtar_common/views.py:3133 -#: ishtar_common/views.py:3151 +#: ishtar_common/models.py:4935 ishtar_common/views.py:3135 +#: ishtar_common/views.py:3153 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:718 -#: archaeological_files/models.py:547 archaeological_finds/models_finds.py:551 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:2023 #: archaeological_finds/models_treatments.py:259 -#: archaeological_finds/models_treatments.py:1112 #: archaeological_operations/models.py:3169 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4583 +#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:720 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:553 +#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 #: archaeological_finds/models_finds.py:2025 #: archaeological_operations/models.py:3172 #: archaeological_warehouse/models.py:441 @@ -1200,7 +1199,7 @@ msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:765 -#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3372 +#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3383 msgid "Surface (m2)" msgstr "" @@ -1234,7 +1233,7 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:736 archaeological_finds/models_finds.py:2300 +#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2300 #: archaeological_finds/models_treatments.py:279 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/templates/ishtar/sheet_find.html:65 @@ -1244,21 +1243,21 @@ msgstr "" #: archaeological_operations/models.py:1477 #: archaeological_operations/models.py:2916 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:96 +#: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1193 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 #: cd17_app/templates/ishtar/sheet_find.html:65 ishtar_common/models.py:1035 #: ishtar_common/models.py:2421 ishtar_common/models.py:4058 #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 -#: ishtar_common/models.py:4145 ishtar_common/models.py:4716 -#: ishtar_common/models.py:4727 ishtar_common/models_common.py:3400 +#: ishtar_common/models.py:4145 ishtar_common/models.py:4722 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:162 +#: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1272,7 +1271,7 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:742 archaeological_finds/models_finds.py:2306 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2306 #: archaeological_finds/models_treatments.py:285 #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:540 @@ -1280,7 +1279,7 @@ msgstr "" #: archaeological_operations/models.py:2923 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3406 +#: ishtar_common/models_common.py:3417 msgid "Main image" msgstr "" @@ -1303,7 +1302,7 @@ msgstr "" #: archaeological_operations/models.py:1571 #: archaeological_operations/models.py:1577 #: archaeological_operations/models.py:1583 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4362 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 msgid "Generated automatically - do not edit" msgstr "" @@ -1477,11 +1476,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:92 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:189 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 -#: ishtar_common/templates/ishtar/sheet_document.html:129 +#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:242 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1499,7 +1498,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:104 +#: archaeological_operations/templates/ishtar/sheet_site.html:103 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1542,7 +1541,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4365 +#: ishtar_common/models_common.py:4376 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1555,7 +1554,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:263 +#: archaeological_files/templates/ishtar/sheet_file.html:270 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1569,8 +1568,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:67 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:168 +#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1580,15 +1579,24 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 +#: archaeological_files/templates/ishtar/sheet_file.html:240 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:102 +#: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 +#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 +#: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 +#: ishtar_common/templates/ishtar/sheet_person.html:166 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1628,9 +1636,9 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:393 #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 -#: ishtar_common/models.py:5484 ishtar_common/models.py:5621 -#: ishtar_common/models.py:5700 ishtar_common/models_common.py:2024 -#: ishtar_common/models_common.py:2039 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5493 ishtar_common/models.py:5630 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1758,9 +1766,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 -#: archaeological_files/forms.py:237 archaeological_files/forms.py:667 -#: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 -#: archaeological_files/models.py:388 archaeological_files/models.py:539 +#: archaeological_files/forms.py:237 archaeological_files/forms.py:663 +#: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 +#: archaeological_files/models.py:403 archaeological_files/models.py:554 #: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 @@ -1775,8 +1783,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1106 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1447 -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1768 #: archaeological_operations/models.py:989 #: archaeological_operations/models.py:1387 #: archaeological_operations/models.py:2666 @@ -1789,38 +1797,38 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:673 archaeological_files/models.py:541 +#: archaeological_files/forms.py:669 archaeological_files/models.py:556 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1137 -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1352 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/forms.py:1526 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 +#: archaeological_operations/forms.py:1239 +#: archaeological_operations/forms.py:1356 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1530 #: archaeological_operations/models.py:493 #: archaeological_operations/models.py:2898 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 -#: archaeological_files/forms.py:1167 archaeological_files/models.py:1376 +#: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1460 -#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2047 -#: ishtar_common/models_common.py:3380 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:3391 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:99 archaeological_files/forms.py:1177 +#: archaeological_files/forms.py:99 archaeological_files/forms.py:1173 msgid "File name" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 -#: archaeological_files/models.py:389 archaeological_files/models.py:394 -#: archaeological_files/models.py:553 +#: archaeological_files/models.py:404 archaeological_files/models.py:409 +#: archaeological_files/models.py:568 msgid "File type" msgstr "" @@ -1834,32 +1842,32 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 -#: archaeological_files/forms.py:529 archaeological_files/models.py:306 -#: archaeological_files/models.py:393 archaeological_files/models.py:602 +#: archaeological_files/forms.py:529 archaeological_files/models.py:321 +#: archaeological_files/models.py:408 archaeological_files/models.py:617 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:531 -#: archaeological_files/models.py:607 +#: archaeological_files/forms.py:104 archaeological_files/forms.py:467 +#: archaeological_files/forms.py:531 archaeological_files/models.py:622 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:616 -#: archaeological_files/forms.py:664 archaeological_files/models.py:655 -#: archaeological_finds/forms.py:799 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1425 archaeological_finds/forms.py:2585 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:660 +#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 +#: archaeological_finds/forms.py:2585 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_treatments.py:261 #: archaeological_finds/models_treatments.py:1158 #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1366 -#: archaeological_operations/forms.py:1463 -#: archaeological_operations/forms.py:1525 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/forms.py:1529 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1472 #: archaeological_operations/models.py:2912 @@ -1868,8 +1876,8 @@ msgstr "" #: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 -#: ishtar_common/models.py:4699 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2275 ishtar_common/models_imports.py:890 +#: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1878,32 +1886,32 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1179 archaeological_files/models.py:565 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:127 archaeological_files/forms.py:1189 +#: archaeological_files/forms.py:127 archaeological_files/forms.py:1185 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 +#: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1465 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:146 archaeological_files/forms.py:1228 +#: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1475 msgid "Modified by" msgstr "" @@ -1915,17 +1923,18 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:622 +#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/models.py:1348 ishtar_common/forms_common.py:2164 -#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4684 +#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:639 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 #: archaeological_finds/templates/ishtar/sheet_find.html:509 @@ -1963,12 +1972,12 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:455 archaeological_files/models.py:619 +#: archaeological_files/models.py:470 archaeological_files/models.py:634 #: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1066 -#: archaeological_operations/forms.py:1071 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1054 +#: archaeological_operations/forms.py:1070 +#: archaeological_operations/forms.py:1075 +#: archaeological_operations/forms.py:1406 #: archaeological_operations/models.py:304 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1076 @@ -1978,17 +1987,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3414 +#: ishtar_common/models_common.py:3425 #: ishtar_common/templates/ishtar/sheet_area.html:71 -#: ishtar_common/templates/ishtar/sheet_document.html:134 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/forms.py:576 archaeological_files/models.py:658 -#: archaeological_operations/models.py:2901 ishtar_common/models_common.py:2048 +#: archaeological_files/models.py:673 archaeological_operations/models.py:2901 +#: ishtar_common/models_common.py:2059 msgid "Departments" msgstr "" @@ -1997,7 +2006,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:650 +#: archaeological_files/models.py:665 msgid "Locality" msgstr "" @@ -2011,16 +2020,16 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/forms.py:747 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:743 msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:812 archaeological_files/models.py:648 +#: archaeological_files/forms.py:808 archaeological_files/models.py:663 msgid "Total developed surface (m2)" msgstr "" @@ -2028,7 +2037,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 #: ishtar_common/forms_common.py:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 +#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2062,11 +2071,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:467 -msgid "File reference" -msgstr "" - -#: archaeological_files/forms.py:470 archaeological_files/models.py:626 +#: archaeological_files/forms.py:470 archaeological_files/models.py:641 msgid "Date of planning service file" msgstr "" @@ -2079,7 +2084,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:586 +#: archaeological_files/forms.py:515 archaeological_files/models.py:601 msgid "Responsible for planning service" msgstr "" @@ -2092,162 +2097,166 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:596 archaeological_files/models.py:682 +#: archaeological_files/forms.py:592 archaeological_files/models.py:697 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2852 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:599 archaeological_files/models.py:666 +#: archaeological_files/forms.py:595 archaeological_files/models.py:681 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:602 +#: archaeological_files/forms.py:598 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:625 archaeological_files/models.py:688 +#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/templates/ishtar/sheet_file.html:170 +msgid "Research archaeology comment" +msgstr "" + +#: archaeological_files/forms.py:621 archaeological_files/models.py:703 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:626 archaeological_files/models.py:690 +#: archaeological_files/forms.py:622 archaeological_files/models.py:705 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:639 +#: archaeological_files/forms.py:635 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:640 +#: archaeological_files/forms.py:636 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:644 +#: archaeological_files/forms.py:640 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:657 archaeological_files/models.py:630 +#: archaeological_files/forms.py:653 archaeological_files/models.py:645 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:665 archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:64 +#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:730 +#: archaeological_files/forms.py:726 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:735 +#: archaeological_files/forms.py:731 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:739 +#: archaeological_files/forms.py:735 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:740 +#: archaeological_files/forms.py:736 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:79 +#: archaeological_files/forms.py:742 ishtar_common/forms_common.py:2232 +#: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:748 +#: archaeological_files/forms.py:744 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:771 archaeological_files/models.py:707 +#: archaeological_files/forms.py:767 archaeological_files/models.py:722 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:776 archaeological_files/models.py:710 +#: archaeological_files/forms.py:772 archaeological_files/models.py:725 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:781 archaeological_files/models.py:713 +#: archaeological_files/forms.py:777 archaeological_files/models.py:728 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:796 archaeological_files/models.py:717 +#: archaeological_files/forms.py:792 archaeological_files/models.py:732 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:801 archaeological_files/models.py:718 +#: archaeological_files/forms.py:797 archaeological_files/models.py:733 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:806 archaeological_files/models.py:720 +#: archaeological_files/forms.py:802 archaeological_files/models.py:735 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:829 +#: archaeological_files/forms.py:825 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:335 -#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/forms.py:885 archaeological_files/forms.py:887 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/forms.py:886 archaeological_files/forms.py:888 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 msgid "Days" msgstr "" -#: archaeological_files/forms.py:893 archaeological_files/models.py:116 -#: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:277 -#: archaeological_files/templates/ishtar/sheet_file.html:329 +#: archaeological_files/forms.py:889 archaeological_files/models.py:116 +#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" msgstr "" -#: archaeological_files/forms.py:914 archaeological_files/models.py:80 +#: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:703 +#: archaeological_files/models.py:206 archaeological_files/models.py:718 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:968 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:973 +#: archaeological_files/forms.py:969 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:273 +#: archaeological_files/forms.py:993 +#: archaeological_files/templates/ishtar/sheet_file.html:280 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:999 +#: archaeological_files/forms.py:995 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/forms.py:1001 archaeological_files/forms.py:1003 +#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:397 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:381 +#: archaeological_files/forms.py:1005 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1123 archaeological_files/forms.py:1159 -#: archaeological_files/forms.py:1294 +#: archaeological_files/forms.py:1119 archaeological_files/forms.py:1155 +#: archaeological_files/forms.py:1290 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:566 @@ -2260,13 +2269,13 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1581 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1585 #: archaeological_operations/models.py:2837 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 #: archaeological_warehouse/models.py:1174 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 -#: ishtar_common/models.py:4582 +#: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 #: na_app/templates/ishtar/sheet_find.html:370 #: pdl_app/templates/ishtar/sheet_find.html:361 @@ -2274,83 +2283,83 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1125 archaeological_files/forms.py:1161 -#: archaeological_files/forms.py:1283 +#: archaeological_files/forms.py:1121 archaeological_files/forms.py:1157 +#: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1454 -#: archaeological_operations/forms.py:1515 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1519 #: archaeological_operations/models.py:2568 #: archaeological_operations/models.py:2827 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1122 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1162 +#: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1455 -#: archaeological_operations/forms.py:1651 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1655 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1169 +#: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1522 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1526 #: archaeological_operations/models.py:2896 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1172 +#: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/forms_treatments.py:850 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:1175 +#: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 #: archaeological_finds/forms_treatments.py:848 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:1200 +#: archaeological_files/forms.py:1196 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1202 +#: archaeological_files/forms.py:1198 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:1200 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1207 +#: archaeological_files/forms.py:1203 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1217 +#: archaeological_files/forms.py:1213 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1281 +#: archaeological_files/forms.py:1277 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:766 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:949 +#: archaeological_operations/forms.py:953 #: archaeological_operations/models.py:2032 #: archaeological_operations/models.py:2551 #: archaeological_operations/models.py:2667 @@ -2377,12 +2386,12 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 -#: archaeological_files/models.py:254 archaeological_files/models.py:334 -#: archaeological_files/models.py:354 archaeological_files/models.py:1422 -#: archaeological_files/models.py:1439 archaeological_files/models.py:1464 +#: archaeological_files/models.py:254 archaeological_files/models.py:349 +#: archaeological_files/models.py:369 archaeological_files/models.py:1439 +#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 -#: ishtar_common/models.py:5423 +#: ishtar_common/models.py:5432 #: sra_idf_app/templates/ishtar/sheet_operation.html:298 msgid "Preventive" msgstr "" @@ -2487,7 +2496,7 @@ msgstr "" msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:266 +#: archaeological_files/models.py:225 archaeological_files/models.py:281 msgid "Flat rate" msgstr "" @@ -2532,51 +2541,51 @@ msgstr "" msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:286 +#: archaeological_files/models.py:301 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:287 +#: archaeological_files/models.py:302 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:307 +#: archaeological_files/models.py:322 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:333 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:346 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:347 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:343 +#: archaeological_files/models.py:358 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:345 +#: archaeological_files/models.py:360 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:362 msgid "Category" msgstr "" -#: archaeological_files/models.py:351 +#: archaeological_files/models.py:366 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:352 +#: archaeological_files/models.py:367 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1199 +#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 #: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 @@ -2584,13 +2593,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:391 archaeological_finds/models_finds.py:1202 +#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:991 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:400 archaeological_finds/models_finds.py:1223 +#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2598,8 +2607,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2020 ishtar_common/models_common.py:2036 -#: ishtar_common/templates/ishtar/sheet_person.html:31 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -2615,15 +2624,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:401 +#: archaeological_files/models.py:416 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:417 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:466 archaeological_finds/models_finds.py:1311 +#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1311 #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1130 @@ -2634,7 +2643,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:483 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:362 #: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 @@ -2642,19 +2651,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:486 #: archaeological_finds/models_treatments.py:155 #: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:483 archaeological_operations/models.py:1154 +#: archaeological_files/models.py:498 archaeological_operations/models.py:1154 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:487 +#: archaeological_files/models.py:502 #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:365 #: archaeological_operations/models.py:1158 @@ -2665,7 +2674,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:490 +#: archaeological_files/models.py:505 #: archaeological_finds/models_treatments.py:161 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1164 @@ -2679,27 +2688,27 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:493 +#: archaeological_files/models.py:508 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:496 +#: archaeological_files/models.py:511 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:501 +#: archaeological_files/models.py:516 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:506 +#: archaeological_files/models.py:521 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:510 archaeological_finds/models_finds.py:1517 +#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1517 #: archaeological_operations/models.py:384 #: archaeological_operations/models.py:1209 #: archaeological_operations/models.py:2812 @@ -2708,41 +2717,41 @@ msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:513 archaeological_finds/models_finds.py:1676 +#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1676 #: archaeological_finds/models_treatments.py:1065 #: archaeological_finds/tests.py:1614 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2747 +#: archaeological_files/models.py:532 archaeological_operations/models.py:2747 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:522 archaeological_operations/models.py:2751 +#: archaeological_files/models.py:537 archaeological_operations/models.py:2751 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:544 +#: archaeological_files/models.py:559 #: archaeological_finds/models_treatments.py:1109 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:552 +#: archaeological_files/models.py:567 #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1136 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1824 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 @@ -2757,9 +2766,9 @@ msgstr "" #: ishtar_common/models.py:1083 ishtar_common/models.py:1688 #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 -#: ishtar_common/models.py:3639 ishtar_common/models.py:5459 -#: ishtar_common/models_common.py:2243 ishtar_common/models_common.py:3371 -#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 +#: ishtar_common/models.py:3639 ishtar_common/models.py:5468 +#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 +#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2786,7 +2795,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:557 +#: archaeological_files/models.py:572 #: archaeological_finds/models_treatments.py:1123 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 @@ -2799,35 +2808,35 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:586 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:576 +#: archaeological_files/models.py:591 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:590 +#: archaeological_files/models.py:605 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:597 +#: archaeological_files/models.py:612 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:627 msgid "Main town" msgstr "" -#: archaeological_files/models.py:651 +#: archaeological_files/models.py:666 msgid "Main address" msgstr "" -#: archaeological_files/models.py:653 +#: archaeological_files/models.py:668 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:672 +#: archaeological_files/models.py:687 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:252 @@ -2843,111 +2852,131 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:685 -msgid "Research archaeology comment" -msgstr "" - -#: archaeological_files/models.py:722 +#: archaeological_files/models.py:737 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:741 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:731 +#: archaeological_files/models.py:746 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:747 +#: archaeological_files/models.py:762 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:782 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:794 +#: archaeological_files/models.py:809 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1047 +#: archaeological_files/models.py:1062 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1053 +#: archaeological_files/models.py:1068 msgid "No town" msgstr "" -#: archaeological_files/models.py:1262 archaeological_operations/models.py:1979 +#: archaeological_files/models.py:1277 archaeological_operations/models.py:1979 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1264 archaeological_operations/models.py:1981 +#: archaeological_files/models.py:1279 archaeological_operations/models.py:1981 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1274 +#: archaeological_files/models.py:1289 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1276 +#: archaeological_files/models.py:1291 msgid "plan" msgstr "" -#: archaeological_files/models.py:1285 +#: archaeological_files/models.py:1300 #: archaeological_finds/models_treatments.py:409 #: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:2012 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1287 +#: archaeological_files/models.py:1302 #: archaeological_finds/models_treatments.py:411 #: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:2014 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1311 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1298 +#: archaeological_files/models.py:1313 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1373 archaeological_operations/models.py:1392 +#: archaeological_files/models.py:1388 archaeological_operations/models.py:1392 #: archaeological_operations/models.py:3146 msgid "File" msgstr "" -#: archaeological_files/models.py:1392 +#: archaeological_files/models.py:1407 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1394 archaeological_files/models.py:1456 +#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1396 +#: archaeological_files/models.py:1411 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1398 archaeological_files/models.py:1460 +#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1454 +#: archaeological_files/models.py:1437 +msgid "Human requirement on field" +msgstr "" + +#: archaeological_files/models.py:1438 +msgid "Human requirements on field" +msgstr "" + +#: archaeological_files/models.py:1456 +msgid "Human requirement for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1457 +msgid "Human requirements for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1473 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1458 +#: archaeological_files/models.py:1477 msgid "Quantity by day - worked" msgstr "" +#: archaeological_files/models.py:1483 +msgid "Equipment requirement" +msgstr "" + +#: archaeological_files/models.py:1484 +msgid "Equipment requirements" +msgstr "" + #: archaeological_files/templates/admin/copy_price_change_list.html:9 msgid "Copy price agreement" msgstr "" @@ -2970,9 +2999,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:278 -#: archaeological_files/templates/ishtar/sheet_file.html:330 -#: archaeological_files/templates/ishtar/sheet_file.html:382 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Planned" msgstr "" @@ -3026,12 +3055,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:140 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 -#: ishtar_common/templates/ishtar/sheet_document.html:125 +#: ishtar_common/templates/ishtar/sheet_document.html:123 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3044,19 +3073,19 @@ msgstr "" msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:516 -#: archaeological_warehouse/models.py:737 ishtar_common/models.py:4584 +#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: ishtar_common/models.py:4583 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 @@ -3083,7 +3112,7 @@ msgstr "" #: ishtar_common/forms_common.py:2014 ishtar_common/forms_common.py:2444 #: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:3398 #: ishtar_common/models.py:767 ishtar_common/models.py:2656 -#: ishtar_common/models.py:4273 ishtar_common/models.py:4588 +#: ishtar_common/models.py:4273 ishtar_common/models.py:4587 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:1123 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 @@ -3116,7 +3145,7 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" @@ -3146,52 +3175,52 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:255 +#: archaeological_files/templates/ishtar/sheet_file.html:262 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:270 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:295 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 +#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:303 -#: archaeological_files/templates/ishtar/sheet_file.html:355 -#: archaeological_files/templates/ishtar/sheet_file.html:411 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:246 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 +#: archaeological_files/templates/ishtar/sheet_file.html:310 +#: archaeological_files/templates/ishtar/sheet_file.html:362 +#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:252 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:276 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:234 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:314 -#: archaeological_files/templates/ishtar/sheet_file.html:366 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:321 +#: archaeological_files/templates/ishtar/sheet_file.html:373 +#: archaeological_files/templates/ishtar/sheet_file.html:425 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:325 +#: archaeological_files/templates/ishtar/sheet_file.html:332 msgid "Post-excavation jobs" msgstr "" @@ -3972,9 +4001,9 @@ msgid "Operation - Remains" msgstr "E-Mail-Adresse" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 +#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 -#: ishtar_common/templates/ishtar/sheet_document.html:135 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4318,7 +4347,7 @@ msgstr "" #: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 #: archaeological_finds/models_treatments.py:399 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4364,7 +4393,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2019 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4564,7 +4593,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:105 +#: ishtar_common/templates/ishtar/sheet_document.html:103 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4645,7 +4674,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4585 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4876,7 +4905,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 -#: ishtar_common/templates/ishtar/sheet_document.html:130 +#: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" msgstr "" @@ -5052,7 +5081,8 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4710 +#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5077,6 +5107,14 @@ msgstr "" msgid "kg" msgstr "" +#: archaeological_finds/models_finds.py:909 +#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 +#, fuzzy +#| msgid "email address" +msgid "Associated finds" +msgstr "E-Mail-Adresse" + #: archaeological_finds/models_finds.py:914 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 @@ -5086,7 +5124,7 @@ msgstr "" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3112 +#: ishtar_common/views.py:3114 msgid "Modify" msgstr "" @@ -5138,11 +5176,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1701 -#: archaeological_operations/forms.py:1769 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1773 #: archaeological_operations/models.py:988 #: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1400 ishtar_common/models.py:5370 +#: archaeological_operations/models.py:1400 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5311,7 +5349,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1429 -#: ishtar_common/models_common.py:1567 +#: ishtar_common/models_common.py:1578 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5817,9 +5855,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4946 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3159 +#: ishtar_common/views.py:3161 msgid "Packaging" msgstr "" @@ -6022,7 +6060,7 @@ msgid "TREATMENT" msgstr "" #: archaeological_finds/models_treatments.py:389 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" @@ -6053,7 +6091,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:105 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" @@ -6095,6 +6133,20 @@ msgctxt "key for text search" msgid "exhibition-end-after" msgstr "" +#: archaeological_finds/models_treatments.py:1112 +#: archaeological_operations/forms.py:1139 +#: archaeological_operations/forms.py:1236 +#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/models.py:492 +#: archaeological_warehouse/forms.py:339 +#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 +#: ishtar_common/models.py:2410 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + #: archaeological_finds/models_treatments.py:1184 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 @@ -6362,10 +6414,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:132 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: cd17_app/templates/ishtar/sheet_find.html:539 -#: ishtar_common/templates/ishtar/sheet_document.html:141 +#: ishtar_common/templates/ishtar/sheet_document.html:139 #: man_app/templates/ishtar/sheet_museum_find.html:617 #: na_app/templates/ishtar/sheet_find.html:542 #: pdl_app/templates/ishtar/sheet_find.html:535 @@ -6373,6 +6425,10 @@ msgstr "" msgid "Associated documents" msgstr "" +#: archaeological_finds/templates/ishtar/sheet_findbasket.html:14 +msgid "Owned by" +msgstr "" + #: archaeological_finds/templates/ishtar/sheet_findbasket.html:20 msgid "Associated treatment files" msgstr "" @@ -6381,7 +6437,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:60 +#: ishtar_common/templates/ishtar/sheet_document.html:58 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6577,9 +6633,9 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1093 -#: archaeological_operations/forms.py:1099 +#: archaeological_operations/forms.py:1081 +#: archaeological_operations/forms.py:1097 +#: archaeological_operations/forms.py:1103 #: archaeological_operations/models.py:3181 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6658,7 +6714,7 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:945 +#: archaeological_operations/forms.py:949 #: archaeological_operations/models.py:1388 #: archaeological_operations/models.py:2048 msgid "Yearly index" @@ -6689,13 +6745,14 @@ msgstr "" #: archaeological_operations/forms.py:518 #: archaeological_operations/forms.py:777 +#: archaeological_operations/models.py:1377 #: archaeological_operations/models.py:2834 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 #: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1709 #: archaeological_operations/models.py:1370 msgid "Operator" msgstr "" @@ -6707,10 +6764,10 @@ msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1143 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1358 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1147 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1875 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:497 @@ -6768,7 +6825,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:1520 msgid "Documentation provided" @@ -6776,7 +6833,7 @@ msgstr "" #: archaeological_operations/forms.py:574 #: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1717 +#: archaeological_operations/forms.py:1721 #: archaeological_operations/models.py:1515 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" @@ -6792,7 +6849,7 @@ msgstr "" #: archaeological_operations/forms.py:581 #: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1720 +#: archaeological_operations/forms.py:1724 #: archaeological_operations/models.py:996 #: archaeological_operations/models.py:1526 msgid "Finds provided" @@ -6800,7 +6857,7 @@ msgstr "" #: archaeological_operations/forms.py:583 #: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1724 +#: archaeological_operations/forms.py:1728 #: archaeological_operations/models.py:1522 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" @@ -6814,7 +6871,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:677 ishtar_common/models.py:4575 +#: archaeological_operations/forms.py:677 msgid "Associated file" msgstr "" @@ -6823,7 +6880,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1767 +#: archaeological_operations/forms.py:1771 #: archaeological_operations/models.py:1470 msgid "Generic name" msgstr "" @@ -6833,13 +6890,15 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:753 +#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:2852 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1727 -#: archaeological_operations/forms.py:1860 +#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1731 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1384 msgid "Collaborators" @@ -6878,309 +6937,297 @@ msgstr "" msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:900 +#: archaeological_operations/forms.py:904 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:905 +#: archaeological_operations/forms.py:909 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:935 +#: archaeological_operations/forms.py:939 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:943 #, fuzzy #| msgid "email address" msgid "Bad operation index" msgstr "E-Mail-Adresse" -#: archaeological_operations/forms.py:980 +#: archaeological_operations/forms.py:984 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:981 +#: archaeological_operations/forms.py:985 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:990 +#: archaeological_operations/forms.py:994 #: archaeological_operations/models.py:1533 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:993 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1535 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:999 +#: archaeological_operations/forms.py:1003 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1547 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1011 +#: archaeological_operations/forms.py:1015 #: archaeological_operations/models.py:1555 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1016 +#: archaeological_operations/forms.py:1020 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1017 +#: archaeological_operations/forms.py:1021 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1024 #: archaeological_operations/models.py:1410 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1025 #: archaeological_operations/models.py:1414 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1023 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1035 +#: archaeological_operations/forms.py:1039 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1040 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1041 +#: archaeological_operations/forms.py:1045 #: archaeological_operations/models.py:1442 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1043 +#: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:1446 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1046 +#: archaeological_operations/forms.py:1050 #: archaeological_operations/models.py:1449 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1067 +#: archaeological_operations/forms.py:1071 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1072 +#: archaeological_operations/forms.py:1076 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1094 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1101 +#: archaeological_operations/forms.py:1105 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1135 -#: archaeological_operations/forms.py:1232 -#: archaeological_operations/forms.py:1350 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 -#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 -#: ishtar_common/models.py:2410 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_operations/forms.py:1168 -#: archaeological_operations/forms.py:1396 -#: archaeological_operations/forms.py:1839 +#: archaeological_operations/forms.py:1172 +#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1843 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1216 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1221 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1226 +#: archaeological_operations/forms.py:1230 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1250 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1373 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1261 -#: archaeological_operations/forms.py:1373 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1377 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1421 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1267 -#: archaeological_operations/forms.py:1419 +#: archaeological_operations/forms.py:1271 +#: archaeological_operations/forms.py:1423 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1273 +#: archaeological_operations/forms.py:1425 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1272 -#: archaeological_operations/forms.py:1429 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1433 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1275 -#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1279 +#: archaeological_operations/forms.py:1427 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1277 -#: archaeological_operations/forms.py:1425 +#: archaeological_operations/forms.py:1281 +#: archaeological_operations/forms.py:1429 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 +#: archaeological_operations/forms.py:1283 +#: archaeological_operations/forms.py:1431 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1345 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1403 +#: archaeological_operations/forms.py:1407 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1412 -#: archaeological_operations/templates/ishtar/sheet_site.html:53 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1417 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1496 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1507 -#: archaeological_operations/forms.py:1609 -#: archaeological_operations/forms.py:1676 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1680 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1521 #: archaeological_operations/models.py:2859 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1524 +#: archaeological_operations/forms.py:1528 #: archaeological_operations/models.py:2894 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1535 +#: archaeological_operations/forms.py:1539 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1569 +#: archaeological_operations/forms.py:1573 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1577 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1586 +#: archaeological_operations/forms.py:1590 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1591 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1615 #: archaeological_operations/forms.py:1619 +#: archaeological_operations/forms.py:1623 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1641 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1643 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1660 +#: archaeological_operations/forms.py:1664 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1685 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1794 +#: archaeological_operations/forms.py:1798 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1854 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7331,8 +7378,8 @@ msgid "top ope." msgstr "" #: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 -#: ishtar_common/models.py:5498 ishtar_common/models.py:5659 -#: ishtar_common/models.py:5719 ishtar_common/views_item.py:1740 +#: ishtar_common/models.py:5507 ishtar_common/models.py:5668 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1740 msgid "Unknown" msgstr "" @@ -7530,14 +7577,6 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1361 -msgid "Scientific manager" -msgstr "" - -#: archaeological_operations/models.py:1377 -msgid "Operation monitor" -msgstr "" - #: archaeological_operations/models.py:1495 msgid "Sites for which this operation is top operation" msgstr "" @@ -7558,9 +7597,9 @@ msgid "Cached label" msgstr "E-Mail-Adresse" #: archaeological_operations/models.py:1590 -#: archaeological_operations/templates/ishtar/sheet_site.html:86 +#: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:127 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7821,8 +7860,8 @@ msgstr "" #: archaeological_operations/models.py:3176 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 -#: ishtar_common/models_common.py:4358 +#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 +#: ishtar_common/models_common.py:4369 msgid "Cached name" msgstr "" @@ -7838,7 +7877,7 @@ msgstr "" msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3506 ishtar_common/models.py:5366 +#: archaeological_operations/models.py:3506 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" @@ -7877,7 +7916,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 @@ -7890,9 +7929,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:215 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7953,8 +7992,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7969,8 +8008,8 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:225 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:182 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7978,8 +8017,8 @@ msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:230 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8128,7 +8167,7 @@ msgstr "" #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:934 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5594 +#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 msgid "Warehouse" msgstr "" @@ -8150,8 +8189,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:188 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8196,35 +8235,35 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 -#: ishtar_common/models_common.py:3842 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 +#: ishtar_common/models_common.py:3853 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 -#: ishtar_common/templates/ishtar/sheet_person.html:28 +#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:253 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3694 -#: ishtar_common/templates/ishtar/sheet_person.html:46 +#: ishtar_common/models_common.py:3705 +#: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" @@ -8254,7 +8293,7 @@ msgstr "" #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:904 #: archaeological_warehouse/models.py:1153 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:155 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" @@ -8390,10 +8429,10 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 -#: ishtar_common/templates/ishtar/sheet_document.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:190 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 +#: ishtar_common/templates/ishtar/sheet_document.html:131 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8429,7 +8468,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 -#: ishtar_common/templates/ishtar/sheet_document.html:132 +#: ishtar_common/templates/ishtar/sheet_document.html:130 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8693,27 +8732,27 @@ msgstr "" msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:201 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:232 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 #: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:262 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:268 #: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:290 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:296 #: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -8722,43 +8761,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:114 msgid "Geographic localisation/contact details" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:147 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:151 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:156 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:254 msgid "Document for this warehouse" msgstr "" @@ -8768,13 +8807,6 @@ msgid "" "have any parent container. You probably want to fix that." msgstr "" -#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 -#, fuzzy -#| msgid "email address" -msgid "Associated finds" -msgstr "E-Mail-Adresse" - #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:33 msgid "" "These finds are inside this item. If you delete this item, they won't be " @@ -8845,7 +8877,7 @@ msgstr "" msgid "Precise on dating" msgstr "" -#: docs/generate_values_doc.py:77 +#: docs/generate_values_doc.py:81 msgid "Field not available for imports" msgstr "" @@ -8862,16 +8894,16 @@ msgid "warehouse" msgstr "" #: example_project/__init__.py:13 ishtar_common/views.py:345 -#: ishtar_common/views.py:1127 +#: ishtar_common/views.py:1129 msgid "New organization" msgstr "" #: example_project/__init__.py:14 ishtar_common/views.py:287 -#: ishtar_common/views.py:1118 ishtar_common/views.py:1123 +#: ishtar_common/views.py:1120 ishtar_common/views.py:1125 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:1133 +#: example_project/__init__.py:15 ishtar_common/views.py:1135 msgid "New author" msgstr "" @@ -9482,7 +9514,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1890 +#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" @@ -9516,8 +9548,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1968 -#: ishtar_common/views.py:1978 +#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" @@ -9599,7 +9631,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1619 -#: ishtar_common/views.py:3060 +#: ishtar_common/views.py:3062 msgid "Confirm" msgstr "" @@ -9870,8 +9902,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 -#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 +#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 msgid "Email" msgstr "E-Mail-Adresse" @@ -9902,7 +9934,7 @@ msgstr "" #: ishtar_common/forms_common.py:1141 ishtar_common/forms_common.py:2009 #: ishtar_common/forms_common.py:2443 ishtar_common/forms_common.py:2707 #: ishtar_common/models.py:2936 ishtar_common/models.py:2940 -#: ishtar_common/models.py:4573 ishtar_common/models_imports.py:1058 +#: ishtar_common/models.py:4572 ishtar_common/models_imports.py:1058 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 @@ -9945,12 +9977,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 -#: ishtar_common/models_common.py:3686 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 +#: ishtar_common/models_common.py:3697 msgid "Phone description 2" msgstr "" @@ -9958,11 +9990,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 msgid "Phone 3" msgstr "" @@ -9970,23 +10002,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 msgid "Other address: country" msgstr "" @@ -10077,7 +10109,7 @@ msgid "Send the new password by email?" msgstr "" #: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3512 -#: ishtar_common/views.py:1404 +#: ishtar_common/views.py:1406 msgid "Current profile" msgstr "" @@ -10132,47 +10164,47 @@ msgid "Document - 010 - General" msgstr "" #: ishtar_common/forms_common.py:2017 ishtar_common/forms_common.py:2449 -#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4647 +#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4646 msgid "Medium" msgstr "" #: ishtar_common/forms_common.py:2020 ishtar_common/forms_common.py:2229 #: ishtar_common/forms_common.py:2448 ishtar_common/forms_common.py:2671 -#: ishtar_common/models.py:4654 ishtar_common/models_imports.py:1062 +#: ishtar_common/models.py:4653 ishtar_common/models_imports.py:1062 #: ishtar_common/models_imports.py:1064 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 -#: ishtar_common/templates/ishtar/sheet_document.html:50 +#: ishtar_common/templates/ishtar/sheet_document.html:48 msgid "Format" msgstr "" #: ishtar_common/forms_common.py:2022 ishtar_common/forms_common.py:2450 -#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4659 +#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4658 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" #: ishtar_common/forms_common.py:2024 ishtar_common/forms_common.py:2451 -#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4662 +#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4661 msgid "Shooting angle" msgstr "" #: ishtar_common/forms_common.py:2043 ishtar_common/forms_common.py:2231 #: ishtar_common/forms_common.py:2916 ishtar_common/forms_common.py:2917 #: ishtar_common/models.py:3987 ishtar_common/models.py:4271 -#: ishtar_common/models.py:4668 +#: ishtar_common/models.py:4667 ishtar_common/models.py:4712 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:69 +#: ishtar_common/templates/ishtar/sheet_document.html:67 msgid "Authors" msgstr "" #: ishtar_common/forms_common.py:2049 ishtar_common/forms_common.py:2455 -#: ishtar_common/models.py:4595 +#: ishtar_common/models.py:4594 msgid "Publisher" msgstr "" #: ishtar_common/forms_common.py:2073 ishtar_common/forms_common.py:2477 -#: ishtar_common/models.py:4602 +#: ishtar_common/models.py:4601 msgid "Year of publication" msgstr "" @@ -10182,54 +10214,54 @@ msgid "Rights of use / licenses" msgstr "" #: ishtar_common/forms_common.py:2081 ishtar_common/forms_common.py:2483 -#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4609 +#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4608 msgid "Rights owner" msgstr "" #: ishtar_common/forms_common.py:2091 ishtar_common/forms_common.py:2490 -#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4614 +#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4613 msgid "Copyright" msgstr "" #: ishtar_common/forms_common.py:2094 ishtar_common/forms_common.py:2674 -#: ishtar_common/models.py:4615 +#: ishtar_common/models.py:4614 msgid "Tags" msgstr "" #: ishtar_common/forms_common.py:2100 ishtar_common/forms_common.py:2478 -#: ishtar_common/models.py:4618 ishtar_common/models_imports.py:1067 +#: ishtar_common/models.py:4617 ishtar_common/models_imports.py:1067 #: overload_translation/models.py:11 msgid "Language" msgstr "" #: ishtar_common/forms_common.py:2103 ishtar_common/forms_common.py:2480 -#: ishtar_common/models.py:4623 +#: ishtar_common/models.py:4622 msgid "ISSN" msgstr "" #: ishtar_common/forms_common.py:2109 ishtar_common/forms_common.py:2479 -#: ishtar_common/models.py:4624 +#: ishtar_common/models.py:4623 msgid "ISBN" msgstr "" #: ishtar_common/forms_common.py:2115 ishtar_common/forms_common.py:2234 -#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4627 -#: ishtar_common/models.py:5710 +#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4626 +#: ishtar_common/models.py:5719 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:98 +#: ishtar_common/templates/ishtar/sheet_document.html:96 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 -#: ishtar_common/views.py:2318 +#: ishtar_common/views.py:2320 msgid "Source" msgstr "" #: ishtar_common/forms_common.py:2118 ishtar_common/forms_common.py:2504 -#: ishtar_common/models.py:4634 +#: ishtar_common/models.py:4633 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4640 +#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4639 msgid "Source - page range" msgstr "" @@ -10240,7 +10272,7 @@ msgid "" "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4678 +#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4677 msgid "Numerical ressource (web address)" msgstr "" @@ -10249,40 +10281,40 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:59 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4681 +#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4680 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4687 +#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4686 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4701 +#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4700 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" #: ishtar_common/forms_common.py:2176 ishtar_common/forms_common.py:2494 -#: ishtar_common/models.py:4703 +#: ishtar_common/models.py:4702 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" #: ishtar_common/forms_common.py:2227 ishtar_common/forms_common.py:3106 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 -#: ishtar_common/templates/ishtar/sheet_document.html:123 +#: ishtar_common/templates/ishtar/sheet_document.html:121 msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:86 +#: ishtar_common/templates/ishtar/sheet_document.html:84 msgid "Publishing" msgstr "" @@ -10445,7 +10477,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2249 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 msgid "Import key" msgstr "" @@ -10455,26 +10487,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2264 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2256 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2267 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2272 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2283 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2238 +#: ishtar_common/models_common.py:2249 msgid "Buffer" msgstr "" @@ -10482,18 +10514,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2285 -#: ishtar_common/models_common.py:4192 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 +#: ishtar_common/models_common.py:4203 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 +#: ishtar_common/models_common.py:4206 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2291 -#: ishtar_common/models_common.py:4198 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:4209 msgid "Estimated error for Z" msgstr "" @@ -10502,10 +10534,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2050 ishtar_common/models_common.py:2108 -#: ishtar_common/models_common.py:2140 ishtar_common/models_common.py:2157 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2187 -#: ishtar_common/models_common.py:2316 ishtar_common/models_common.py:3418 +#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 +#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 msgid "Geography" msgstr "" @@ -10533,8 +10565,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2207 -#: ishtar_common/models_common.py:4207 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:4218 msgid "Point" msgstr "" @@ -10585,11 +10617,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1645 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1647 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2187 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2189 msgid "Old imports" msgstr "" @@ -10791,7 +10823,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 -#: ishtar_common/templates/ishtar/sheet_document.html:126 +#: ishtar_common/templates/ishtar/sheet_document.html:124 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -11423,8 +11455,8 @@ msgid "Ishtar site profiles" msgstr "" #: ishtar_common/models.py:1589 ishtar_common/models.py:1900 -#: ishtar_common/models.py:2123 ishtar_common/models.py:5465 -#: ishtar_common/models.py:5495 ishtar_common/models_imports.py:135 +#: ishtar_common/models.py:2123 ishtar_common/models.py:5474 +#: ishtar_common/models.py:5504 ishtar_common/models_imports.py:135 msgid "General settings" msgstr "" @@ -11894,15 +11926,15 @@ msgstr "" msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3620 ishtar_common/models.py:5472 +#: ishtar_common/models.py:3620 ishtar_common/models.py:5481 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3621 ishtar_common/models.py:5473 +#: ishtar_common/models.py:3621 ishtar_common/models.py:5482 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3622 ishtar_common/models.py:5475 +#: ishtar_common/models.py:3622 ishtar_common/models.py:5484 #: ishtar_common/models_imports.py:1292 ishtar_common/models_imports.py:1306 msgid "Finished" msgstr "" @@ -11920,11 +11952,11 @@ msgstr "" msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3650 ishtar_common/models.py:5489 -#: ishtar_common/models.py:5648 +#: ishtar_common/models.py:3650 ishtar_common/models.py:5498 +#: ishtar_common/models.py:5657 #: ishtar_common/templates/ishtar/import_table.html:4 #: ishtar_common/templates/ishtar/sheet_import_gen.html:4 -#: ishtar_common/views.py:2320 +#: ishtar_common/views.py:2322 msgid "Result" msgstr "" @@ -12180,7 +12212,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1835 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12235,252 +12267,259 @@ msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4605 +#: ishtar_common/models.py:4574 +#, fuzzy +#| msgid "email address" +msgctxt "pdf, odt, zip, ..." +msgid "Associated file" +msgstr "E-Mail-Adresse" + +#: ishtar_common/models.py:4604 msgid "Rights of use / license" msgstr "" -#: ishtar_common/models.py:4672 +#: ishtar_common/models.py:4671 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4689 +#: ishtar_common/models.py:4688 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4692 +#: ishtar_common/models.py:4691 msgid "Container ID" msgstr "" -#: ishtar_common/models.py:4696 +#: ishtar_common/models.py:4695 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4704 +#: ishtar_common/models.py:4703 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4706 +#: ishtar_common/models.py:4705 msgid "Related" msgstr "" -#: ishtar_common/models.py:4715 +#: ishtar_common/models.py:4721 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4719 +#: ishtar_common/models.py:4725 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4720 +#: ishtar_common/models.py:4726 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4721 +#: ishtar_common/models.py:4727 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4722 +#: ishtar_common/models.py:4728 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4952 +#: ishtar_common/models.py:4958 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4954 +#: ishtar_common/models.py:4960 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5367 +#: ishtar_common/models.py:5376 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5371 +#: ishtar_common/models.py:5380 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5421 +#: ishtar_common/models.py:5430 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5425 +#: ishtar_common/models.py:5434 msgid "Research" msgstr "" -#: ishtar_common/models.py:5458 +#: ishtar_common/models.py:5467 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5462 +#: ishtar_common/models.py:5471 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5463 +#: ishtar_common/models.py:5472 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5474 ishtar_common/models_imports.py:1291 +#: ishtar_common/models.py:5483 ishtar_common/models_imports.py:1291 #: ishtar_common/models_imports.py:1305 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5492 +#: ishtar_common/models.py:5501 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5493 +#: ishtar_common/models.py:5502 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5513 +#: ishtar_common/models.py:5522 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5525 +#: ishtar_common/models.py:5534 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5538 +#: ishtar_common/models.py:5547 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5556 +#: ishtar_common/models.py:5565 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5598 ishtar_common/models_imports.py:1282 +#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 #: ishtar_common/models_imports.py:1299 #: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5603 +#: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5606 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5615 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5609 +#: ishtar_common/models.py:5618 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5612 +#: ishtar_common/models.py:5621 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5615 +#: ishtar_common/models.py:5624 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5623 +#: ishtar_common/models.py:5632 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5628 +#: ishtar_common/models.py:5637 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5632 +#: ishtar_common/models.py:5641 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5637 +#: ishtar_common/models.py:5646 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5638 +#: ishtar_common/models.py:5647 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5639 +#: ishtar_common/models.py:5648 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5640 +#: ishtar_common/models.py:5649 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5641 +#: ishtar_common/models.py:5650 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5642 +#: ishtar_common/models.py:5651 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5643 +#: ishtar_common/models.py:5652 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5650 +#: ishtar_common/models.py:5659 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5653 +#: ishtar_common/models.py:5662 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5654 +#: ishtar_common/models.py:5663 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5656 ishtar_common/models.py:5716 +#: ishtar_common/models.py:5665 ishtar_common/models.py:5725 #: ishtar_common/templates/ishtar/import_table.html:91 #: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5666 +#: ishtar_common/models.py:5675 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5678 +#: ishtar_common/models.py:5687 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5690 +#: ishtar_common/models.py:5699 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5694 +#: ishtar_common/models.py:5703 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5703 +#: ishtar_common/models.py:5712 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5705 +#: ishtar_common/models.py:5714 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5708 +#: ishtar_common/models.py:5717 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5713 +#: ishtar_common/models.py:5722 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5714 +#: ishtar_common/models.py:5723 msgid "Archive - Imports" msgstr "" @@ -12492,389 +12531,389 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1130 +#: ishtar_common/models_common.py:1141 #, fuzzy #| msgid "email address" msgid "Created by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1132 +#: ishtar_common/models_common.py:1143 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1133 +#: ishtar_common/models_common.py:1144 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1136 +#: ishtar_common/models_common.py:1147 #, fuzzy #| msgid "email address" msgid "Updated by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1152 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1528 +#: ishtar_common/models_common.py:1539 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1536 +#: ishtar_common/models_common.py:1547 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1543 ishtar_common/models_common.py:2242 +#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1545 +#: ishtar_common/models_common.py:1556 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1551 +#: ishtar_common/models_common.py:1562 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1571 +#: ishtar_common/models_common.py:1582 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1575 +#: ishtar_common/models_common.py:1586 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1579 +#: ishtar_common/models_common.py:1590 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1593 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1597 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1589 +#: ishtar_common/models_common.py:1600 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1839 +#: ishtar_common/models_common.py:1850 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1843 +#: ishtar_common/models_common.py:1854 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1847 +#: ishtar_common/models_common.py:1858 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1931 +#: ishtar_common/models_common.py:1942 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1933 +#: ishtar_common/models_common.py:1944 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2096 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2097 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2098 +#: ishtar_common/models_common.py:2109 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2099 +#: ishtar_common/models_common.py:2110 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2113 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2103 +#: ishtar_common/models_common.py:2114 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2134 +#: ishtar_common/models_common.py:2145 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2146 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2151 +#: ishtar_common/models_common.py:2162 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2163 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2179 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2180 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2181 +#: ishtar_common/models_common.py:2192 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:2193 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2219 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2209 +#: ishtar_common/models_common.py:2220 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2210 +#: ishtar_common/models_common.py:2221 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2250 +#: ishtar_common/models_common.py:2261 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2257 +#: ishtar_common/models_common.py:2268 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2265 +#: ishtar_common/models_common.py:2276 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2284 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:4188 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2278 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 +#: ishtar_common/models_common.py:2289 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2277 ishtar_common/models_common.py:4189 +#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2278 ishtar_common/models_common.py:4190 +#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2292 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2282 +#: ishtar_common/models_common.py:2293 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2283 +#: ishtar_common/models_common.py:2294 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2295 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2300 ishtar_common/models_common.py:4208 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2301 +#: ishtar_common/models_common.py:2312 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:2313 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2314 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2315 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2307 ishtar_common/models_common.py:2308 +#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2437 +#: ishtar_common/models_common.py:2448 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2901 +#: ishtar_common/models_common.py:2912 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2905 +#: ishtar_common/models_common.py:2916 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2909 +#: ishtar_common/models_common.py:2920 #, fuzzy #| msgid "username" msgctxt "key for text search" msgid "geo-name" msgstr "Benutzername" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2923 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2915 +#: ishtar_common/models_common.py:2926 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2918 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2921 +#: ishtar_common/models_common.py:2932 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:2925 +#: ishtar_common/models_common.py:2936 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2940 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2955 +#: ishtar_common/models_common.py:2966 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2957 +#: ishtar_common/models_common.py:2968 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3352 +#: ishtar_common/models_common.py:3363 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3354 +#: ishtar_common/models_common.py:3365 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3374 +#: ishtar_common/models_common.py:3385 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3376 +#: ishtar_common/models_common.py:3387 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3386 +#: ishtar_common/models_common.py:3397 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3390 +#: ishtar_common/models_common.py:3401 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3394 +#: ishtar_common/models_common.py:3405 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3660 +#: ishtar_common/models_common.py:3671 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3692 +#: ishtar_common/models_common.py:3703 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:3709 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3742 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3768 +#: ishtar_common/models_common.py:3779 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3849 +#: ishtar_common/models_common.py:3860 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3859 +#: ishtar_common/models_common.py:3870 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3877 +#: ishtar_common/models_common.py:3888 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4221 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:4224 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4217 +#: ishtar_common/models_common.py:4228 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4235 msgid "Multi polygon source item" msgstr "" @@ -13398,7 +13437,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2908 ishtar_common/widgets.py:453 +#: ishtar_common/views.py:2910 ishtar_common/widgets.py:453 #: ishtar_common/widgets.py:489 msgid "Delete" msgstr "" @@ -13761,15 +13800,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1945 -#: ishtar_common/views.py:1949 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1947 +#: ishtar_common/views.py:1951 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1952 -#: ishtar_common/views.py:1954 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1954 +#: ishtar_common/views.py:1956 msgid "Next" msgstr "" @@ -14262,7 +14301,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1298 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1300 msgid "Changelog" msgstr "" @@ -14485,7 +14524,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1788 +#: ishtar_common/views.py:1790 msgid "Import step by step" msgstr "" @@ -14500,7 +14539,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 #: ishtar_common/templates/ishtar/import_table.html:5 #: ishtar_common/templates/ishtar/sheet_import_gen.html:5 -#: ishtar_common/views.py:2319 +#: ishtar_common/views.py:2321 msgid "Error" msgstr "" @@ -14590,7 +14629,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_table.html:6 #: ishtar_common/templates/ishtar/sheet_import_gen.html:6 -#: ishtar_common/views.py:2321 +#: ishtar_common/views.py:2323 msgid "Match" msgstr "" @@ -14684,19 +14723,19 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:63 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgid "Web link" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:111 +#: ishtar_common/templates/ishtar/sheet_document.html:109 msgid "Other" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:124 +#: ishtar_common/templates/ishtar/sheet_document.html:122 msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:131 +#: ishtar_common/templates/ishtar/sheet_document.html:129 msgid "Treatment files" msgstr "" @@ -14746,73 +14785,73 @@ msgstr "" msgid "Publications" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:30 +#: ishtar_common/templates/ishtar/sheet_person.html:29 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:39 msgid "Phone type" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:53 +#: ishtar_common/templates/ishtar/sheet_person.html:52 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:65 msgid "Business address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:63 +#: ishtar_common/templates/ishtar/sheet_person.html:62 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:79 msgid "Other address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:72 +#: ishtar_common/templates/ishtar/sheet_person.html:71 msgid "Associated organization" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:84 +#: ishtar_common/templates/ishtar/sheet_person.html:83 msgid "Associated operations as scientist" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:89 +#: ishtar_common/templates/ishtar/sheet_person.html:88 msgid "Associated operations as responsible" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:94 +#: ishtar_common/templates/ishtar/sheet_person.html:93 msgid "Associated operations as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:99 +#: ishtar_common/templates/ishtar/sheet_person.html:98 msgid "Operations associees en tant que rapporteur CIRA" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:104 +#: ishtar_common/templates/ishtar/sheet_person.html:103 msgid "Associated archaeological sites as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:109 +#: ishtar_common/templates/ishtar/sheet_person.html:108 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:114 +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:119 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:141 +#: ishtar_common/templates/ishtar/sheet_person.html:140 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:146 +#: ishtar_common/templates/ishtar/sheet_person.html:145 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:151 +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:156 +#: ishtar_common/templates/ishtar/sheet_person.html:155 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15348,140 +15387,140 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1141 +#: ishtar_common/views.py:1143 msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1164 ishtar_common/views_item.py:180 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:180 #: ishtar_common/views_item.py:223 ishtar_common/views_item.py:240 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1549 +#: ishtar_common/views.py:1551 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1574 +#: ishtar_common/views.py:1576 msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1581 +#: ishtar_common/views.py:1583 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1588 +#: ishtar_common/views.py:1590 msgid "Import: create (group)" msgstr "" -#: ishtar_common/views.py:1594 +#: ishtar_common/views.py:1596 msgid "Import: pre-form" msgstr "" -#: ishtar_common/views.py:2137 +#: ishtar_common/views.py:2139 msgid "Col. " msgstr "" -#: ishtar_common/views.py:2144 ishtar_common/views.py:2159 +#: ishtar_common/views.py:2146 ishtar_common/views.py:2161 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2248 +#: ishtar_common/views.py:2250 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2286 ishtar_common/views.py:2297 +#: ishtar_common/views.py:2288 ishtar_common/views.py:2299 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2459 +#: ishtar_common/views.py:2461 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2488 +#: ishtar_common/views.py:2490 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2496 +#: ishtar_common/views.py:2498 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2506 +#: ishtar_common/views.py:2508 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2546 ishtar_common/views.py:2567 +#: ishtar_common/views.py:2548 ishtar_common/views.py:2569 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2587 +#: ishtar_common/views.py:2589 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2600 +#: ishtar_common/views.py:2602 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2620 +#: ishtar_common/views.py:2622 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2688 +#: ishtar_common/views.py:2690 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2716 +#: ishtar_common/views.py:2718 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2741 +#: ishtar_common/views.py:2743 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2778 +#: ishtar_common/views.py:2780 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2884 +#: ishtar_common/views.py:2886 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2907 +#: ishtar_common/views.py:2909 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2950 +#: ishtar_common/views.py:2952 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2951 +#: ishtar_common/views.py:2953 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2956 +#: ishtar_common/views.py:2958 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2957 +#: ishtar_common/views.py:2959 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3076 +#: ishtar_common/views.py:3078 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:3214 ishtar_common/views.py:3309 +#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3346 ishtar_common/views.py:3400 +#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3360 +#: ishtar_common/views.py:3362 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3413 +#: ishtar_common/views.py:3415 msgid "Delete geographic item" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 2ca13cf40..377f7d331 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-07 15:30+0200\n" +"POT-Creation-Date: 2024-06-17 12:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,7 +29,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1256 #: archaeological_operations/ishtar_menu.py:35 #: archaeological_operations/models.py:1589 #: archaeological_operations/models.py:2534 @@ -41,7 +41,7 @@ msgstr "" #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 #: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 -#: ishtar_common/models.py:5590 ishtar_common/views.py:500 +#: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" @@ -88,15 +88,15 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 -#: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1230 -#: archaeological_operations/forms.py:1443 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1447 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 @@ -104,16 +104,16 @@ msgid "Full text search" msgstr "" #: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:304 -#: archaeological_context_records/forms.py:567 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/forms.py:571 +#: archaeological_context_records/forms.py:625 #: archaeological_context_records/models.py:752 #: archaeological_context_records/models.py:1390 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1762 +#: archaeological_operations/forms.py:1766 msgid "Code PATRIARCHE" msgstr "" @@ -131,10 +131,10 @@ msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:732 #: archaeological_context_records/models.py:746 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5591 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" @@ -144,12 +144,12 @@ msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:719 +#: archaeological_context_records/forms.py:723 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:532 #: archaeological_context_records/models.py:830 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 @@ -157,7 +157,7 @@ msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/forms.py:523 #: archaeological_context_records/models.py:531 #: archaeological_context_records/models.py:823 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 @@ -180,25 +180,25 @@ msgstr "" #: archaeological_context_records/models.py:786 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2096 -#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1244 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:295 -#: archaeological_context_records/forms.py:569 -#: archaeological_context_records/forms.py:622 +#: archaeological_context_records/forms.py:297 +#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:518 #: archaeological_context_records/models.py:519 #: archaeological_context_records/models.py:724 #: archaeological_context_records/models.py:1392 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1080 -#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1084 +#: archaeological_operations/forms.py:1461 #: archaeological_operations/models.py:3180 #: archaeological_operations/models.py:3474 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 @@ -216,26 +216,26 @@ msgid "Search within relations" msgstr "" #: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:317 #: archaeological_context_records/models.py:533 #: archaeological_context_records/models.py:835 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:209 -#: archaeological_context_records/forms.py:230 +#: archaeological_context_records/forms.py:211 +#: archaeological_context_records/forms.py:232 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:279 +#: archaeological_context_records/forms.py:281 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:689 #: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1516 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -250,38 +250,38 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:280 +#: archaeological_context_records/forms.py:282 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:296 -#: archaeological_context_records/forms.py:559 -#: archaeological_context_records/forms.py:623 -#: archaeological_context_records/forms.py:721 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:627 +#: archaeological_context_records/forms.py:725 #: archaeological_context_records/models.py:515 #: archaeological_context_records/models.py:516 #: archaeological_context_records/models.py:732 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1056 #: archaeological_operations/models.py:3161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:301 -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:303 +#: archaeological_context_records/forms.py:568 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:570 -#: archaeological_context_records/forms.py:625 +#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:574 +#: archaeological_context_records/forms.py:629 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:528 #: archaeological_context_records/models.py:777 @@ -289,7 +289,7 @@ msgstr "" msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:310 #: archaeological_context_records/models.py:753 #: archaeological_context_records/models.py:1393 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 @@ -305,7 +305,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2447 -#: ishtar_common/models.py:1089 ishtar_common/models.py:4690 +#: ishtar_common/models.py:1089 ishtar_common/models.py:4689 #: ishtar_common/models_imports.py:160 ishtar_common/models_imports.py:439 #: ishtar_common/models_imports.py:707 ishtar_common/models_imports.py:807 #: ishtar_common/models_imports.py:826 @@ -316,12 +316,12 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:310 +#: archaeological_context_records/forms.py:312 #: archaeological_context_records/models.py:783 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:312 +#: archaeological_context_records/forms.py:314 #: archaeological_context_records/models.py:754 #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 #: archaeological_finds/models_finds.py:2175 @@ -331,51 +331,51 @@ msgstr "" msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:646 archaeological_operations/forms.py:744 +#: archaeological_context_records/forms.py:325 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:818 +#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:757 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:330 +#: archaeological_context_records/forms.py:332 #: archaeological_context_records/models.py:758 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/forms.py:333 #: archaeological_context_records/models.py:759 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/forms.py:334 #: archaeological_context_records/models.py:760 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:333 +#: archaeological_context_records/forms.py:335 #: archaeological_context_records/models.py:761 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/forms.py:337 #: archaeological_context_records/models.py:763 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:338 +#: archaeological_context_records/forms.py:340 #: archaeological_context_records/models.py:755 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:341 +#: archaeological_context_records/forms.py:343 #: archaeological_context_records/models.py:756 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:609 +#: archaeological_files/models.py:624 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 @@ -390,12 +390,12 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/forms.py:346 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/forms.py:352 #: archaeological_context_records/models.py:767 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:226 @@ -406,16 +406,16 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:434 +#: archaeological_context_records/forms.py:438 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:439 +#: archaeological_context_records/forms.py:443 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:444 -#: archaeological_context_records/forms.py:466 +#: archaeological_context_records/forms.py:448 +#: archaeological_context_records/forms.py:470 #: archaeological_context_records/models.py:165 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 #: archaeological_finds/models_finds.py:2093 @@ -429,7 +429,7 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:451 +#: archaeological_context_records/forms.py:455 #: archaeological_context_records/models.py:109 #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 @@ -451,11 +451,11 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:452 +#: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:786 archaeological_files/models.py:76 -#: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:190 +#: archaeological_files/forms.py:782 archaeological_files/models.py:76 +#: archaeological_files/models.py:730 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 @@ -497,10 +497,10 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:457 #: archaeological_context_records/models.py:112 -#: archaeological_files/forms.py:791 archaeological_files/models.py:77 -#: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 +#: archaeological_files/forms.py:787 archaeological_files/models.py:77 +#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:396 @@ -544,7 +544,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:454 +#: archaeological_context_records/forms.py:458 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -557,7 +557,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -571,7 +571,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:460 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -579,11 +579,11 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:467 +#: archaeological_context_records/forms.py:471 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:479 +#: archaeological_context_records/forms.py:483 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:276 #: archaeological_context_records/models.py:1521 @@ -595,11 +595,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1724 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 -#: ishtar_common/models.py:5592 ishtar_common/views.py:504 +#: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:497 +#: archaeological_context_records/forms.py:501 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -611,86 +611,86 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:502 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:504 -#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/forms.py:508 +#: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/forms.py:509 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/forms.py:525 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:522 +#: archaeological_context_records/forms.py:526 #: archaeological_context_records/models.py:789 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:527 #: archaeological_context_records/models.py:798 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/forms.py:528 #: archaeological_context_records/models.py:804 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:529 #: archaeological_context_records/models.py:813 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_operations/forms.py:1146 -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1866 +#: archaeological_context_records/forms.py:531 +#: archaeological_operations/forms.py:1150 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1870 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:535 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:548 #: archaeological_operations/forms.py:624 #: archaeological_operations/forms.py:637 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:549 +#: archaeological_context_records/forms.py:553 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:559 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:657 +#: archaeological_context_records/forms.py:661 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1832 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:687 +#: archaeological_context_records/forms.py:691 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:707 +#: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:1282 #: archaeological_context_records/models.py:1321 #: archaeological_context_records/models.py:1389 @@ -698,21 +698,21 @@ msgstr "" msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/forms.py:715 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:736 +#: archaeological_context_records/forms.py:740 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:761 +#: archaeological_context_records/forms.py:765 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:780 +#: archaeological_context_records/forms.py:784 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -862,7 +862,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5593 +#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5602 #: ishtar_common/views.py:508 man_app/templates/ishtar/sheet_museum_find.html:4 #: na_app/templates/ishtar/sheet_find.html:4 #: pdl_app/templates/ishtar/sheet_find.html:4 @@ -892,10 +892,10 @@ msgstr "" #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 -#: ishtar_common/models.py:5365 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2095 ishtar_common/models_common.py:2131 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2165 -#: ishtar_common/models_common.py:2178 ishtar_common/models_imports.py:474 +#: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 +#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 +#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" @@ -950,9 +950,9 @@ msgstr "" #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1237 -#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1144 +#: archaeological_operations/forms.py:1241 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:495 @@ -1010,7 +1010,7 @@ msgstr "" #: archaeological_context_records/models.py:577 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:475 archaeological_finds/models_finds.py:1307 +#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1307 #: archaeological_operations/models.py:378 #: archaeological_operations/models.py:1143 #: archaeological_operations/tests.py:3107 @@ -1101,7 +1101,7 @@ msgid "identification" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:478 archaeological_operations/models.py:1149 +#: archaeological_files/models.py:493 archaeological_operations/models.py:1149 #: archaeological_operations/models.py:2716 msgctxt "key for text search" msgid "parcel" @@ -1167,24 +1167,23 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1691 #: ishtar_common/admin.py:1834 ishtar_common/models.py:4556 -#: ishtar_common/models.py:4929 ishtar_common/views.py:3133 -#: ishtar_common/views.py:3151 +#: ishtar_common/models.py:4935 ishtar_common/views.py:3135 +#: ishtar_common/views.py:3153 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:718 -#: archaeological_files/models.py:547 archaeological_finds/models_finds.py:551 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:2023 #: archaeological_finds/models_treatments.py:259 -#: archaeological_finds/models_treatments.py:1112 #: archaeological_operations/models.py:3169 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4583 +#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:720 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:553 +#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 #: archaeological_finds/models_finds.py:2025 #: archaeological_operations/models.py:3172 #: archaeological_warehouse/models.py:441 @@ -1193,7 +1192,7 @@ msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:765 -#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3372 +#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3383 msgid "Surface (m2)" msgstr "" @@ -1227,7 +1226,7 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:736 archaeological_finds/models_finds.py:2300 +#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2300 #: archaeological_finds/models_treatments.py:279 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/templates/ishtar/sheet_find.html:65 @@ -1237,21 +1236,21 @@ msgstr "" #: archaeological_operations/models.py:1477 #: archaeological_operations/models.py:2916 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:96 +#: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1193 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 #: cd17_app/templates/ishtar/sheet_find.html:65 ishtar_common/models.py:1035 #: ishtar_common/models.py:2421 ishtar_common/models.py:4058 #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 -#: ishtar_common/models.py:4145 ishtar_common/models.py:4716 -#: ishtar_common/models.py:4727 ishtar_common/models_common.py:3400 +#: ishtar_common/models.py:4145 ishtar_common/models.py:4722 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:162 +#: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1265,7 +1264,7 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:742 archaeological_finds/models_finds.py:2306 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2306 #: archaeological_finds/models_treatments.py:285 #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:540 @@ -1273,7 +1272,7 @@ msgstr "" #: archaeological_operations/models.py:2923 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3406 +#: ishtar_common/models_common.py:3417 msgid "Main image" msgstr "" @@ -1296,7 +1295,7 @@ msgstr "" #: archaeological_operations/models.py:1571 #: archaeological_operations/models.py:1577 #: archaeological_operations/models.py:1583 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4362 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 msgid "Generated automatically - do not edit" msgstr "" @@ -1468,11 +1467,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:92 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:189 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 -#: ishtar_common/templates/ishtar/sheet_document.html:129 +#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:242 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1490,7 +1489,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:104 +#: archaeological_operations/templates/ishtar/sheet_site.html:103 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1533,7 +1532,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4365 +#: ishtar_common/models_common.py:4376 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1546,7 +1545,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:263 +#: archaeological_files/templates/ishtar/sheet_file.html:270 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1560,8 +1559,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:67 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:168 +#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1571,15 +1570,24 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 +#: archaeological_files/templates/ishtar/sheet_file.html:240 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:102 +#: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 +#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 +#: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 +#: ishtar_common/templates/ishtar/sheet_person.html:166 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1619,9 +1627,9 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:393 #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 -#: ishtar_common/models.py:5484 ishtar_common/models.py:5621 -#: ishtar_common/models.py:5700 ishtar_common/models_common.py:2024 -#: ishtar_common/models_common.py:2039 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5493 ishtar_common/models.py:5630 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1747,9 +1755,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 -#: archaeological_files/forms.py:237 archaeological_files/forms.py:667 -#: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 -#: archaeological_files/models.py:388 archaeological_files/models.py:539 +#: archaeological_files/forms.py:237 archaeological_files/forms.py:663 +#: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 +#: archaeological_files/models.py:403 archaeological_files/models.py:554 #: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 @@ -1764,8 +1772,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1106 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1447 -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1768 #: archaeological_operations/models.py:989 #: archaeological_operations/models.py:1387 #: archaeological_operations/models.py:2666 @@ -1778,38 +1786,38 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:673 archaeological_files/models.py:541 +#: archaeological_files/forms.py:669 archaeological_files/models.py:556 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1137 -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1352 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/forms.py:1526 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 +#: archaeological_operations/forms.py:1239 +#: archaeological_operations/forms.py:1356 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1530 #: archaeological_operations/models.py:493 #: archaeological_operations/models.py:2898 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 -#: archaeological_files/forms.py:1167 archaeological_files/models.py:1376 +#: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1460 -#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2047 -#: ishtar_common/models_common.py:3380 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:3391 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:99 archaeological_files/forms.py:1177 +#: archaeological_files/forms.py:99 archaeological_files/forms.py:1173 msgid "File name" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 -#: archaeological_files/models.py:389 archaeological_files/models.py:394 -#: archaeological_files/models.py:553 +#: archaeological_files/models.py:404 archaeological_files/models.py:409 +#: archaeological_files/models.py:568 msgid "File type" msgstr "" @@ -1823,32 +1831,32 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 -#: archaeological_files/forms.py:529 archaeological_files/models.py:306 -#: archaeological_files/models.py:393 archaeological_files/models.py:602 +#: archaeological_files/forms.py:529 archaeological_files/models.py:321 +#: archaeological_files/models.py:408 archaeological_files/models.py:617 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:531 -#: archaeological_files/models.py:607 +#: archaeological_files/forms.py:104 archaeological_files/forms.py:467 +#: archaeological_files/forms.py:531 archaeological_files/models.py:622 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:616 -#: archaeological_files/forms.py:664 archaeological_files/models.py:655 -#: archaeological_finds/forms.py:799 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1425 archaeological_finds/forms.py:2585 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:660 +#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 +#: archaeological_finds/forms.py:2585 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_treatments.py:261 #: archaeological_finds/models_treatments.py:1158 #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1366 -#: archaeological_operations/forms.py:1463 -#: archaeological_operations/forms.py:1525 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/forms.py:1529 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1472 #: archaeological_operations/models.py:2912 @@ -1857,8 +1865,8 @@ msgstr "" #: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 -#: ishtar_common/models.py:4699 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2275 ishtar_common/models_imports.py:890 +#: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1867,32 +1875,32 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1179 archaeological_files/models.py:565 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:127 archaeological_files/forms.py:1189 +#: archaeological_files/forms.py:127 archaeological_files/forms.py:1185 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 +#: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1465 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:146 archaeological_files/forms.py:1228 +#: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1475 msgid "Modified by" msgstr "" @@ -1904,17 +1912,18 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:622 +#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/models.py:1348 ishtar_common/forms_common.py:2164 -#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4684 +#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:639 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 #: archaeological_finds/templates/ishtar/sheet_find.html:509 @@ -1952,12 +1961,12 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:455 archaeological_files/models.py:619 +#: archaeological_files/models.py:470 archaeological_files/models.py:634 #: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1066 -#: archaeological_operations/forms.py:1071 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1054 +#: archaeological_operations/forms.py:1070 +#: archaeological_operations/forms.py:1075 +#: archaeological_operations/forms.py:1406 #: archaeological_operations/models.py:304 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1076 @@ -1967,17 +1976,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3414 +#: ishtar_common/models_common.py:3425 #: ishtar_common/templates/ishtar/sheet_area.html:71 -#: ishtar_common/templates/ishtar/sheet_document.html:134 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/forms.py:576 archaeological_files/models.py:658 -#: archaeological_operations/models.py:2901 ishtar_common/models_common.py:2048 +#: archaeological_files/models.py:673 archaeological_operations/models.py:2901 +#: ishtar_common/models_common.py:2059 msgid "Departments" msgstr "" @@ -1986,7 +1995,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:650 +#: archaeological_files/models.py:665 msgid "Locality" msgstr "" @@ -2000,16 +2009,16 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/forms.py:747 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:743 msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:812 archaeological_files/models.py:648 +#: archaeological_files/forms.py:808 archaeological_files/models.py:663 msgid "Total developed surface (m2)" msgstr "" @@ -2017,7 +2026,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 #: ishtar_common/forms_common.py:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 +#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2051,11 +2060,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:467 -msgid "File reference" -msgstr "" - -#: archaeological_files/forms.py:470 archaeological_files/models.py:626 +#: archaeological_files/forms.py:470 archaeological_files/models.py:641 msgid "Date of planning service file" msgstr "" @@ -2068,7 +2073,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:586 +#: archaeological_files/forms.py:515 archaeological_files/models.py:601 msgid "Responsible for planning service" msgstr "" @@ -2081,162 +2086,166 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:596 archaeological_files/models.py:682 +#: archaeological_files/forms.py:592 archaeological_files/models.py:697 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2852 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:599 archaeological_files/models.py:666 +#: archaeological_files/forms.py:595 archaeological_files/models.py:681 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:602 +#: archaeological_files/forms.py:598 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:625 archaeological_files/models.py:688 +#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/templates/ishtar/sheet_file.html:170 +msgid "Research archaeology comment" +msgstr "" + +#: archaeological_files/forms.py:621 archaeological_files/models.py:703 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:626 archaeological_files/models.py:690 +#: archaeological_files/forms.py:622 archaeological_files/models.py:705 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:639 +#: archaeological_files/forms.py:635 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:640 +#: archaeological_files/forms.py:636 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:644 +#: archaeological_files/forms.py:640 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:657 archaeological_files/models.py:630 +#: archaeological_files/forms.py:653 archaeological_files/models.py:645 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:665 archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:64 +#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:730 +#: archaeological_files/forms.py:726 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:735 +#: archaeological_files/forms.py:731 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:739 +#: archaeological_files/forms.py:735 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:740 +#: archaeological_files/forms.py:736 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:79 +#: archaeological_files/forms.py:742 ishtar_common/forms_common.py:2232 +#: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:748 +#: archaeological_files/forms.py:744 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:771 archaeological_files/models.py:707 +#: archaeological_files/forms.py:767 archaeological_files/models.py:722 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:776 archaeological_files/models.py:710 +#: archaeological_files/forms.py:772 archaeological_files/models.py:725 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:781 archaeological_files/models.py:713 +#: archaeological_files/forms.py:777 archaeological_files/models.py:728 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:796 archaeological_files/models.py:717 +#: archaeological_files/forms.py:792 archaeological_files/models.py:732 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:801 archaeological_files/models.py:718 +#: archaeological_files/forms.py:797 archaeological_files/models.py:733 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:806 archaeological_files/models.py:720 +#: archaeological_files/forms.py:802 archaeological_files/models.py:735 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:829 +#: archaeological_files/forms.py:825 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:335 -#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/forms.py:885 archaeological_files/forms.py:887 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/forms.py:886 archaeological_files/forms.py:888 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 msgid "Days" msgstr "" -#: archaeological_files/forms.py:893 archaeological_files/models.py:116 -#: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:277 -#: archaeological_files/templates/ishtar/sheet_file.html:329 +#: archaeological_files/forms.py:889 archaeological_files/models.py:116 +#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" msgstr "" -#: archaeological_files/forms.py:914 archaeological_files/models.py:80 +#: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:703 +#: archaeological_files/models.py:206 archaeological_files/models.py:718 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:968 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:973 +#: archaeological_files/forms.py:969 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:273 +#: archaeological_files/forms.py:993 +#: archaeological_files/templates/ishtar/sheet_file.html:280 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:999 +#: archaeological_files/forms.py:995 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/forms.py:1001 archaeological_files/forms.py:1003 +#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:397 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:381 +#: archaeological_files/forms.py:1005 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1123 archaeological_files/forms.py:1159 -#: archaeological_files/forms.py:1294 +#: archaeological_files/forms.py:1119 archaeological_files/forms.py:1155 +#: archaeological_files/forms.py:1290 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:566 @@ -2249,13 +2258,13 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1581 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1585 #: archaeological_operations/models.py:2837 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 #: archaeological_warehouse/models.py:1174 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 -#: ishtar_common/models.py:4582 +#: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 #: na_app/templates/ishtar/sheet_find.html:370 #: pdl_app/templates/ishtar/sheet_find.html:361 @@ -2263,83 +2272,83 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1125 archaeological_files/forms.py:1161 -#: archaeological_files/forms.py:1283 +#: archaeological_files/forms.py:1121 archaeological_files/forms.py:1157 +#: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1454 -#: archaeological_operations/forms.py:1515 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1519 #: archaeological_operations/models.py:2568 #: archaeological_operations/models.py:2827 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1122 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1162 +#: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1455 -#: archaeological_operations/forms.py:1651 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1655 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1169 +#: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1522 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1526 #: archaeological_operations/models.py:2896 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1172 +#: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/forms_treatments.py:850 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:1175 +#: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 #: archaeological_finds/forms_treatments.py:848 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:1200 +#: archaeological_files/forms.py:1196 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1202 +#: archaeological_files/forms.py:1198 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:1200 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1207 +#: archaeological_files/forms.py:1203 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1217 +#: archaeological_files/forms.py:1213 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1281 +#: archaeological_files/forms.py:1277 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:766 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:949 +#: archaeological_operations/forms.py:953 #: archaeological_operations/models.py:2032 #: archaeological_operations/models.py:2551 #: archaeological_operations/models.py:2667 @@ -2366,12 +2375,12 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 -#: archaeological_files/models.py:254 archaeological_files/models.py:334 -#: archaeological_files/models.py:354 archaeological_files/models.py:1422 -#: archaeological_files/models.py:1439 archaeological_files/models.py:1464 +#: archaeological_files/models.py:254 archaeological_files/models.py:349 +#: archaeological_files/models.py:369 archaeological_files/models.py:1439 +#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 -#: ishtar_common/models.py:5423 +#: ishtar_common/models.py:5432 #: sra_idf_app/templates/ishtar/sheet_operation.html:298 msgid "Preventive" msgstr "" @@ -2476,7 +2485,7 @@ msgstr "" msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:266 +#: archaeological_files/models.py:225 archaeological_files/models.py:281 msgid "Flat rate" msgstr "" @@ -2521,51 +2530,51 @@ msgstr "" msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:286 +#: archaeological_files/models.py:301 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:287 +#: archaeological_files/models.py:302 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:307 +#: archaeological_files/models.py:322 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:333 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:346 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:347 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:343 +#: archaeological_files/models.py:358 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:345 +#: archaeological_files/models.py:360 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:362 msgid "Category" msgstr "" -#: archaeological_files/models.py:351 +#: archaeological_files/models.py:366 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:352 +#: archaeological_files/models.py:367 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1199 +#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 #: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 @@ -2573,13 +2582,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:391 archaeological_finds/models_finds.py:1202 +#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:991 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:400 archaeological_finds/models_finds.py:1223 +#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2587,8 +2596,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2020 ishtar_common/models_common.py:2036 -#: ishtar_common/templates/ishtar/sheet_person.html:31 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -2604,15 +2613,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:401 +#: archaeological_files/models.py:416 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:417 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:466 archaeological_finds/models_finds.py:1311 +#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1311 #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1130 @@ -2623,7 +2632,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:483 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:362 #: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 @@ -2631,19 +2640,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:486 #: archaeological_finds/models_treatments.py:155 #: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:483 archaeological_operations/models.py:1154 +#: archaeological_files/models.py:498 archaeological_operations/models.py:1154 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:487 +#: archaeological_files/models.py:502 #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:365 #: archaeological_operations/models.py:1158 @@ -2654,7 +2663,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:490 +#: archaeological_files/models.py:505 #: archaeological_finds/models_treatments.py:161 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1164 @@ -2668,27 +2677,27 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:493 +#: archaeological_files/models.py:508 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:496 +#: archaeological_files/models.py:511 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:501 +#: archaeological_files/models.py:516 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:506 +#: archaeological_files/models.py:521 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:510 archaeological_finds/models_finds.py:1517 +#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1517 #: archaeological_operations/models.py:384 #: archaeological_operations/models.py:1209 #: archaeological_operations/models.py:2812 @@ -2697,41 +2706,41 @@ msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:513 archaeological_finds/models_finds.py:1676 +#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1676 #: archaeological_finds/models_treatments.py:1065 #: archaeological_finds/tests.py:1614 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2747 +#: archaeological_files/models.py:532 archaeological_operations/models.py:2747 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:522 archaeological_operations/models.py:2751 +#: archaeological_files/models.py:537 archaeological_operations/models.py:2751 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:544 +#: archaeological_files/models.py:559 #: archaeological_finds/models_treatments.py:1109 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:552 +#: archaeological_files/models.py:567 #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1136 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1824 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 @@ -2746,9 +2755,9 @@ msgstr "" #: ishtar_common/models.py:1083 ishtar_common/models.py:1688 #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 -#: ishtar_common/models.py:3639 ishtar_common/models.py:5459 -#: ishtar_common/models_common.py:2243 ishtar_common/models_common.py:3371 -#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 +#: ishtar_common/models.py:3639 ishtar_common/models.py:5468 +#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 +#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2775,7 +2784,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:557 +#: archaeological_files/models.py:572 #: archaeological_finds/models_treatments.py:1123 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 @@ -2788,35 +2797,35 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:586 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:576 +#: archaeological_files/models.py:591 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:590 +#: archaeological_files/models.py:605 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:597 +#: archaeological_files/models.py:612 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:627 msgid "Main town" msgstr "" -#: archaeological_files/models.py:651 +#: archaeological_files/models.py:666 msgid "Main address" msgstr "" -#: archaeological_files/models.py:653 +#: archaeological_files/models.py:668 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:672 +#: archaeological_files/models.py:687 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:252 @@ -2832,111 +2841,131 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:685 -msgid "Research archaeology comment" -msgstr "" - -#: archaeological_files/models.py:722 +#: archaeological_files/models.py:737 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:741 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:731 +#: archaeological_files/models.py:746 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:747 +#: archaeological_files/models.py:762 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:782 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:794 +#: archaeological_files/models.py:809 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1047 +#: archaeological_files/models.py:1062 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1053 +#: archaeological_files/models.py:1068 msgid "No town" msgstr "" -#: archaeological_files/models.py:1262 archaeological_operations/models.py:1979 +#: archaeological_files/models.py:1277 archaeological_operations/models.py:1979 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1264 archaeological_operations/models.py:1981 +#: archaeological_files/models.py:1279 archaeological_operations/models.py:1981 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1274 +#: archaeological_files/models.py:1289 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1276 +#: archaeological_files/models.py:1291 msgid "plan" msgstr "" -#: archaeological_files/models.py:1285 +#: archaeological_files/models.py:1300 #: archaeological_finds/models_treatments.py:409 #: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:2012 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1287 +#: archaeological_files/models.py:1302 #: archaeological_finds/models_treatments.py:411 #: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:2014 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1311 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1298 +#: archaeological_files/models.py:1313 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1373 archaeological_operations/models.py:1392 +#: archaeological_files/models.py:1388 archaeological_operations/models.py:1392 #: archaeological_operations/models.py:3146 msgid "File" msgstr "" -#: archaeological_files/models.py:1392 +#: archaeological_files/models.py:1407 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1394 archaeological_files/models.py:1456 +#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1396 +#: archaeological_files/models.py:1411 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1398 archaeological_files/models.py:1460 +#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1454 +#: archaeological_files/models.py:1437 +msgid "Human requirement on field" +msgstr "" + +#: archaeological_files/models.py:1438 +msgid "Human requirements on field" +msgstr "" + +#: archaeological_files/models.py:1456 +msgid "Human requirement for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1457 +msgid "Human requirements for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1473 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1458 +#: archaeological_files/models.py:1477 msgid "Quantity by day - worked" msgstr "" +#: archaeological_files/models.py:1483 +msgid "Equipment requirement" +msgstr "" + +#: archaeological_files/models.py:1484 +msgid "Equipment requirements" +msgstr "" + #: archaeological_files/templates/admin/copy_price_change_list.html:9 msgid "Copy price agreement" msgstr "" @@ -2959,9 +2988,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:278 -#: archaeological_files/templates/ishtar/sheet_file.html:330 -#: archaeological_files/templates/ishtar/sheet_file.html:382 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Planned" msgstr "" @@ -3015,12 +3044,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:140 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 -#: ishtar_common/templates/ishtar/sheet_document.html:125 +#: ishtar_common/templates/ishtar/sheet_document.html:123 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3033,19 +3062,19 @@ msgstr "" msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:516 -#: archaeological_warehouse/models.py:737 ishtar_common/models.py:4584 +#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: ishtar_common/models.py:4583 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 @@ -3072,7 +3101,7 @@ msgstr "" #: ishtar_common/forms_common.py:2014 ishtar_common/forms_common.py:2444 #: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:3398 #: ishtar_common/models.py:767 ishtar_common/models.py:2656 -#: ishtar_common/models.py:4273 ishtar_common/models.py:4588 +#: ishtar_common/models.py:4273 ishtar_common/models.py:4587 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:1123 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 @@ -3105,7 +3134,7 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" @@ -3135,52 +3164,52 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:255 +#: archaeological_files/templates/ishtar/sheet_file.html:262 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:270 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:295 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 +#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:303 -#: archaeological_files/templates/ishtar/sheet_file.html:355 -#: archaeological_files/templates/ishtar/sheet_file.html:411 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:246 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 +#: archaeological_files/templates/ishtar/sheet_file.html:310 +#: archaeological_files/templates/ishtar/sheet_file.html:362 +#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:252 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:276 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:234 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:314 -#: archaeological_files/templates/ishtar/sheet_file.html:366 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:321 +#: archaeological_files/templates/ishtar/sheet_file.html:373 +#: archaeological_files/templates/ishtar/sheet_file.html:425 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:325 +#: archaeological_files/templates/ishtar/sheet_file.html:332 msgid "Post-excavation jobs" msgstr "" @@ -3955,9 +3984,9 @@ msgid "Operation - Remains" msgstr "" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 +#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 -#: ishtar_common/templates/ishtar/sheet_document.html:135 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4301,7 +4330,7 @@ msgstr "" #: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 #: archaeological_finds/models_treatments.py:399 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4347,7 +4376,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2019 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4547,7 +4576,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:105 +#: ishtar_common/templates/ishtar/sheet_document.html:103 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4628,7 +4657,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4585 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4859,7 +4888,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 -#: ishtar_common/templates/ishtar/sheet_document.html:130 +#: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" msgstr "" @@ -5035,7 +5064,8 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4710 +#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5060,6 +5090,12 @@ msgstr "" msgid "kg" msgstr "" +#: archaeological_finds/models_finds.py:909 +#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 +msgid "Associated finds" +msgstr "" + #: archaeological_finds/models_finds.py:914 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 @@ -5069,7 +5105,7 @@ msgstr "" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3112 +#: ishtar_common/views.py:3114 msgid "Modify" msgstr "" @@ -5121,11 +5157,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1701 -#: archaeological_operations/forms.py:1769 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1773 #: archaeological_operations/models.py:988 #: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1400 ishtar_common/models.py:5370 +#: archaeological_operations/models.py:1400 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5294,7 +5330,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1429 -#: ishtar_common/models_common.py:1567 +#: ishtar_common/models_common.py:1578 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5796,9 +5832,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4946 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3159 +#: ishtar_common/views.py:3161 msgid "Packaging" msgstr "" @@ -5997,7 +6033,7 @@ msgid "TREATMENT" msgstr "" #: archaeological_finds/models_treatments.py:389 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" @@ -6028,7 +6064,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:105 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" @@ -6070,6 +6106,20 @@ msgctxt "key for text search" msgid "exhibition-end-after" msgstr "" +#: archaeological_finds/models_treatments.py:1112 +#: archaeological_operations/forms.py:1139 +#: archaeological_operations/forms.py:1236 +#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/models.py:492 +#: archaeological_warehouse/forms.py:339 +#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 +#: ishtar_common/models.py:2410 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + #: archaeological_finds/models_treatments.py:1184 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 @@ -6337,10 +6387,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:132 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: cd17_app/templates/ishtar/sheet_find.html:539 -#: ishtar_common/templates/ishtar/sheet_document.html:141 +#: ishtar_common/templates/ishtar/sheet_document.html:139 #: man_app/templates/ishtar/sheet_museum_find.html:617 #: na_app/templates/ishtar/sheet_find.html:542 #: pdl_app/templates/ishtar/sheet_find.html:535 @@ -6348,6 +6398,10 @@ msgstr "" msgid "Associated documents" msgstr "" +#: archaeological_finds/templates/ishtar/sheet_findbasket.html:14 +msgid "Owned by" +msgstr "" + #: archaeological_finds/templates/ishtar/sheet_findbasket.html:20 msgid "Associated treatment files" msgstr "" @@ -6356,7 +6410,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:60 +#: ishtar_common/templates/ishtar/sheet_document.html:58 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6552,9 +6606,9 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1093 -#: archaeological_operations/forms.py:1099 +#: archaeological_operations/forms.py:1081 +#: archaeological_operations/forms.py:1097 +#: archaeological_operations/forms.py:1103 #: archaeological_operations/models.py:3181 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6633,7 +6687,7 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:945 +#: archaeological_operations/forms.py:949 #: archaeological_operations/models.py:1388 #: archaeological_operations/models.py:2048 msgid "Yearly index" @@ -6664,13 +6718,14 @@ msgstr "" #: archaeological_operations/forms.py:518 #: archaeological_operations/forms.py:777 +#: archaeological_operations/models.py:1377 #: archaeological_operations/models.py:2834 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 #: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1709 #: archaeological_operations/models.py:1370 msgid "Operator" msgstr "" @@ -6682,10 +6737,10 @@ msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1143 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1358 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1147 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1875 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:497 @@ -6743,7 +6798,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:1520 msgid "Documentation provided" @@ -6751,7 +6806,7 @@ msgstr "" #: archaeological_operations/forms.py:574 #: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1717 +#: archaeological_operations/forms.py:1721 #: archaeological_operations/models.py:1515 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" @@ -6767,7 +6822,7 @@ msgstr "" #: archaeological_operations/forms.py:581 #: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1720 +#: archaeological_operations/forms.py:1724 #: archaeological_operations/models.py:996 #: archaeological_operations/models.py:1526 msgid "Finds provided" @@ -6775,7 +6830,7 @@ msgstr "" #: archaeological_operations/forms.py:583 #: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1724 +#: archaeological_operations/forms.py:1728 #: archaeological_operations/models.py:1522 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" @@ -6789,7 +6844,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:677 ishtar_common/models.py:4575 +#: archaeological_operations/forms.py:677 msgid "Associated file" msgstr "" @@ -6798,7 +6853,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1767 +#: archaeological_operations/forms.py:1771 #: archaeological_operations/models.py:1470 msgid "Generic name" msgstr "" @@ -6808,13 +6863,15 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:753 +#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:2852 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1727 -#: archaeological_operations/forms.py:1860 +#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1731 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1384 msgid "Collaborators" @@ -6853,307 +6910,295 @@ msgstr "" msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:900 +#: archaeological_operations/forms.py:904 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:905 +#: archaeological_operations/forms.py:909 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:935 +#: archaeological_operations/forms.py:939 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:943 msgid "Bad operation index" msgstr "" -#: archaeological_operations/forms.py:980 +#: archaeological_operations/forms.py:984 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:981 +#: archaeological_operations/forms.py:985 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:990 +#: archaeological_operations/forms.py:994 #: archaeological_operations/models.py:1533 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:993 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1535 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:999 +#: archaeological_operations/forms.py:1003 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1547 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1011 +#: archaeological_operations/forms.py:1015 #: archaeological_operations/models.py:1555 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1016 +#: archaeological_operations/forms.py:1020 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1017 +#: archaeological_operations/forms.py:1021 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1024 #: archaeological_operations/models.py:1410 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1025 #: archaeological_operations/models.py:1414 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1023 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1035 +#: archaeological_operations/forms.py:1039 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1040 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1041 +#: archaeological_operations/forms.py:1045 #: archaeological_operations/models.py:1442 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1043 +#: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:1446 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1046 +#: archaeological_operations/forms.py:1050 #: archaeological_operations/models.py:1449 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1067 +#: archaeological_operations/forms.py:1071 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1072 +#: archaeological_operations/forms.py:1076 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1094 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1101 +#: archaeological_operations/forms.py:1105 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1135 -#: archaeological_operations/forms.py:1232 -#: archaeological_operations/forms.py:1350 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 -#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 -#: ishtar_common/models.py:2410 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_operations/forms.py:1168 -#: archaeological_operations/forms.py:1396 -#: archaeological_operations/forms.py:1839 +#: archaeological_operations/forms.py:1172 +#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1843 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1216 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1221 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1226 +#: archaeological_operations/forms.py:1230 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1250 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1373 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1261 -#: archaeological_operations/forms.py:1373 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1377 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1421 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1267 -#: archaeological_operations/forms.py:1419 +#: archaeological_operations/forms.py:1271 +#: archaeological_operations/forms.py:1423 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1273 +#: archaeological_operations/forms.py:1425 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1272 -#: archaeological_operations/forms.py:1429 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1433 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1275 -#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1279 +#: archaeological_operations/forms.py:1427 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1277 -#: archaeological_operations/forms.py:1425 +#: archaeological_operations/forms.py:1281 +#: archaeological_operations/forms.py:1429 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 +#: archaeological_operations/forms.py:1283 +#: archaeological_operations/forms.py:1431 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1345 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1403 +#: archaeological_operations/forms.py:1407 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1412 -#: archaeological_operations/templates/ishtar/sheet_site.html:53 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1417 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1496 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1507 -#: archaeological_operations/forms.py:1609 -#: archaeological_operations/forms.py:1676 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1680 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1521 #: archaeological_operations/models.py:2859 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1524 +#: archaeological_operations/forms.py:1528 #: archaeological_operations/models.py:2894 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1535 +#: archaeological_operations/forms.py:1539 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1569 +#: archaeological_operations/forms.py:1573 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1577 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1586 +#: archaeological_operations/forms.py:1590 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1591 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1615 #: archaeological_operations/forms.py:1619 +#: archaeological_operations/forms.py:1623 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1641 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1643 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1660 +#: archaeological_operations/forms.py:1664 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1685 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1794 +#: archaeological_operations/forms.py:1798 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1854 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7302,8 +7347,8 @@ msgid "top ope." msgstr "" #: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 -#: ishtar_common/models.py:5498 ishtar_common/models.py:5659 -#: ishtar_common/models.py:5719 ishtar_common/views_item.py:1740 +#: ishtar_common/models.py:5507 ishtar_common/models.py:5668 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1740 msgid "Unknown" msgstr "" @@ -7497,14 +7542,6 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1361 -msgid "Scientific manager" -msgstr "" - -#: archaeological_operations/models.py:1377 -msgid "Operation monitor" -msgstr "" - #: archaeological_operations/models.py:1495 msgid "Sites for which this operation is top operation" msgstr "" @@ -7523,9 +7560,9 @@ msgid "Cached label" msgstr "" #: archaeological_operations/models.py:1590 -#: archaeological_operations/templates/ishtar/sheet_site.html:86 +#: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:127 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7784,8 +7821,8 @@ msgstr "" #: archaeological_operations/models.py:3176 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 -#: ishtar_common/models_common.py:4358 +#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 +#: ishtar_common/models_common.py:4369 msgid "Cached name" msgstr "" @@ -7801,7 +7838,7 @@ msgstr "" msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3506 ishtar_common/models.py:5366 +#: archaeological_operations/models.py:3506 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" @@ -7840,7 +7877,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 @@ -7853,9 +7890,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:215 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7916,8 +7953,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7932,8 +7969,8 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:225 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:182 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7941,8 +7978,8 @@ msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:230 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8091,7 +8128,7 @@ msgstr "" #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:934 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5594 +#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 msgid "Warehouse" msgstr "" @@ -8113,8 +8150,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:188 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8159,35 +8196,35 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 -#: ishtar_common/models_common.py:3842 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 +#: ishtar_common/models_common.py:3853 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 -#: ishtar_common/templates/ishtar/sheet_person.html:28 +#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:253 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3694 -#: ishtar_common/templates/ishtar/sheet_person.html:46 +#: ishtar_common/models_common.py:3705 +#: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" @@ -8217,7 +8254,7 @@ msgstr "" #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:904 #: archaeological_warehouse/models.py:1153 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:155 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" @@ -8353,10 +8390,10 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 -#: ishtar_common/templates/ishtar/sheet_document.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:190 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 +#: ishtar_common/templates/ishtar/sheet_document.html:131 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8392,7 +8429,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 -#: ishtar_common/templates/ishtar/sheet_document.html:132 +#: ishtar_common/templates/ishtar/sheet_document.html:130 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8652,27 +8689,27 @@ msgstr "" msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:201 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:232 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 #: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:262 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:268 #: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:290 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:296 #: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -8681,43 +8718,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:114 msgid "Geographic localisation/contact details" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:147 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:151 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:156 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:254 msgid "Document for this warehouse" msgstr "" @@ -8727,11 +8764,6 @@ msgid "" "have any parent container. You probably want to fix that." msgstr "" -#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 -msgid "Associated finds" -msgstr "" - #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:33 msgid "" "These finds are inside this item. If you delete this item, they won't be " @@ -8802,7 +8834,7 @@ msgstr "" msgid "Precise on dating" msgstr "" -#: docs/generate_values_doc.py:77 +#: docs/generate_values_doc.py:81 msgid "Field not available for imports" msgstr "" @@ -8819,16 +8851,16 @@ msgid "warehouse" msgstr "" #: example_project/__init__.py:13 ishtar_common/views.py:345 -#: ishtar_common/views.py:1127 +#: ishtar_common/views.py:1129 msgid "New organization" msgstr "" #: example_project/__init__.py:14 ishtar_common/views.py:287 -#: ishtar_common/views.py:1118 ishtar_common/views.py:1123 +#: ishtar_common/views.py:1120 ishtar_common/views.py:1125 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:1133 +#: example_project/__init__.py:15 ishtar_common/views.py:1135 msgid "New author" msgstr "" @@ -9437,7 +9469,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1890 +#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" @@ -9471,8 +9503,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1968 -#: ishtar_common/views.py:1978 +#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" @@ -9554,7 +9586,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1619 -#: ishtar_common/views.py:3060 +#: ishtar_common/views.py:3062 msgid "Confirm" msgstr "" @@ -9819,8 +9851,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 -#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 +#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 msgid "Email" msgstr "" @@ -9851,7 +9883,7 @@ msgstr "" #: ishtar_common/forms_common.py:1141 ishtar_common/forms_common.py:2009 #: ishtar_common/forms_common.py:2443 ishtar_common/forms_common.py:2707 #: ishtar_common/models.py:2936 ishtar_common/models.py:2940 -#: ishtar_common/models.py:4573 ishtar_common/models_imports.py:1058 +#: ishtar_common/models.py:4572 ishtar_common/models_imports.py:1058 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 @@ -9894,12 +9926,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 -#: ishtar_common/models_common.py:3686 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 +#: ishtar_common/models_common.py:3697 msgid "Phone description 2" msgstr "" @@ -9907,11 +9939,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 msgid "Phone 3" msgstr "" @@ -9919,23 +9951,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 msgid "Other address: country" msgstr "" @@ -10020,7 +10052,7 @@ msgid "Send the new password by email?" msgstr "" #: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3512 -#: ishtar_common/views.py:1404 +#: ishtar_common/views.py:1406 msgid "Current profile" msgstr "" @@ -10075,47 +10107,47 @@ msgid "Document - 010 - General" msgstr "" #: ishtar_common/forms_common.py:2017 ishtar_common/forms_common.py:2449 -#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4647 +#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4646 msgid "Medium" msgstr "" #: ishtar_common/forms_common.py:2020 ishtar_common/forms_common.py:2229 #: ishtar_common/forms_common.py:2448 ishtar_common/forms_common.py:2671 -#: ishtar_common/models.py:4654 ishtar_common/models_imports.py:1062 +#: ishtar_common/models.py:4653 ishtar_common/models_imports.py:1062 #: ishtar_common/models_imports.py:1064 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 -#: ishtar_common/templates/ishtar/sheet_document.html:50 +#: ishtar_common/templates/ishtar/sheet_document.html:48 msgid "Format" msgstr "" #: ishtar_common/forms_common.py:2022 ishtar_common/forms_common.py:2450 -#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4659 +#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4658 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" #: ishtar_common/forms_common.py:2024 ishtar_common/forms_common.py:2451 -#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4662 +#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4661 msgid "Shooting angle" msgstr "" #: ishtar_common/forms_common.py:2043 ishtar_common/forms_common.py:2231 #: ishtar_common/forms_common.py:2916 ishtar_common/forms_common.py:2917 #: ishtar_common/models.py:3987 ishtar_common/models.py:4271 -#: ishtar_common/models.py:4668 +#: ishtar_common/models.py:4667 ishtar_common/models.py:4712 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:69 +#: ishtar_common/templates/ishtar/sheet_document.html:67 msgid "Authors" msgstr "" #: ishtar_common/forms_common.py:2049 ishtar_common/forms_common.py:2455 -#: ishtar_common/models.py:4595 +#: ishtar_common/models.py:4594 msgid "Publisher" msgstr "" #: ishtar_common/forms_common.py:2073 ishtar_common/forms_common.py:2477 -#: ishtar_common/models.py:4602 +#: ishtar_common/models.py:4601 msgid "Year of publication" msgstr "" @@ -10125,54 +10157,54 @@ msgid "Rights of use / licenses" msgstr "" #: ishtar_common/forms_common.py:2081 ishtar_common/forms_common.py:2483 -#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4609 +#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4608 msgid "Rights owner" msgstr "" #: ishtar_common/forms_common.py:2091 ishtar_common/forms_common.py:2490 -#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4614 +#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4613 msgid "Copyright" msgstr "" #: ishtar_common/forms_common.py:2094 ishtar_common/forms_common.py:2674 -#: ishtar_common/models.py:4615 +#: ishtar_common/models.py:4614 msgid "Tags" msgstr "" #: ishtar_common/forms_common.py:2100 ishtar_common/forms_common.py:2478 -#: ishtar_common/models.py:4618 ishtar_common/models_imports.py:1067 +#: ishtar_common/models.py:4617 ishtar_common/models_imports.py:1067 #: overload_translation/models.py:11 msgid "Language" msgstr "" #: ishtar_common/forms_common.py:2103 ishtar_common/forms_common.py:2480 -#: ishtar_common/models.py:4623 +#: ishtar_common/models.py:4622 msgid "ISSN" msgstr "" #: ishtar_common/forms_common.py:2109 ishtar_common/forms_common.py:2479 -#: ishtar_common/models.py:4624 +#: ishtar_common/models.py:4623 msgid "ISBN" msgstr "" #: ishtar_common/forms_common.py:2115 ishtar_common/forms_common.py:2234 -#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4627 -#: ishtar_common/models.py:5710 +#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4626 +#: ishtar_common/models.py:5719 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:98 +#: ishtar_common/templates/ishtar/sheet_document.html:96 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 -#: ishtar_common/views.py:2318 +#: ishtar_common/views.py:2320 msgid "Source" msgstr "" #: ishtar_common/forms_common.py:2118 ishtar_common/forms_common.py:2504 -#: ishtar_common/models.py:4634 +#: ishtar_common/models.py:4633 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4640 +#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4639 msgid "Source - page range" msgstr "" @@ -10183,7 +10215,7 @@ msgid "" "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4678 +#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4677 msgid "Numerical ressource (web address)" msgstr "" @@ -10192,40 +10224,40 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:59 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4681 +#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4680 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4687 +#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4686 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4701 +#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4700 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" #: ishtar_common/forms_common.py:2176 ishtar_common/forms_common.py:2494 -#: ishtar_common/models.py:4703 +#: ishtar_common/models.py:4702 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" #: ishtar_common/forms_common.py:2227 ishtar_common/forms_common.py:3106 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 -#: ishtar_common/templates/ishtar/sheet_document.html:123 +#: ishtar_common/templates/ishtar/sheet_document.html:121 msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:86 +#: ishtar_common/templates/ishtar/sheet_document.html:84 msgid "Publishing" msgstr "" @@ -10386,7 +10418,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2249 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 msgid "Import key" msgstr "" @@ -10396,26 +10428,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2264 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2256 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2267 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2272 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2283 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2238 +#: ishtar_common/models_common.py:2249 msgid "Buffer" msgstr "" @@ -10423,18 +10455,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2285 -#: ishtar_common/models_common.py:4192 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 +#: ishtar_common/models_common.py:4203 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 +#: ishtar_common/models_common.py:4206 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2291 -#: ishtar_common/models_common.py:4198 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:4209 msgid "Estimated error for Z" msgstr "" @@ -10443,10 +10475,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2050 ishtar_common/models_common.py:2108 -#: ishtar_common/models_common.py:2140 ishtar_common/models_common.py:2157 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2187 -#: ishtar_common/models_common.py:2316 ishtar_common/models_common.py:3418 +#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 +#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 msgid "Geography" msgstr "" @@ -10474,8 +10506,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2207 -#: ishtar_common/models_common.py:4207 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:4218 msgid "Point" msgstr "" @@ -10526,11 +10558,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1645 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1647 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2187 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2189 msgid "Old imports" msgstr "" @@ -10732,7 +10764,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 -#: ishtar_common/templates/ishtar/sheet_document.html:126 +#: ishtar_common/templates/ishtar/sheet_document.html:124 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -11362,8 +11394,8 @@ msgid "Ishtar site profiles" msgstr "" #: ishtar_common/models.py:1589 ishtar_common/models.py:1900 -#: ishtar_common/models.py:2123 ishtar_common/models.py:5465 -#: ishtar_common/models.py:5495 ishtar_common/models_imports.py:135 +#: ishtar_common/models.py:2123 ishtar_common/models.py:5474 +#: ishtar_common/models.py:5504 ishtar_common/models_imports.py:135 msgid "General settings" msgstr "" @@ -11833,15 +11865,15 @@ msgstr "" msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3620 ishtar_common/models.py:5472 +#: ishtar_common/models.py:3620 ishtar_common/models.py:5481 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3621 ishtar_common/models.py:5473 +#: ishtar_common/models.py:3621 ishtar_common/models.py:5482 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3622 ishtar_common/models.py:5475 +#: ishtar_common/models.py:3622 ishtar_common/models.py:5484 #: ishtar_common/models_imports.py:1292 ishtar_common/models_imports.py:1306 msgid "Finished" msgstr "" @@ -11859,11 +11891,11 @@ msgstr "" msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3650 ishtar_common/models.py:5489 -#: ishtar_common/models.py:5648 +#: ishtar_common/models.py:3650 ishtar_common/models.py:5498 +#: ishtar_common/models.py:5657 #: ishtar_common/templates/ishtar/import_table.html:4 #: ishtar_common/templates/ishtar/sheet_import_gen.html:4 -#: ishtar_common/views.py:2320 +#: ishtar_common/views.py:2322 msgid "Result" msgstr "" @@ -12117,7 +12149,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1835 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12172,252 +12204,257 @@ msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4605 +#: ishtar_common/models.py:4574 +msgctxt "pdf, odt, zip, ..." +msgid "Associated file" +msgstr "" + +#: ishtar_common/models.py:4604 msgid "Rights of use / license" msgstr "" -#: ishtar_common/models.py:4672 +#: ishtar_common/models.py:4671 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4689 +#: ishtar_common/models.py:4688 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4692 +#: ishtar_common/models.py:4691 msgid "Container ID" msgstr "" -#: ishtar_common/models.py:4696 +#: ishtar_common/models.py:4695 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4704 +#: ishtar_common/models.py:4703 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4706 +#: ishtar_common/models.py:4705 msgid "Related" msgstr "" -#: ishtar_common/models.py:4715 +#: ishtar_common/models.py:4721 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4719 +#: ishtar_common/models.py:4725 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4720 +#: ishtar_common/models.py:4726 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4721 +#: ishtar_common/models.py:4727 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4722 +#: ishtar_common/models.py:4728 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4952 +#: ishtar_common/models.py:4958 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4954 +#: ishtar_common/models.py:4960 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5367 +#: ishtar_common/models.py:5376 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5371 +#: ishtar_common/models.py:5380 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5421 +#: ishtar_common/models.py:5430 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5425 +#: ishtar_common/models.py:5434 msgid "Research" msgstr "" -#: ishtar_common/models.py:5458 +#: ishtar_common/models.py:5467 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5462 +#: ishtar_common/models.py:5471 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5463 +#: ishtar_common/models.py:5472 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5474 ishtar_common/models_imports.py:1291 +#: ishtar_common/models.py:5483 ishtar_common/models_imports.py:1291 #: ishtar_common/models_imports.py:1305 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5492 +#: ishtar_common/models.py:5501 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5493 +#: ishtar_common/models.py:5502 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5513 +#: ishtar_common/models.py:5522 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5525 +#: ishtar_common/models.py:5534 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5538 +#: ishtar_common/models.py:5547 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5556 +#: ishtar_common/models.py:5565 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5598 ishtar_common/models_imports.py:1282 +#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 #: ishtar_common/models_imports.py:1299 #: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5603 +#: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5606 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5615 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5609 +#: ishtar_common/models.py:5618 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5612 +#: ishtar_common/models.py:5621 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5615 +#: ishtar_common/models.py:5624 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5623 +#: ishtar_common/models.py:5632 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5628 +#: ishtar_common/models.py:5637 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5632 +#: ishtar_common/models.py:5641 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5637 +#: ishtar_common/models.py:5646 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5638 +#: ishtar_common/models.py:5647 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5639 +#: ishtar_common/models.py:5648 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5640 +#: ishtar_common/models.py:5649 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5641 +#: ishtar_common/models.py:5650 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5642 +#: ishtar_common/models.py:5651 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5643 +#: ishtar_common/models.py:5652 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5650 +#: ishtar_common/models.py:5659 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5653 +#: ishtar_common/models.py:5662 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5654 +#: ishtar_common/models.py:5663 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5656 ishtar_common/models.py:5716 +#: ishtar_common/models.py:5665 ishtar_common/models.py:5725 #: ishtar_common/templates/ishtar/import_table.html:91 #: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5666 +#: ishtar_common/models.py:5675 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5678 +#: ishtar_common/models.py:5687 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5690 +#: ishtar_common/models.py:5699 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5694 +#: ishtar_common/models.py:5703 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5703 +#: ishtar_common/models.py:5712 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5705 +#: ishtar_common/models.py:5714 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5708 +#: ishtar_common/models.py:5717 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5713 +#: ishtar_common/models.py:5722 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5714 +#: ishtar_common/models.py:5723 msgid "Archive - Imports" msgstr "" @@ -12429,381 +12466,381 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1130 +#: ishtar_common/models_common.py:1141 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1132 +#: ishtar_common/models_common.py:1143 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1133 +#: ishtar_common/models_common.py:1144 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1136 +#: ishtar_common/models_common.py:1147 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1152 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1528 +#: ishtar_common/models_common.py:1539 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1536 +#: ishtar_common/models_common.py:1547 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1543 ishtar_common/models_common.py:2242 +#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1545 +#: ishtar_common/models_common.py:1556 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1551 +#: ishtar_common/models_common.py:1562 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1571 +#: ishtar_common/models_common.py:1582 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1575 +#: ishtar_common/models_common.py:1586 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1579 +#: ishtar_common/models_common.py:1590 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1593 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1597 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1589 +#: ishtar_common/models_common.py:1600 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1839 +#: ishtar_common/models_common.py:1850 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1843 +#: ishtar_common/models_common.py:1854 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1847 +#: ishtar_common/models_common.py:1858 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1931 +#: ishtar_common/models_common.py:1942 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1933 +#: ishtar_common/models_common.py:1944 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2096 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2097 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2098 +#: ishtar_common/models_common.py:2109 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2099 +#: ishtar_common/models_common.py:2110 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2113 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2103 +#: ishtar_common/models_common.py:2114 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2134 +#: ishtar_common/models_common.py:2145 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2146 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2151 +#: ishtar_common/models_common.py:2162 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2163 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2179 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2180 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2181 +#: ishtar_common/models_common.py:2192 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:2193 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2219 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2209 +#: ishtar_common/models_common.py:2220 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2210 +#: ishtar_common/models_common.py:2221 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2250 +#: ishtar_common/models_common.py:2261 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2257 +#: ishtar_common/models_common.py:2268 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2265 +#: ishtar_common/models_common.py:2276 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2284 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:4188 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2278 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 +#: ishtar_common/models_common.py:2289 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2277 ishtar_common/models_common.py:4189 +#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2278 ishtar_common/models_common.py:4190 +#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2292 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2282 +#: ishtar_common/models_common.py:2293 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2283 +#: ishtar_common/models_common.py:2294 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2295 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2300 ishtar_common/models_common.py:4208 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2301 +#: ishtar_common/models_common.py:2312 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:2313 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2314 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2315 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2307 ishtar_common/models_common.py:2308 +#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2437 +#: ishtar_common/models_common.py:2448 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2901 +#: ishtar_common/models_common.py:2912 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2905 +#: ishtar_common/models_common.py:2916 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2909 +#: ishtar_common/models_common.py:2920 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2923 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2915 +#: ishtar_common/models_common.py:2926 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2918 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2921 +#: ishtar_common/models_common.py:2932 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:2925 +#: ishtar_common/models_common.py:2936 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2940 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2955 +#: ishtar_common/models_common.py:2966 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2957 +#: ishtar_common/models_common.py:2968 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3352 +#: ishtar_common/models_common.py:3363 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3354 +#: ishtar_common/models_common.py:3365 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3374 +#: ishtar_common/models_common.py:3385 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3376 +#: ishtar_common/models_common.py:3387 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3386 +#: ishtar_common/models_common.py:3397 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3390 +#: ishtar_common/models_common.py:3401 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3394 +#: ishtar_common/models_common.py:3405 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3660 +#: ishtar_common/models_common.py:3671 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3692 +#: ishtar_common/models_common.py:3703 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:3709 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3742 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3768 +#: ishtar_common/models_common.py:3779 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3849 +#: ishtar_common/models_common.py:3860 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3859 +#: ishtar_common/models_common.py:3870 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3877 +#: ishtar_common/models_common.py:3888 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4221 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:4224 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4217 +#: ishtar_common/models_common.py:4228 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4235 msgid "Multi polygon source item" msgstr "" @@ -13321,7 +13358,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2908 ishtar_common/widgets.py:453 +#: ishtar_common/views.py:2910 ishtar_common/widgets.py:453 #: ishtar_common/widgets.py:489 msgid "Delete" msgstr "" @@ -13682,15 +13719,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1945 -#: ishtar_common/views.py:1949 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1947 +#: ishtar_common/views.py:1951 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1952 -#: ishtar_common/views.py:1954 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1954 +#: ishtar_common/views.py:1956 msgid "Next" msgstr "" @@ -14181,7 +14218,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1298 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1300 msgid "Changelog" msgstr "" @@ -14402,7 +14439,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1788 +#: ishtar_common/views.py:1790 msgid "Import step by step" msgstr "" @@ -14417,7 +14454,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 #: ishtar_common/templates/ishtar/import_table.html:5 #: ishtar_common/templates/ishtar/sheet_import_gen.html:5 -#: ishtar_common/views.py:2319 +#: ishtar_common/views.py:2321 msgid "Error" msgstr "" @@ -14507,7 +14544,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_table.html:6 #: ishtar_common/templates/ishtar/sheet_import_gen.html:6 -#: ishtar_common/views.py:2321 +#: ishtar_common/views.py:2323 msgid "Match" msgstr "" @@ -14601,19 +14638,19 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:63 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgid "Web link" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:111 +#: ishtar_common/templates/ishtar/sheet_document.html:109 msgid "Other" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:124 +#: ishtar_common/templates/ishtar/sheet_document.html:122 msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:131 +#: ishtar_common/templates/ishtar/sheet_document.html:129 msgid "Treatment files" msgstr "" @@ -14661,73 +14698,73 @@ msgstr "" msgid "Publications" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:30 +#: ishtar_common/templates/ishtar/sheet_person.html:29 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:39 msgid "Phone type" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:53 +#: ishtar_common/templates/ishtar/sheet_person.html:52 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:65 msgid "Business address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:63 +#: ishtar_common/templates/ishtar/sheet_person.html:62 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:79 msgid "Other address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:72 +#: ishtar_common/templates/ishtar/sheet_person.html:71 msgid "Associated organization" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:84 +#: ishtar_common/templates/ishtar/sheet_person.html:83 msgid "Associated operations as scientist" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:89 +#: ishtar_common/templates/ishtar/sheet_person.html:88 msgid "Associated operations as responsible" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:94 +#: ishtar_common/templates/ishtar/sheet_person.html:93 msgid "Associated operations as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:99 +#: ishtar_common/templates/ishtar/sheet_person.html:98 msgid "Operations associees en tant que rapporteur CIRA" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:104 +#: ishtar_common/templates/ishtar/sheet_person.html:103 msgid "Associated archaeological sites as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:109 +#: ishtar_common/templates/ishtar/sheet_person.html:108 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:114 +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:119 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:141 +#: ishtar_common/templates/ishtar/sheet_person.html:140 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:146 +#: ishtar_common/templates/ishtar/sheet_person.html:145 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:151 +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:156 +#: ishtar_common/templates/ishtar/sheet_person.html:155 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15257,140 +15294,140 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1141 +#: ishtar_common/views.py:1143 msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1164 ishtar_common/views_item.py:180 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:180 #: ishtar_common/views_item.py:223 ishtar_common/views_item.py:240 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1549 +#: ishtar_common/views.py:1551 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1574 +#: ishtar_common/views.py:1576 msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1581 +#: ishtar_common/views.py:1583 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1588 +#: ishtar_common/views.py:1590 msgid "Import: create (group)" msgstr "" -#: ishtar_common/views.py:1594 +#: ishtar_common/views.py:1596 msgid "Import: pre-form" msgstr "" -#: ishtar_common/views.py:2137 +#: ishtar_common/views.py:2139 msgid "Col. " msgstr "" -#: ishtar_common/views.py:2144 ishtar_common/views.py:2159 +#: ishtar_common/views.py:2146 ishtar_common/views.py:2161 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2248 +#: ishtar_common/views.py:2250 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2286 ishtar_common/views.py:2297 +#: ishtar_common/views.py:2288 ishtar_common/views.py:2299 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2459 +#: ishtar_common/views.py:2461 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2488 +#: ishtar_common/views.py:2490 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2496 +#: ishtar_common/views.py:2498 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2506 +#: ishtar_common/views.py:2508 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2546 ishtar_common/views.py:2567 +#: ishtar_common/views.py:2548 ishtar_common/views.py:2569 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2587 +#: ishtar_common/views.py:2589 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2600 +#: ishtar_common/views.py:2602 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2620 +#: ishtar_common/views.py:2622 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2688 +#: ishtar_common/views.py:2690 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2716 +#: ishtar_common/views.py:2718 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2741 +#: ishtar_common/views.py:2743 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2778 +#: ishtar_common/views.py:2780 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2884 +#: ishtar_common/views.py:2886 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2907 +#: ishtar_common/views.py:2909 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2950 +#: ishtar_common/views.py:2952 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2951 +#: ishtar_common/views.py:2953 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2956 +#: ishtar_common/views.py:2958 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2957 +#: ishtar_common/views.py:2959 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3076 +#: ishtar_common/views.py:3078 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:3214 ishtar_common/views.py:3309 +#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3346 ishtar_common/views.py:3400 +#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3360 +#: ishtar_common/views.py:3362 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3413 +#: ishtar_common/views.py:3415 msgid "Delete geographic item" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index a3ef009fc..5352d39fb 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-07 15:30+0200\n" +"POT-Creation-Date: 2024-06-17 12:47+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -30,7 +30,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1256 #: archaeological_operations/ishtar_menu.py:35 #: archaeological_operations/models.py:1589 #: archaeological_operations/models.py:2534 @@ -42,7 +42,7 @@ msgstr "" #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 #: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 -#: ishtar_common/models.py:5590 ishtar_common/views.py:500 +#: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" @@ -89,15 +89,15 @@ msgid "Context record - 001 - Search" msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 -#: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1230 -#: archaeological_operations/forms.py:1443 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1447 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 @@ -105,16 +105,16 @@ msgid "Full text search" msgstr "Recherche en texte intégral" #: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:304 -#: archaeological_context_records/forms.py:567 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/forms.py:571 +#: archaeological_context_records/forms.py:625 #: archaeological_context_records/models.py:752 #: archaeological_context_records/models.py:1390 msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1762 +#: archaeological_operations/forms.py:1766 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" @@ -132,10 +132,10 @@ msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:732 #: archaeological_context_records/models.py:746 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5591 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "Entité archéologique" @@ -145,12 +145,12 @@ msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:719 +#: archaeological_context_records/forms.py:723 msgid "Unit type" msgstr "Type d'unité" #: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:532 #: archaeological_context_records/models.py:830 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 @@ -158,7 +158,7 @@ msgid "Activity" msgstr "Activité" #: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/forms.py:523 #: archaeological_context_records/models.py:531 #: archaeological_context_records/models.py:823 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 @@ -181,25 +181,25 @@ msgstr "Identification" #: archaeological_context_records/models.py:786 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2096 -#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1244 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "Attribution culturelle" #: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:295 -#: archaeological_context_records/forms.py:569 -#: archaeological_context_records/forms.py:622 +#: archaeological_context_records/forms.py:297 +#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:518 #: archaeological_context_records/models.py:519 #: archaeological_context_records/models.py:724 #: archaeological_context_records/models.py:1392 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1080 -#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1084 +#: archaeological_operations/forms.py:1461 #: archaeological_operations/models.py:3180 #: archaeological_operations/models.py:3474 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 @@ -217,26 +217,26 @@ msgid "Search within relations" msgstr "Rechercher parmi les relations" #: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:317 #: archaeological_context_records/models.py:533 #: archaeological_context_records/models.py:835 msgid "Excavation techniques" msgstr "Méthodes de fouille" -#: archaeological_context_records/forms.py:209 -#: archaeological_context_records/forms.py:230 +#: archaeological_context_records/forms.py:211 +#: archaeological_context_records/forms.py:232 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" -#: archaeological_context_records/forms.py:279 +#: archaeological_context_records/forms.py:281 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:689 #: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1516 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -251,38 +251,38 @@ msgstr "Rechercher une Unité d'Enregistrement" msgid "General" msgstr "Général" -#: archaeological_context_records/forms.py:280 +#: archaeological_context_records/forms.py:282 msgid "Context record - 020 - General" msgstr "Unité d'enregistrement - 020 - Général" -#: archaeological_context_records/forms.py:296 -#: archaeological_context_records/forms.py:559 -#: archaeological_context_records/forms.py:623 -#: archaeological_context_records/forms.py:721 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:627 +#: archaeological_context_records/forms.py:725 #: archaeological_context_records/models.py:515 #: archaeological_context_records/models.py:516 #: archaeological_context_records/models.py:732 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1056 #: archaeological_operations/models.py:3161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "Commune" -#: archaeological_context_records/forms.py:301 -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:303 +#: archaeological_context_records/forms.py:568 msgid "Only the items associated to the operation can be selected." msgstr "Seuls les éléments associés à l'opération peuvent être sélectionnés." -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:570 -#: archaeological_context_records/forms.py:625 +#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:574 +#: archaeological_context_records/forms.py:629 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:528 #: archaeological_context_records/models.py:777 @@ -290,7 +290,7 @@ msgstr "Seuls les éléments associés à l'opération peuvent être sélectionn msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:310 #: archaeological_context_records/models.py:753 #: archaeological_context_records/models.py:1393 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 @@ -306,7 +306,7 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2447 -#: ishtar_common/models.py:1089 ishtar_common/models.py:4690 +#: ishtar_common/models.py:1089 ishtar_common/models.py:4689 #: ishtar_common/models_imports.py:160 ishtar_common/models_imports.py:439 #: ishtar_common/models_imports.py:707 ishtar_common/models_imports.py:807 #: ishtar_common/models_imports.py:826 @@ -317,12 +317,12 @@ msgstr "Type d'Unité d'Enregistrement" msgid "Description" msgstr "Description" -#: archaeological_context_records/forms.py:310 +#: archaeological_context_records/forms.py:312 #: archaeological_context_records/models.py:783 msgid "Filling" msgstr "Remplissage" -#: archaeological_context_records/forms.py:312 +#: archaeological_context_records/forms.py:314 #: archaeological_context_records/models.py:754 #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 #: archaeological_finds/models_finds.py:2175 @@ -332,51 +332,51 @@ msgstr "Remplissage" msgid "General comment" msgstr "Commentaire général" -#: archaeological_context_records/forms.py:323 -#: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:646 archaeological_operations/forms.py:744 +#: archaeological_context_records/forms.py:325 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:818 +#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:757 msgid "Length (m)" msgstr "Taille (m)" -#: archaeological_context_records/forms.py:330 +#: archaeological_context_records/forms.py:332 #: archaeological_context_records/models.py:758 msgid "Width (m)" msgstr "Largeur (m)" -#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/forms.py:333 #: archaeological_context_records/models.py:759 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/forms.py:334 #: archaeological_context_records/models.py:760 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: archaeological_context_records/forms.py:333 +#: archaeological_context_records/forms.py:335 #: archaeological_context_records/models.py:761 msgid "Depth (m)" msgstr "Profondeur (m)" -#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/forms.py:337 #: archaeological_context_records/models.py:763 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition (m)" -#: archaeological_context_records/forms.py:338 +#: archaeological_context_records/forms.py:340 #: archaeological_context_records/models.py:755 msgid "Opening date" msgstr "Date d'ouverture" -#: archaeological_context_records/forms.py:341 +#: archaeological_context_records/forms.py:343 #: archaeological_context_records/models.py:756 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:609 +#: archaeological_files/models.py:624 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 @@ -391,12 +391,12 @@ msgstr "Date d'ouverture" msgid "Closing date" msgstr "Date de clôture" -#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/forms.py:346 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "Documentation" -#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/forms.py:352 #: archaeological_context_records/models.py:767 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:226 @@ -407,16 +407,16 @@ msgstr "Documentation" msgid "Location" msgstr "Localisation" -#: archaeological_context_records/forms.py:434 +#: archaeological_context_records/forms.py:438 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: archaeological_context_records/forms.py:439 +#: archaeological_context_records/forms.py:443 msgid "You have to choose a town or a parcel." msgstr "Vous devez choisir une commune ou une parcelle." -#: archaeological_context_records/forms.py:444 -#: archaeological_context_records/forms.py:466 +#: archaeological_context_records/forms.py:448 +#: archaeological_context_records/forms.py:470 #: archaeological_context_records/models.py:165 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 #: archaeological_finds/models_finds.py:2093 @@ -430,7 +430,7 @@ msgstr "Vous devez choisir une commune ou une parcelle." msgid "Dating" msgstr "Datation" -#: archaeological_context_records/forms.py:451 +#: archaeological_context_records/forms.py:455 #: archaeological_context_records/models.py:109 #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 @@ -452,11 +452,11 @@ msgstr "Datation" msgid "Chronological period" msgstr "Période chronologique" -#: archaeological_context_records/forms.py:452 +#: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:786 archaeological_files/models.py:76 -#: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:190 +#: archaeological_files/forms.py:782 archaeological_files/models.py:76 +#: archaeological_files/models.py:730 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 @@ -498,10 +498,10 @@ msgstr "Période chronologique" msgid "Start date" msgstr "Date de début" -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:457 #: archaeological_context_records/models.py:112 -#: archaeological_files/forms.py:791 archaeological_files/models.py:77 -#: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 +#: archaeological_files/forms.py:787 archaeological_files/models.py:77 +#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:396 @@ -545,7 +545,7 @@ msgstr "Date de début" msgid "End date" msgstr "Date de fin" -#: archaeological_context_records/forms.py:454 +#: archaeological_context_records/forms.py:458 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -558,7 +558,7 @@ msgstr "Date de fin" msgid "Quality" msgstr "Qualité" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -572,7 +572,7 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:460 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -580,11 +580,11 @@ msgstr "Type de datation" msgid "Precise on this dating" msgstr "Précision sur cette datation" -#: archaeological_context_records/forms.py:467 +#: archaeological_context_records/forms.py:471 msgid "Context record - 030 - Dating" msgstr "Unité d'enregistrement - 030 - Datation" -#: archaeological_context_records/forms.py:479 +#: archaeological_context_records/forms.py:483 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:276 #: archaeological_context_records/models.py:1521 @@ -596,11 +596,11 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1724 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 -#: ishtar_common/models.py:5592 ishtar_common/views.py:504 +#: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/forms.py:497 +#: archaeological_context_records/forms.py:501 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -612,86 +612,86 @@ msgstr "Unité d'Enregistrement" msgid "Relations" msgstr "Relations" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:502 msgid "Context record - 050 - Relations" msgstr "Unité d'enregistrement - 050 - Relations" -#: archaeological_context_records/forms.py:504 -#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/forms.py:508 +#: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "Interprétation" -#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/forms.py:509 msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" -#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/forms.py:525 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "Compléments sur la datation" -#: archaeological_context_records/forms.py:522 +#: archaeological_context_records/forms.py:526 #: archaeological_context_records/models.py:789 msgid "TAQ" msgstr "TAQ" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:527 #: archaeological_context_records/models.py:798 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/forms.py:528 #: archaeological_context_records/models.py:804 msgid "TPQ" msgstr "TPQ" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:529 #: archaeological_context_records/models.py:813 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: archaeological_context_records/forms.py:527 -#: archaeological_operations/forms.py:1146 -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1866 +#: archaeological_context_records/forms.py:531 +#: archaeological_operations/forms.py:1150 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1870 msgid "Cultural attributions" msgstr "Attributions culturelles" -#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:535 msgid "Comments on dating" msgstr "Précisions sur la datation" -#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:548 #: archaeological_operations/forms.py:624 #: archaeological_operations/forms.py:637 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "Rechercher une opération" -#: archaeological_context_records/forms.py:549 +#: archaeological_context_records/forms.py:553 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:559 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: archaeological_context_records/forms.py:657 +#: archaeological_context_records/forms.py:661 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1832 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr " - copie" -#: archaeological_context_records/forms.py:687 +#: archaeological_context_records/forms.py:691 msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_context_records/forms.py:707 +#: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:1282 #: archaeological_context_records/models.py:1321 #: archaeological_context_records/models.py:1389 @@ -699,23 +699,23 @@ msgstr "Unité d'enregistrement - Action rapide - Modification" msgid "Relation type" msgstr "Type de relation" -#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/forms.py:715 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "Associé à" -#: archaeological_context_records/forms.py:736 +#: archaeological_context_records/forms.py:740 msgid "Associated parcel" msgstr "Parcelle associée" -#: archaeological_context_records/forms.py:761 +#: archaeological_context_records/forms.py:765 msgid "Parcel can be modified only if operations are the same" msgstr "" "Les parcelles ne peuvent être modifiées seulement si les opérations sont " "identiques" -#: archaeological_context_records/forms.py:780 +#: archaeological_context_records/forms.py:784 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -867,7 +867,7 @@ msgstr "Datations" #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5593 +#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5602 #: ishtar_common/views.py:508 man_app/templates/ishtar/sheet_museum_find.html:4 #: na_app/templates/ishtar/sheet_find.html:4 #: pdl_app/templates/ishtar/sheet_find.html:4 @@ -897,10 +897,10 @@ msgstr "Mobilier" #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 -#: ishtar_common/models.py:5365 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2095 ishtar_common/models_common.py:2131 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2165 -#: ishtar_common/models_common.py:2178 ishtar_common/models_imports.py:474 +#: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 +#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 +#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 msgid "Order" msgstr "Ordre" @@ -955,9 +955,9 @@ msgstr "Types de documentation" #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1237 -#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1144 +#: archaeological_operations/forms.py:1241 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:495 @@ -1015,7 +1015,7 @@ msgstr "id" #: archaeological_context_records/models.py:577 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:475 archaeological_finds/models_finds.py:1307 +#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1307 #: archaeological_operations/models.py:378 #: archaeological_operations/models.py:1143 #: archaeological_operations/tests.py:3107 @@ -1106,7 +1106,7 @@ msgid "identification" msgstr "identification" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:478 archaeological_operations/models.py:1149 +#: archaeological_files/models.py:493 archaeological_operations/models.py:1149 #: archaeological_operations/models.py:2716 msgctxt "key for text search" msgid "parcel" @@ -1172,24 +1172,23 @@ msgstr "Modification par lot" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1691 #: ishtar_common/admin.py:1834 ishtar_common/models.py:4556 -#: ishtar_common/models.py:4929 ishtar_common/views.py:3133 -#: ishtar_common/views.py:3151 +#: ishtar_common/models.py:4935 ishtar_common/views.py:3135 +#: ishtar_common/views.py:3153 msgid "Duplicate" msgstr "Dupliquer" #: archaeological_context_records/models.py:718 -#: archaeological_files/models.py:547 archaeological_finds/models_finds.py:551 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:2023 #: archaeological_finds/models_treatments.py:259 -#: archaeological_finds/models_treatments.py:1112 #: archaeological_operations/models.py:3169 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4583 +#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 msgid "External ID" msgstr "Identifiant" #: archaeological_context_records/models.py:720 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:553 +#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 #: archaeological_finds/models_finds.py:2025 #: archaeological_operations/models.py:3172 #: archaeological_warehouse/models.py:441 @@ -1198,7 +1197,7 @@ msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" #: archaeological_context_records/models.py:765 -#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3372 +#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3383 msgid "Surface (m2)" msgstr "Surface (m2)" @@ -1236,7 +1235,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:736 archaeological_finds/models_finds.py:2300 +#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2300 #: archaeological_finds/models_treatments.py:279 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/templates/ishtar/sheet_find.html:65 @@ -1246,21 +1245,21 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_operations/models.py:1477 #: archaeological_operations/models.py:2916 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:96 +#: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1193 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 #: cd17_app/templates/ishtar/sheet_find.html:65 ishtar_common/models.py:1035 #: ishtar_common/models.py:2421 ishtar_common/models.py:4058 #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 -#: ishtar_common/models.py:4145 ishtar_common/models.py:4716 -#: ishtar_common/models.py:4727 ishtar_common/models_common.py:3400 +#: ishtar_common/models.py:4145 ishtar_common/models.py:4722 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:162 +#: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1274,7 +1273,7 @@ msgid "Documents" msgstr "Documents" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:742 archaeological_finds/models_finds.py:2306 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2306 #: archaeological_finds/models_treatments.py:285 #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:540 @@ -1282,7 +1281,7 @@ msgstr "Documents" #: archaeological_operations/models.py:2923 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3406 +#: ishtar_common/models_common.py:3417 msgid "Main image" msgstr "Image principale" @@ -1305,7 +1304,7 @@ msgstr "Nom en cache des périodes" #: archaeological_operations/models.py:1571 #: archaeological_operations/models.py:1577 #: archaeological_operations/models.py:1583 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4362 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" @@ -1480,11 +1479,11 @@ msgstr "Opération / Site" #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:92 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:189 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 -#: ishtar_common/templates/ishtar/sheet_document.html:129 +#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:242 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1502,7 +1501,7 @@ msgstr "Mobilier" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:104 +#: archaeological_operations/templates/ishtar/sheet_site.html:103 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1545,7 +1544,7 @@ msgstr "Champs personnalisés" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4365 +#: ishtar_common/models_common.py:4376 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1558,7 +1557,7 @@ msgstr "Identifiant complet" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:263 +#: archaeological_files/templates/ishtar/sheet_file.html:270 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1572,8 +1571,8 @@ msgstr "Surface" #: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:67 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:168 +#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1583,15 +1582,24 @@ msgid "Geographic localisation" msgstr "Localisation géographique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 +#: archaeological_files/templates/ishtar/sheet_file.html:240 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:102 +#: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 +#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 +#: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 +#: ishtar_common/templates/ishtar/sheet_person.html:166 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1631,9 +1639,9 @@ msgstr "Référence numérique" #: cd17_app/templates/ishtar/sheet_find.html:393 #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 -#: ishtar_common/models.py:5484 ishtar_common/models.py:5621 -#: ishtar_common/models.py:5700 ishtar_common/models_common.py:2024 -#: ishtar_common/models_common.py:2039 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5493 ishtar_common/models.py:5630 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1759,9 +1767,9 @@ msgid "File - 001 - Search" msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 -#: archaeological_files/forms.py:237 archaeological_files/forms.py:667 -#: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 -#: archaeological_files/models.py:388 archaeological_files/models.py:539 +#: archaeological_files/forms.py:237 archaeological_files/forms.py:663 +#: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 +#: archaeological_files/models.py:403 archaeological_files/models.py:554 #: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 @@ -1776,8 +1784,8 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_finds/models_treatments.py:1106 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1447 -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1768 #: archaeological_operations/models.py:989 #: archaeological_operations/models.py:1387 #: archaeological_operations/models.py:2666 @@ -1790,38 +1798,38 @@ msgid "Year" msgstr "Année" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:673 archaeological_files/models.py:541 +#: archaeological_files/forms.py:669 archaeological_files/models.py:556 msgid "Numeric reference" msgstr "Identifiant numérique" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1137 -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1352 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/forms.py:1526 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 +#: archaeological_operations/forms.py:1239 +#: archaeological_operations/forms.py:1356 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1530 #: archaeological_operations/models.py:493 #: archaeological_operations/models.py:2898 msgid "Other reference" msgstr "Autre référence" -#: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 -#: archaeological_files/forms.py:1167 archaeological_files/models.py:1376 +#: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1460 -#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2047 -#: ishtar_common/models_common.py:3380 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:3391 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: archaeological_files/forms.py:99 archaeological_files/forms.py:1177 +#: archaeological_files/forms.py:99 archaeological_files/forms.py:1173 msgid "File name" msgstr "Nom du dossier" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 -#: archaeological_files/models.py:389 archaeological_files/models.py:394 -#: archaeological_files/models.py:553 +#: archaeological_files/models.py:404 archaeological_files/models.py:409 +#: archaeological_files/models.py:568 msgid "File type" msgstr "Type de dossier" @@ -1835,32 +1843,32 @@ msgid "Saisine type" msgstr "Type de saisine" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 -#: archaeological_files/forms.py:529 archaeological_files/models.py:306 -#: archaeological_files/models.py:393 archaeological_files/models.py:602 +#: archaeological_files/forms.py:529 archaeological_files/models.py:321 +#: archaeological_files/models.py:408 archaeological_files/models.py:617 msgid "Permit type" msgstr "Type de permis" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:531 -#: archaeological_files/models.py:607 +#: archaeological_files/forms.py:104 archaeological_files/forms.py:467 +#: archaeological_files/forms.py:531 archaeological_files/models.py:622 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:616 -#: archaeological_files/forms.py:664 archaeological_files/models.py:655 -#: archaeological_finds/forms.py:799 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1425 archaeological_finds/forms.py:2585 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:660 +#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 +#: archaeological_finds/forms.py:2585 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_treatments.py:261 #: archaeological_finds/models_treatments.py:1158 #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1366 -#: archaeological_operations/forms.py:1463 -#: archaeological_operations/forms.py:1525 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/forms.py:1529 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1472 #: archaeological_operations/models.py:2912 @@ -1869,8 +1877,8 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 -#: ishtar_common/models.py:4699 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2275 ishtar_common/models_imports.py:890 +#: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1879,32 +1887,32 @@ msgstr "Commentaire" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "Responsable" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1179 archaeological_files/models.py:565 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 msgid "General contractor" msgstr "Aménageur" -#: archaeological_files/forms.py:127 archaeological_files/forms.py:1189 +#: archaeological_files/forms.py:127 archaeological_files/forms.py:1185 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 +#: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1465 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 msgid "Created by" msgstr "Créée par" -#: archaeological_files/forms.py:146 archaeological_files/forms.py:1228 +#: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1475 msgid "Modified by" msgstr "Modifiée par" @@ -1916,17 +1924,18 @@ msgstr "Rechercher un dossier archéologique" msgid "Archaeological file - 010 - General" msgstr "Dossier archéologique - 010 - Général" -#: archaeological_files/forms.py:218 archaeological_files/models.py:622 +#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/models.py:1348 ishtar_common/forms_common.py:2164 -#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4684 +#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "Date de création" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:639 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 #: archaeological_finds/templates/ishtar/sheet_find.html:509 @@ -1964,12 +1973,12 @@ msgid "Planning name" msgstr "Nom de l'aménagement" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:455 archaeological_files/models.py:619 +#: archaeological_files/models.py:470 archaeological_files/models.py:634 #: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1066 -#: archaeological_operations/forms.py:1071 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1054 +#: archaeological_operations/forms.py:1070 +#: archaeological_operations/forms.py:1075 +#: archaeological_operations/forms.py:1406 #: archaeological_operations/models.py:304 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1076 @@ -1979,17 +1988,17 @@ msgstr "Nom de l'aménagement" #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3414 +#: ishtar_common/models_common.py:3425 #: ishtar_common/templates/ishtar/sheet_area.html:71 -#: ishtar_common/templates/ishtar/sheet_document.html:134 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "Communes" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/forms.py:576 archaeological_files/models.py:658 -#: archaeological_operations/models.py:2901 ishtar_common/models_common.py:2048 +#: archaeological_files/models.py:673 archaeological_operations/models.py:2901 +#: ishtar_common/models_common.py:2059 msgid "Departments" msgstr "Départements" @@ -1998,7 +2007,7 @@ msgid "Only relevant when no town is provided." msgstr "Seulement pertinent quand aucune commune n'est renseignée." #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:650 +#: archaeological_files/models.py:665 msgid "Locality" msgstr "Lieu-dit" @@ -2012,16 +2021,16 @@ msgstr "N° / voie" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 msgid "Postal code" msgstr "Code postal" -#: archaeological_files/forms.py:304 archaeological_files/forms.py:747 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:743 msgid "Surfaces" msgstr "Surfaces" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:812 archaeological_files/models.py:648 +#: archaeological_files/forms.py:808 archaeological_files/models.py:663 msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" @@ -2029,7 +2038,7 @@ msgstr "Surface totale aménagée (m2)" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 #: ishtar_common/forms_common.py:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 +#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -2064,11 +2073,7 @@ msgstr "Service instructeur" msgid "Archaeological file - 040 - Planning service" msgstr "Dossier archéologique - 040 - Service aménageur" -#: archaeological_files/forms.py:467 -msgid "File reference" -msgstr "Référence du dossier" - -#: archaeological_files/forms.py:470 archaeological_files/models.py:626 +#: archaeological_files/forms.py:470 archaeological_files/models.py:641 msgid "Date of planning service file" msgstr "Date du dossier du service instructeur" @@ -2083,7 +2088,7 @@ msgstr "" msgid "Preventive informations" msgstr "Information archéologie préventive" -#: archaeological_files/forms.py:515 archaeological_files/models.py:586 +#: archaeological_files/forms.py:515 archaeological_files/models.py:601 msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" @@ -2096,162 +2101,166 @@ msgstr "Archéologie programmée" msgid "Archaeological file - 045 - Research - General" msgstr "Dossier archéologique - 045 - Recherche - Général" -#: archaeological_files/forms.py:596 archaeological_files/models.py:682 +#: archaeological_files/forms.py:592 archaeological_files/models.py:697 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2852 msgid "Scientist in charge" msgstr "Responsable d'opération" -#: archaeological_files/forms.py:599 archaeological_files/models.py:666 +#: archaeological_files/forms.py:595 archaeological_files/models.py:681 msgid "Requested operation type" msgstr "Type d'opération demandée" -#: archaeological_files/forms.py:602 +#: archaeological_files/forms.py:598 msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: archaeological_files/forms.py:625 archaeological_files/models.py:688 +#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/templates/ishtar/sheet_file.html:170 +msgid "Research archaeology comment" +msgstr "Précisions sur l'archéologie programmée" + +#: archaeological_files/forms.py:621 archaeological_files/models.py:703 msgid "Classified area" msgstr "Au sein d'un site classé" -#: archaeological_files/forms.py:626 archaeological_files/models.py:690 +#: archaeological_files/forms.py:622 archaeological_files/models.py:705 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" -#: archaeological_files/forms.py:639 +#: archaeological_files/forms.py:635 msgid "Instruction" msgstr "Instruction" -#: archaeological_files/forms.py:640 +#: archaeological_files/forms.py:636 msgid "Archaeological file - 050 - Instruction" msgstr "Dossier archéologique - 050 - Instruction" -#: archaeological_files/forms.py:644 +#: archaeological_files/forms.py:640 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "Dossier géré par" -#: archaeological_files/forms.py:657 archaeological_files/models.py:630 +#: archaeological_files/forms.py:653 archaeological_files/models.py:645 msgid "Related file" msgstr "Dossier associé" -#: archaeological_files/forms.py:665 archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:64 +#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "Date limite d'instruction" -#: archaeological_files/forms.py:730 +#: archaeological_files/forms.py:726 msgid "Would you like to close this archaeological file?" msgstr "Voulez-vous clore ce dossier archéologique ?" -#: archaeological_files/forms.py:735 +#: archaeological_files/forms.py:731 msgid "Would you like to delete this archaeological file ?" msgstr "Voulez-vous supprimer ce dossier archéologique ?" -#: archaeological_files/forms.py:739 +#: archaeological_files/forms.py:735 msgid "Preventive file" msgstr "Dossier préventif" -#: archaeological_files/forms.py:740 +#: archaeological_files/forms.py:736 msgid "Preventive file - 020 - Edition form" msgstr "Dossier préventif - 020 - Formulaire d'édition" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:79 +#: archaeological_files/forms.py:742 ishtar_common/forms_common.py:2232 +#: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "Dates" -#: archaeological_files/forms.py:748 +#: archaeological_files/forms.py:744 msgid "Archaeological royalties" msgstr "Redevances archéologiques" -#: archaeological_files/forms.py:771 archaeological_files/models.py:707 +#: archaeological_files/forms.py:767 archaeological_files/models.py:722 msgid "Intervention period" msgstr "Période d'intervention" -#: archaeological_files/forms.py:776 archaeological_files/models.py:710 +#: archaeological_files/forms.py:772 archaeological_files/models.py:725 msgid "Study period" msgstr "Période d'étude" -#: archaeological_files/forms.py:781 archaeological_files/models.py:713 +#: archaeological_files/forms.py:777 archaeological_files/models.py:728 msgid "Report due period" msgstr "Période de remise du rapport" -#: archaeological_files/forms.py:796 archaeological_files/models.py:717 +#: archaeological_files/forms.py:792 archaeological_files/models.py:732 msgid "Ground start date" msgstr "Date de début de la fouille" -#: archaeological_files/forms.py:801 archaeological_files/models.py:718 +#: archaeological_files/forms.py:797 archaeological_files/models.py:733 msgid "Ground end date" msgstr "Date de fin de la fouille" -#: archaeological_files/forms.py:806 archaeological_files/models.py:720 +#: archaeological_files/forms.py:802 archaeological_files/models.py:735 msgid "Execution report date" msgstr "Date du rapport d'exécution" -#: archaeological_files/forms.py:829 +#: archaeological_files/forms.py:825 msgid "Linear meter (m)" msgstr "Mètre linéaire (m)" -#: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:335 -#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/forms.py:885 archaeological_files/forms.py:887 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Man by day" msgstr "Personnes par jour" -#: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/forms.py:886 archaeological_files/forms.py:888 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 msgid "Days" msgstr "Jours" -#: archaeological_files/forms.py:893 archaeological_files/models.py:116 -#: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:277 -#: archaeological_files/templates/ishtar/sheet_file.html:329 +#: archaeological_files/forms.py:889 archaeological_files/models.py:116 +#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" msgstr "Emploi" -#: archaeological_files/forms.py:914 archaeological_files/models.py:80 +#: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:703 +#: archaeological_files/models.py:206 archaeological_files/models.py:718 msgid "Price agreement" msgstr "Contrat tarifaire" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:968 msgid "Post-excavation" msgstr "Post-fouille" -#: archaeological_files/forms.py:973 +#: archaeological_files/forms.py:969 msgid "Preventive file - 030 - Post-excavation" msgstr "Dossier préventif - 030 - Post-fouille" -#: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:273 +#: archaeological_files/forms.py:993 +#: archaeological_files/templates/ishtar/sheet_file.html:280 msgid "Ground jobs" msgstr "Emplois de terrain" -#: archaeological_files/forms.py:999 +#: archaeological_files/forms.py:995 msgid "Preventive file - 040 - Ground jobs" msgstr "Dossier préventif - 040 - Emplois de terrain" -#: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/forms.py:1001 archaeological_files/forms.py:1003 +#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:397 msgid "Quantity" msgstr "Quantité" -#: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:381 +#: archaeological_files/forms.py:1005 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Equipment / service" msgstr "Équipement / service" -#: archaeological_files/forms.py:1123 archaeological_files/forms.py:1159 -#: archaeological_files/forms.py:1294 +#: archaeological_files/forms.py:1119 archaeological_files/forms.py:1155 +#: archaeological_files/forms.py:1290 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:566 @@ -2264,13 +2273,13 @@ msgstr "Équipement / service" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1581 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1585 #: archaeological_operations/models.py:2837 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 #: archaeological_warehouse/models.py:1174 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 -#: ishtar_common/models.py:4582 +#: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 #: na_app/templates/ishtar/sheet_find.html:370 #: pdl_app/templates/ishtar/sheet_find.html:361 @@ -2278,83 +2287,83 @@ msgstr "Équipement / service" msgid "Index" msgstr "Index" -#: archaeological_files/forms.py:1125 archaeological_files/forms.py:1161 -#: archaeological_files/forms.py:1283 +#: archaeological_files/forms.py:1121 archaeological_files/forms.py:1157 +#: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1454 -#: archaeological_operations/forms.py:1515 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1519 #: archaeological_operations/models.py:2568 #: archaeological_operations/models.py:2827 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "Type d'acte" -#: archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1122 msgid "Object (full text search)" msgstr "Objet (recherche en texte intégral)" -#: archaeological_files/forms.py:1162 +#: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1455 -#: archaeological_operations/forms.py:1651 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1655 msgid "Indexed?" msgstr "Indexé ?" -#: archaeological_files/forms.py:1169 +#: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1522 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1526 #: archaeological_operations/models.py:2896 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: archaeological_files/forms.py:1172 +#: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/forms_treatments.py:850 msgid "Signature date before" msgstr "Date de signature avant" -#: archaeological_files/forms.py:1175 +#: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 #: archaeological_finds/forms_treatments.py:848 msgid "Signature date after" msgstr "Date de signature après" -#: archaeological_files/forms.py:1200 +#: archaeological_files/forms.py:1196 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: archaeological_files/forms.py:1202 +#: archaeological_files/forms.py:1198 msgid "File year" msgstr "Dossier : année" -#: archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:1200 msgid "File other reference" msgstr "Dossier : autre référence" -#: archaeological_files/forms.py:1207 +#: archaeological_files/forms.py:1203 msgid "File in charge" msgstr "Dossier : responsable" -#: archaeological_files/forms.py:1217 +#: archaeological_files/forms.py:1213 msgid "File permit reference" msgstr "Dossier : réf. du permis / de l'arrêté" -#: archaeological_files/forms.py:1281 +#: archaeological_files/forms.py:1277 msgid "Archaeological file - Administrative act - General" msgstr "Dossier archéologique - Acte administratif - Général" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:766 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:949 +#: archaeological_operations/forms.py:953 #: archaeological_operations/models.py:2032 #: archaeological_operations/models.py:2551 #: archaeological_operations/models.py:2667 @@ -2381,12 +2390,12 @@ msgstr "Acte administratif" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 -#: archaeological_files/models.py:254 archaeological_files/models.py:334 -#: archaeological_files/models.py:354 archaeological_files/models.py:1422 -#: archaeological_files/models.py:1439 archaeological_files/models.py:1464 +#: archaeological_files/models.py:254 archaeological_files/models.py:349 +#: archaeological_files/models.py:369 archaeological_files/models.py:1439 +#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 -#: ishtar_common/models.py:5423 +#: ishtar_common/models.py:5432 #: sra_idf_app/templates/ishtar/sheet_operation.html:298 msgid "Preventive" msgstr "Préventif" @@ -2494,7 +2503,7 @@ msgstr "" msgid "Service provider" msgstr "Fournisseur de service" -#: archaeological_files/models.py:225 archaeological_files/models.py:266 +#: archaeological_files/models.py:225 archaeological_files/models.py:281 msgid "Flat rate" msgstr "Tarif forfaitaire" @@ -2539,51 +2548,51 @@ msgstr "Coût équipement/service" msgid "Equipment/service costs" msgstr "Coûts équipement/service" -#: archaeological_files/models.py:286 +#: archaeological_files/models.py:301 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: archaeological_files/models.py:287 +#: archaeological_files/models.py:302 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: archaeological_files/models.py:307 +#: archaeological_files/models.py:322 msgid "Permit types" msgstr "Types de permis" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:333 msgid "Delay (in days)" msgstr "Délai (en jours)" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:346 msgid "Agreement type - France" msgstr "Type de convention - France" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:347 msgid "Agreement types - France" msgstr "Types de convention - France" -#: archaeological_files/models.py:343 +#: archaeological_files/models.py:358 msgid "Increase coefficient" msgstr "Coefficient majoration" -#: archaeological_files/models.py:345 +#: archaeological_files/models.py:360 msgid "Increased final value" msgstr "Valeur finale majorée" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:362 msgid "Category" msgstr "Catégorie" -#: archaeological_files/models.py:351 +#: archaeological_files/models.py:366 msgid "Operation type for royalties - France" msgstr "Type d'opération pour les redevances - France" -#: archaeological_files/models.py:352 +#: archaeological_files/models.py:367 msgid "Operation types for royalties - France" msgstr "Types d'opération pour les redevances - France" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1199 +#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 #: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 @@ -2591,13 +2600,13 @@ msgstr "Types d'opération pour les redevances - France" msgid "Area" msgstr "Zone" -#: archaeological_files/models.py:391 archaeological_finds/models_finds.py:1202 +#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:991 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:400 archaeological_finds/models_finds.py:1223 +#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2605,8 +2614,8 @@ msgstr "Zone étendue" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2020 ishtar_common/models_common.py:2036 -#: ishtar_common/templates/ishtar/sheet_person.html:31 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -2622,15 +2631,15 @@ msgstr "Zone étendue" msgid "Number" msgstr "Nombre" -#: archaeological_files/models.py:401 +#: archaeological_files/models.py:416 msgid "Total surface (km2)" msgstr "Surface totale (km2)" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:417 msgid "Total developed surface (km2)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:466 archaeological_finds/models_finds.py:1311 +#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1311 #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1130 @@ -2641,7 +2650,7 @@ msgctxt "key for text search" msgid "year" msgstr "annee" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:483 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:362 #: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 @@ -2649,19 +2658,19 @@ msgctxt "key for text search" msgid "reference" msgstr "reference" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:486 #: archaeological_finds/models_treatments.py:155 #: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:483 archaeological_operations/models.py:1154 +#: archaeological_files/models.py:498 archaeological_operations/models.py:1154 msgctxt "key for text search" msgid "department" msgstr "departement" -#: archaeological_files/models.py:487 +#: archaeological_files/models.py:502 #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:365 #: archaeological_operations/models.py:1158 @@ -2672,7 +2681,7 @@ msgctxt "key for text search" msgid "name" msgstr "nom" -#: archaeological_files/models.py:490 +#: archaeological_files/models.py:505 #: archaeological_finds/models_treatments.py:161 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1164 @@ -2686,27 +2695,27 @@ msgctxt "key for text search" msgid "type" msgstr "type" -#: archaeological_files/models.py:493 +#: archaeological_files/models.py:508 msgctxt "key for text search" msgid "active" msgstr "actif" -#: archaeological_files/models.py:496 +#: archaeological_files/models.py:511 msgctxt "key for text search" msgid "saisine-type" msgstr "type-saisine" -#: archaeological_files/models.py:501 +#: archaeological_files/models.py:516 msgctxt "key for text search" msgid "permit-type" msgstr "type-permis" -#: archaeological_files/models.py:506 +#: archaeological_files/models.py:521 msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:510 archaeological_finds/models_finds.py:1517 +#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1517 #: archaeological_operations/models.py:384 #: archaeological_operations/models.py:1209 #: archaeological_operations/models.py:2812 @@ -2715,41 +2724,41 @@ msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_files/models.py:513 archaeological_finds/models_finds.py:1676 +#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1676 #: archaeological_finds/models_treatments.py:1065 #: archaeological_finds/tests.py:1614 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2747 +#: archaeological_files/models.py:532 archaeological_operations/models.py:2747 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:522 archaeological_operations/models.py:2751 +#: archaeological_files/models.py:537 archaeological_operations/models.py:2751 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" -#: archaeological_files/models.py:544 +#: archaeological_files/models.py:559 #: archaeological_finds/models_treatments.py:1109 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" -#: archaeological_files/models.py:552 +#: archaeological_files/models.py:567 #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1136 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1824 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 @@ -2764,9 +2773,9 @@ msgstr "Référence interne" #: ishtar_common/models.py:1083 ishtar_common/models.py:1688 #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 -#: ishtar_common/models.py:3639 ishtar_common/models.py:5459 -#: ishtar_common/models_common.py:2243 ishtar_common/models_common.py:3371 -#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 +#: ishtar_common/models.py:3639 ishtar_common/models.py:5468 +#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 +#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2793,7 +2802,7 @@ msgstr "Référence interne" msgid "Name" msgstr "Nom" -#: archaeological_files/models.py:557 +#: archaeological_files/models.py:572 #: archaeological_finds/models_treatments.py:1123 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 @@ -2806,35 +2815,35 @@ msgstr "Nom" msgid "Person in charge" msgstr "Personne responsable" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:586 msgid "General contractor (raw)" msgstr "Aménageur (brut)" -#: archaeological_files/models.py:576 +#: archaeological_files/models.py:591 msgid "General contractor organization" msgstr "Organisation de l'aménageur" -#: archaeological_files/models.py:590 +#: archaeological_files/models.py:605 msgid "Planning service (raw)" msgstr "Service instructeur (brut)" -#: archaeological_files/models.py:597 +#: archaeological_files/models.py:612 msgid "Planning service organization" msgstr "Service instructeur" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:627 msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:651 +#: archaeological_files/models.py:666 msgid "Main address" msgstr "Adresse des terrains" -#: archaeological_files/models.py:653 +#: archaeological_files/models.py:668 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: archaeological_files/models.py:672 +#: archaeological_files/models.py:687 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:252 @@ -2850,111 +2859,131 @@ msgstr "Adresse des terrains - code postal" msgid "Organization" msgstr "Organisation" -#: archaeological_files/models.py:685 -msgid "Research archaeology comment" -msgstr "Précisions sur l'archéologie programmée" - -#: archaeological_files/models.py:722 +#: archaeological_files/models.py:737 msgid "Linear meter" msgstr "Mètre linéaire" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:741 msgid "Type of agreement" msgstr "Type de convention" -#: archaeological_files/models.py:731 +#: archaeological_files/models.py:746 msgid "Operation type for royalties" msgstr "Type d'opération pour la redevance" -#: archaeological_files/models.py:747 +#: archaeological_files/models.py:762 msgid "Imported line" msgstr "Ligne importée" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:782 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: archaeological_files/models.py:794 +#: archaeological_files/models.py:809 msgid "FILE" msgstr "DOSSIER" -#: archaeological_files/models.py:1047 +#: archaeological_files/models.py:1062 msgid "Multi-town" msgstr "Intercommunal" -#: archaeological_files/models.py:1053 +#: archaeological_files/models.py:1068 msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1262 archaeological_operations/models.py:1979 +#: archaeological_files/models.py:1277 archaeological_operations/models.py:1979 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1264 archaeological_operations/models.py:1981 +#: archaeological_files/models.py:1279 archaeological_operations/models.py:1981 msgid "parcels" msgstr "parcelles" -#: archaeological_files/models.py:1274 +#: archaeological_files/models.py:1289 msgid "Edit intervention plan" msgstr "Modifier le plan d'intervention" -#: archaeological_files/models.py:1276 +#: archaeological_files/models.py:1291 msgid "plan" msgstr "plan d'intervention" -#: archaeological_files/models.py:1285 +#: archaeological_files/models.py:1300 #: archaeological_finds/models_treatments.py:409 #: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:2012 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" -#: archaeological_files/models.py:1287 +#: archaeological_files/models.py:1302 #: archaeological_finds/models_treatments.py:411 #: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:2014 msgid "admin. act" msgstr "acte admin." -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1311 msgid "Add operation" msgstr "Ajouter une opération" -#: archaeological_files/models.py:1298 +#: archaeological_files/models.py:1313 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1373 archaeological_operations/models.py:1392 +#: archaeological_files/models.py:1388 archaeological_operations/models.py:1392 #: archaeological_operations/models.py:3146 msgid "File" msgstr "Dossier" -#: archaeological_files/models.py:1392 +#: archaeological_files/models.py:1407 msgid "Man by day - planned" msgstr "Personnes par jour - planifiés" -#: archaeological_files/models.py:1394 archaeological_files/models.py:1456 +#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 msgid "Days - planned" msgstr "Jours - planifiés" -#: archaeological_files/models.py:1396 +#: archaeological_files/models.py:1411 msgid "Man by day - worked" msgstr "Personnes par jour - travaillés" -#: archaeological_files/models.py:1398 archaeological_files/models.py:1460 +#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 msgid "Days - worked" msgstr "Jours - travaillés" -#: archaeological_files/models.py:1454 +#: archaeological_files/models.py:1437 +msgid "Human requirement on field" +msgstr "Besoin humain terrains" + +#: archaeological_files/models.py:1438 +msgid "Human requirements on field" +msgstr "Besoins humains terrains" + +#: archaeological_files/models.py:1456 +msgid "Human requirement for post-excavation" +msgstr "Besoin humain post-fouille" + +#: archaeological_files/models.py:1457 +msgid "Human requirements for post-excavation" +msgstr "Besoins humains post-fouille" + +#: archaeological_files/models.py:1473 msgid "Quantity by day - planned" msgstr "Quantité par jour - planifié" -#: archaeological_files/models.py:1458 +#: archaeological_files/models.py:1477 msgid "Quantity by day - worked" msgstr "Quantité par jour - travaillé" +#: archaeological_files/models.py:1483 +msgid "Equipment requirement" +msgstr "Besoin en équipement" + +#: archaeological_files/models.py:1484 +msgid "Equipment requirements" +msgstr "Besoins en équipements" + #: archaeological_files/templates/admin/copy_price_change_list.html:9 msgid "Copy price agreement" msgstr "Copier le contrat tarifaire" @@ -2977,9 +3006,9 @@ msgid "Change price agreement" msgstr "Changer le contrat tarifaire" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:278 -#: archaeological_files/templates/ishtar/sheet_file.html:330 -#: archaeological_files/templates/ishtar/sheet_file.html:382 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Planned" msgstr "Planifié" @@ -3033,12 +3062,12 @@ msgstr "Parcelles associées" #: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:140 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 -#: ishtar_common/templates/ishtar/sheet_document.html:125 +#: ishtar_common/templates/ishtar/sheet_document.html:123 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3051,19 +3080,19 @@ msgstr "Actes administratifs" msgid "Associated operations" msgstr "Opérations associées" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:516 -#: archaeological_warehouse/models.py:737 ishtar_common/models.py:4584 +#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: ishtar_common/models.py:4583 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "Réf." -#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 @@ -3090,7 +3119,7 @@ msgstr "Réf." #: ishtar_common/forms_common.py:2014 ishtar_common/forms_common.py:2444 #: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:3398 #: ishtar_common/models.py:767 ishtar_common/models.py:2656 -#: ishtar_common/models.py:4273 ishtar_common/models.py:4588 +#: ishtar_common/models.py:4273 ishtar_common/models.py:4587 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:1123 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 @@ -3123,7 +3152,7 @@ msgstr "Réf." msgid "Type" msgstr "Type" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" @@ -3153,52 +3182,52 @@ msgstr "Pas d'acte administratif associé à ces opérations" msgid "Document for this archaeological file" msgstr "Document pour ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:255 +#: archaeological_files/templates/ishtar/sheet_file.html:262 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:270 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Human and technical requirements" msgstr "Besoins humains et techniques" -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Effective" msgstr "Effectif" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:295 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 +#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "Coût" -#: archaeological_files/templates/ishtar/sheet_file.html:303 -#: archaeological_files/templates/ishtar/sheet_file.html:355 -#: archaeological_files/templates/ishtar/sheet_file.html:411 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:246 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 +#: archaeological_files/templates/ishtar/sheet_file.html:310 +#: archaeological_files/templates/ishtar/sheet_file.html:362 +#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:252 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:276 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:234 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "Total" -#: archaeological_files/templates/ishtar/sheet_file.html:314 -#: archaeological_files/templates/ishtar/sheet_file.html:366 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:321 +#: archaeological_files/templates/ishtar/sheet_file.html:373 +#: archaeological_files/templates/ishtar/sheet_file.html:425 msgid "Difference" msgstr "Différence" -#: archaeological_files/templates/ishtar/sheet_file.html:325 +#: archaeological_files/templates/ishtar/sheet_file.html:332 msgid "Post-excavation jobs" msgstr "Emplois post-fouille" @@ -3977,9 +4006,9 @@ msgid "Operation - Remains" msgstr "Opération - Vestiges" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 +#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 -#: ishtar_common/templates/ishtar/sheet_document.html:135 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "Zones" @@ -4323,7 +4352,7 @@ msgstr "Rechercher un mobilier" #: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 #: archaeological_finds/models_treatments.py:399 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "Mobilier amont" @@ -4369,7 +4398,7 @@ msgstr "Panier de mobilier" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2019 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4578,7 +4607,7 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:105 +#: ishtar_common/templates/ishtar/sheet_document.html:103 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4659,7 +4688,7 @@ msgid "Treatment file - 001 - Search" msgstr "Dossier de traitement - 001 - Recherche" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4585 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "Réf. interne" @@ -4898,7 +4927,7 @@ msgstr "Types de traitement" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 -#: ishtar_common/templates/ishtar/sheet_document.html:130 +#: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" msgstr "Traitements" @@ -5074,7 +5103,8 @@ msgstr "Identifiant court" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4710 +#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" @@ -5099,6 +5129,12 @@ msgstr "g" msgid "kg" msgstr "kg" +#: archaeological_finds/models_finds.py:909 +#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 +msgid "Associated finds" +msgstr "Mobilier associé" + #: archaeological_finds/models_finds.py:914 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 @@ -5108,7 +5144,7 @@ msgstr "kg" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3112 +#: ishtar_common/views.py:3114 msgid "Modify" msgstr "Modifier" @@ -5160,11 +5196,11 @@ msgstr "Mobilier d'origine - Date de découverte (fin)" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1701 -#: archaeological_operations/forms.py:1769 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1773 #: archaeological_operations/models.py:988 #: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1400 ishtar_common/models.py:5370 +#: archaeological_operations/models.py:1400 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "Type d'opération" @@ -5333,7 +5369,7 @@ msgid "last-modified-by" msgstr "modifie-en-dernier-par" #: archaeological_finds/models_finds.py:1429 -#: ishtar_common/models_common.py:1567 +#: ishtar_common/models_common.py:1578 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" @@ -5835,9 +5871,9 @@ msgstr "musee-quantite-vue" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4946 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3159 +#: ishtar_common/views.py:3161 msgid "Packaging" msgstr "Conditionnement" @@ -6041,7 +6077,7 @@ msgid "TREATMENT" msgstr "TRAITEMENT" #: archaeological_finds/models_treatments.py:389 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "Mobilier aval" @@ -6072,7 +6108,7 @@ msgstr "Opérateur" #: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:105 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "Mobilier associé" @@ -6114,6 +6150,20 @@ msgctxt "key for text search" msgid "exhibition-end-after" msgstr "exposition-termine-apres" +#: archaeological_finds/models_treatments.py:1112 +#: archaeological_operations/forms.py:1139 +#: archaeological_operations/forms.py:1236 +#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/models.py:492 +#: archaeological_warehouse/forms.py:339 +#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 +#: ishtar_common/models.py:2410 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "Référence" + #: archaeological_finds/models_treatments.py:1184 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 @@ -6389,10 +6439,10 @@ msgstr "CSV" #: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:132 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: cd17_app/templates/ishtar/sheet_find.html:539 -#: ishtar_common/templates/ishtar/sheet_document.html:141 +#: ishtar_common/templates/ishtar/sheet_document.html:139 #: man_app/templates/ishtar/sheet_museum_find.html:617 #: na_app/templates/ishtar/sheet_find.html:542 #: pdl_app/templates/ishtar/sheet_find.html:535 @@ -6400,6 +6450,10 @@ msgstr "CSV" msgid "Associated documents" msgstr "Documents associés" +#: archaeological_finds/templates/ishtar/sheet_findbasket.html:14 +msgid "Owned by" +msgstr "Appartient à" + #: archaeological_finds/templates/ishtar/sheet_findbasket.html:20 msgid "Associated treatment files" msgstr "Demandes de traitements associés" @@ -6408,7 +6462,7 @@ msgstr "Demandes de traitements associés" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:60 +#: ishtar_common/templates/ishtar/sheet_document.html:58 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "Contenu" @@ -6615,9 +6669,9 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1093 -#: archaeological_operations/forms.py:1099 +#: archaeological_operations/forms.py:1081 +#: archaeological_operations/forms.py:1097 +#: archaeological_operations/forms.py:1103 #: archaeological_operations/models.py:3181 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6696,7 +6750,7 @@ msgid "Operation - 001 - Search" msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:945 +#: archaeological_operations/forms.py:949 #: archaeological_operations/models.py:1388 #: archaeological_operations/models.py:2048 msgid "Yearly index" @@ -6727,13 +6781,14 @@ msgstr "Est ouvert ?" #: archaeological_operations/forms.py:518 #: archaeological_operations/forms.py:777 +#: archaeological_operations/models.py:1377 #: archaeological_operations/models.py:2834 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:527 #: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1709 #: archaeological_operations/models.py:1370 msgid "Operator" msgstr "Opérateur" @@ -6745,10 +6800,10 @@ msgid "Operator reference" msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1143 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1358 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1147 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1875 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:497 @@ -6806,7 +6861,7 @@ msgstr "Opération virtuelle" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:1520 msgid "Documentation provided" @@ -6814,7 +6869,7 @@ msgstr "Documentation versée" #: archaeological_operations/forms.py:574 #: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1717 +#: archaeological_operations/forms.py:1721 #: archaeological_operations/models.py:1515 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" @@ -6830,7 +6885,7 @@ msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:581 #: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1720 +#: archaeological_operations/forms.py:1724 #: archaeological_operations/models.py:996 #: archaeological_operations/models.py:1526 msgid "Finds provided" @@ -6838,7 +6893,7 @@ msgstr "Mobilier versé" #: archaeological_operations/forms.py:583 #: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1724 +#: archaeological_operations/forms.py:1728 #: archaeological_operations/models.py:1522 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" @@ -6852,7 +6907,7 @@ msgstr "Date limite de versement du mobilier avant" msgid "Finds deadline after" msgstr "Date limite de versement du mobilier après" -#: archaeological_operations/forms.py:677 ishtar_common/models.py:4575 +#: archaeological_operations/forms.py:677 msgid "Associated file" msgstr "Dossier associé" @@ -6861,7 +6916,7 @@ msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1767 +#: archaeological_operations/forms.py:1771 #: archaeological_operations/models.py:1470 msgid "Generic name" msgstr "Nom générique" @@ -6871,13 +6926,15 @@ msgid "Actors" msgstr "Acteurs" #: archaeological_operations/forms.py:753 +#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:2852 msgid "Head scientist" msgstr "Responsable d'opération" #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1727 -#: archaeological_operations/forms.py:1860 +#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1731 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1384 msgid "Collaborators" @@ -6916,18 +6973,18 @@ msgstr "Type de vestige" msgid "Abstract" msgstr "Résumé" -#: archaeological_operations/forms.py:900 +#: archaeological_operations/forms.py:904 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: archaeological_operations/forms.py:905 +#: archaeological_operations/forms.py:909 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." -#: archaeological_operations/forms.py:935 +#: archaeological_operations/forms.py:939 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6936,243 +6993,231 @@ msgstr "" "Cet index existe déjà pour l'année %(year)d - utilisez une valeur plus " "grande que %(last_val)d ou videz le champ d'index annuel." -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:943 msgid "Bad operation index" msgstr "Mauvais index d'opération" -#: archaeological_operations/forms.py:980 +#: archaeological_operations/forms.py:984 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "Saisie judiciaire" -#: archaeological_operations/forms.py:981 +#: archaeological_operations/forms.py:985 msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" -#: archaeological_operations/forms.py:990 +#: archaeological_operations/forms.py:994 #: archaeological_operations/models.py:1533 msgid "Seizure name" msgstr "Nom de la saisie" -#: archaeological_operations/forms.py:993 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1535 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" -#: archaeological_operations/forms.py:999 +#: archaeological_operations/forms.py:1003 msgid "Protagonist" msgstr "Protagoniste" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1547 msgid "Applicant authority" msgstr "Autorité requérante" -#: archaeological_operations/forms.py:1011 +#: archaeological_operations/forms.py:1015 #: archaeological_operations/models.py:1555 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" -#: archaeological_operations/forms.py:1016 +#: archaeological_operations/forms.py:1020 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: archaeological_operations/forms.py:1017 +#: archaeological_operations/forms.py:1021 msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1024 #: archaeological_operations/models.py:1410 msgid "Cost (euros)" msgstr "Coût (euros)" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1025 #: archaeological_operations/models.py:1414 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: archaeological_operations/forms.py:1023 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: archaeological_operations/forms.py:1035 +#: archaeological_operations/forms.py:1039 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1040 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" -#: archaeological_operations/forms.py:1041 +#: archaeological_operations/forms.py:1045 #: archaeological_operations/models.py:1442 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: archaeological_operations/forms.py:1043 +#: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:1446 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: archaeological_operations/forms.py:1046 +#: archaeological_operations/forms.py:1050 #: archaeological_operations/models.py:1449 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: archaeological_operations/forms.py:1067 +#: archaeological_operations/forms.py:1071 msgid "Operation - 040 - Towns" msgstr "Opération - 040 - Communes" -#: archaeological_operations/forms.py:1072 +#: archaeological_operations/forms.py:1076 msgid "Operation - 040 - Towns (2)" msgstr "Opération - 040 - Communes (2)" -#: archaeological_operations/forms.py:1094 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels" msgstr "Opération - 050 - Parcelles" -#: archaeological_operations/forms.py:1101 +#: archaeological_operations/forms.py:1105 msgid "Operation - 050 - Parcels (2)" msgstr "Opération - 050 - Parcelles (2)" -#: archaeological_operations/forms.py:1135 -#: archaeological_operations/forms.py:1232 -#: archaeological_operations/forms.py:1350 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 -#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 -#: ishtar_common/models.py:2410 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "Référence" - -#: archaeological_operations/forms.py:1168 -#: archaeological_operations/forms.py:1396 -#: archaeological_operations/forms.py:1839 +#: archaeological_operations/forms.py:1172 +#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1843 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1216 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1221 msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: archaeological_operations/forms.py:1226 +#: archaeological_operations/forms.py:1230 msgid "Archaeological site - 001 - Search" msgstr "Site archéologique - 001 - Recherche" -#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1250 msgid "Top operation" msgstr "Opération chapeau" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1373 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" -#: archaeological_operations/forms.py:1261 -#: archaeological_operations/forms.py:1373 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1377 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1421 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "Numéro AffMar" -#: archaeological_operations/forms.py:1267 -#: archaeological_operations/forms.py:1419 +#: archaeological_operations/forms.py:1271 +#: archaeological_operations/forms.py:1423 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "Numéro DRASSM" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1273 +#: archaeological_operations/forms.py:1425 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "Nom de l'épave" -#: archaeological_operations/forms.py:1272 -#: archaeological_operations/forms.py:1429 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1433 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" -#: archaeological_operations/forms.py:1275 -#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1279 +#: archaeological_operations/forms.py:1427 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "Code épave" -#: archaeological_operations/forms.py:1277 -#: archaeological_operations/forms.py:1425 +#: archaeological_operations/forms.py:1281 +#: archaeological_operations/forms.py:1429 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "Date de naufrage" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 +#: archaeological_operations/forms.py:1283 +#: archaeological_operations/forms.py:1431 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "Zone de découverte" -#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1345 msgid "Archaeological site - 010 - General" msgstr "Site archéologique - 010 - Général" -#: archaeological_operations/forms.py:1403 +#: archaeological_operations/forms.py:1407 msgid "Archaeological site - 020 - Towns" msgstr "Site archéologique - 020 - Villes" -#: archaeological_operations/forms.py:1412 -#: archaeological_operations/templates/ishtar/sheet_site.html:53 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1417 msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1496 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1507 -#: archaeological_operations/forms.py:1609 -#: archaeological_operations/forms.py:1676 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1680 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1521 #: archaeological_operations/models.py:2859 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1524 +#: archaeological_operations/forms.py:1528 #: archaeological_operations/models.py:2894 msgid "Signature date" msgstr "Date de signature" -#: archaeological_operations/forms.py:1535 +#: archaeological_operations/forms.py:1539 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1569 +#: archaeological_operations/forms.py:1573 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -7181,48 +7226,48 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1577 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1586 +#: archaeological_operations/forms.py:1590 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1591 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 #: ishtar_common/models.py:2082 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1615 #: archaeological_operations/forms.py:1619 +#: archaeological_operations/forms.py:1623 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1641 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1643 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1660 +#: archaeological_operations/forms.py:1664 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1685 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1794 +#: archaeological_operations/forms.py:1798 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1854 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -7372,8 +7417,8 @@ msgid "top ope." msgstr "ope. sup." #: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 -#: ishtar_common/models.py:5498 ishtar_common/models.py:5659 -#: ishtar_common/models.py:5719 ishtar_common/views_item.py:1740 +#: ishtar_common/models.py:5507 ishtar_common/models.py:5668 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1740 msgid "Unknown" msgstr "Inconnu" @@ -7567,14 +7612,6 @@ msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1361 -msgid "Scientific manager" -msgstr "Responsable de suivi scientifique" - -#: archaeological_operations/models.py:1377 -msgid "Operation monitor" -msgstr "Responsable de suivi scientifique" - #: archaeological_operations/models.py:1495 msgid "Sites for which this operation is top operation" msgstr "Sites pour lesquels cette opération est une opération chapeau" @@ -7595,9 +7632,9 @@ msgid "Cached label" msgstr "Libellé en cache" #: archaeological_operations/models.py:1590 -#: archaeological_operations/templates/ishtar/sheet_site.html:86 +#: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:127 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "Opérations" @@ -7857,8 +7894,8 @@ msgstr "Adresse - Lieu-dit" #: archaeological_operations/models.py:3176 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 -#: ishtar_common/models_common.py:4358 +#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 +#: ishtar_common/models_common.py:4369 msgid "Cached name" msgstr "Nom en cache" @@ -7874,7 +7911,7 @@ msgstr "Propriétaire de parcelle" msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3506 ishtar_common/models.py:5366 +#: archaeological_operations/models.py:3506 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "Est du préventif" @@ -7913,7 +7950,7 @@ msgstr "Sites / parcelles / actes administratifs" #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 @@ -7926,9 +7963,9 @@ msgstr "Unités d'Enregistrement" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:215 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7989,8 +8026,8 @@ msgid "Associated containers" msgstr "Contenants associés" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -8005,8 +8042,8 @@ msgid "Export" msgstr "Exporter" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:225 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:182 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -8014,8 +8051,8 @@ msgid "Regenerate statistics" msgstr "Re-générer les statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:230 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8178,7 +8215,7 @@ msgstr "" #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:934 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5594 +#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 msgid "Warehouse" msgstr "Lieu de conservation" @@ -8200,8 +8237,8 @@ msgid "Order fields must be different." msgstr "Les champs « ordre » doivent être différents." #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:188 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "Divisions" @@ -8250,35 +8287,35 @@ msgstr "" "conservation, les champs suivants sont utilisés pour cette organisation." #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 -#: ishtar_common/models_common.py:3842 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 +#: ishtar_common/models_common.py:3853 msgid "Address complement" msgstr "Complément d'adresse" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 msgid "Town (freeform)" msgstr "Commune (saisie libre)" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 msgid "Country" msgstr "Pays" #: archaeological_warehouse/forms.py:251 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 -#: ishtar_common/templates/ishtar/sheet_person.html:28 +#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "Téléphone" #: archaeological_warehouse/forms.py:253 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3694 -#: ishtar_common/templates/ishtar/sheet_person.html:46 +#: ishtar_common/models_common.py:3705 +#: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "Téléphone mobile" @@ -8310,7 +8347,7 @@ msgstr "Ancienne référence" #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:904 #: archaeological_warehouse/models.py:1153 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:155 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" @@ -8449,10 +8486,10 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 -#: ishtar_common/templates/ishtar/sheet_document.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:190 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 +#: ishtar_common/templates/ishtar/sheet_document.html:131 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "Contenants" @@ -8489,7 +8526,7 @@ msgid "Automatically generated" msgstr "Généré automatiquement" #: archaeological_warehouse/models.py:458 -#: ishtar_common/templates/ishtar/sheet_document.html:132 +#: ishtar_common/templates/ishtar/sheet_document.html:130 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "Lieux de conservation" @@ -8759,27 +8796,27 @@ msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" "Le poids calculé et le poids mesuré sont trop différent (au delà de 10%%)." -#: archaeological_warehouse/templates/ishtar/sheet_container.html:201 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "Vide" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:232 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 #: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "Pas de contenant ou de division dans ce contenant." -#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "Mobiliers par localisation" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:262 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:268 #: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "Contenants par localisation" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:290 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:296 #: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "Document associé à ce contenant" @@ -8788,43 +8825,43 @@ msgstr "Document associé à ce contenant" msgid "Default divisions (imports)" msgstr "Divisions par défaut (imports)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:114 msgid "Geographic localisation/contact details" msgstr "Localisation géographique/coordonnées" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:147 msgid "No container inside this warehouse" msgstr "Pas de contenant dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:151 msgid "Finds (hosted)" msgstr "Mobiliers (accueillis)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:156 msgid "No find inside this warehouse" msgstr "Pas de mobilier dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 msgid "Finds (owned)" msgstr "Mobiliers (possédés)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 msgid "No find owned by this warehouse" msgstr "Pas de mobilier possédé par ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "No container/division inside this container" msgstr "Pas de contenant ou division dans ce contenant" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 msgid "Finds by location in the warehouse" msgstr "Mobiliers par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 msgid "Containers by location in the warehouse" msgstr "Contenants par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:254 msgid "Document for this warehouse" msgstr "Document associé à ce lieu de conservation" @@ -8837,11 +8874,6 @@ msgstr "" "élément, ils n'auront plus de contenant parent. Vous voulez probablement " "corriger cela." -#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 -msgid "Associated finds" -msgstr "Mobilier associé" - #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:33 msgid "" "These finds are inside this item. If you delete this item, they won't be " @@ -8919,7 +8951,7 @@ msgstr "Sélectionner le contenant principal" msgid "Precise on dating" msgstr "Précision sur cette datation" -#: docs/generate_values_doc.py:77 +#: docs/generate_values_doc.py:81 msgid "Field not available for imports" msgstr "Champ non disponible pour les imports" @@ -8936,16 +8968,16 @@ msgid "warehouse" msgstr "depot" #: example_project/__init__.py:13 ishtar_common/views.py:345 -#: ishtar_common/views.py:1127 +#: ishtar_common/views.py:1129 msgid "New organization" msgstr "Ajouter une organisation" #: example_project/__init__.py:14 ishtar_common/views.py:287 -#: ishtar_common/views.py:1118 ishtar_common/views.py:1123 +#: ishtar_common/views.py:1120 ishtar_common/views.py:1125 msgid "New person" msgstr "Ajouter une personne" -#: example_project/__init__.py:15 ishtar_common/views.py:1133 +#: example_project/__init__.py:15 ishtar_common/views.py:1135 msgid "New author" msgstr "Nouvel auteur" @@ -9586,7 +9618,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1890 +#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 msgid "No data provided" msgstr "Aucune donnée fournie" @@ -9626,8 +9658,8 @@ msgstr "" "Objet lié non trouvé. Création de l'élément géographique impossible. " "Contexte {}." -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1968 -#: ishtar_common/views.py:1978 +#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/views.py:1980 msgid "Not imported" msgstr "Non importé" @@ -9711,7 +9743,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "Fichier trop gros. La taille ne doit pas excéder {} Mo." #: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1619 -#: ishtar_common/views.py:3060 +#: ishtar_common/views.py:3062 msgid "Confirm" msgstr "Confirmer" @@ -9990,8 +10022,8 @@ msgstr "Identifiant Muséofile" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 -#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 +#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 msgid "Email" msgstr "Courriel" @@ -10022,7 +10054,7 @@ msgstr "Prénom" #: ishtar_common/forms_common.py:1141 ishtar_common/forms_common.py:2009 #: ishtar_common/forms_common.py:2443 ishtar_common/forms_common.py:2707 #: ishtar_common/models.py:2936 ishtar_common/models.py:2940 -#: ishtar_common/models.py:4573 ishtar_common/models_imports.py:1058 +#: ishtar_common/models.py:4572 ishtar_common/models_imports.py:1058 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 @@ -10065,12 +10097,12 @@ msgstr "Identité" msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 -#: ishtar_common/models_common.py:3686 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 +#: ishtar_common/models_common.py:3697 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -10078,11 +10110,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 msgid "Phone 3" msgstr "Téléphone 3" @@ -10090,23 +10122,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -10194,7 +10226,7 @@ msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" #: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3512 -#: ishtar_common/views.py:1404 +#: ishtar_common/views.py:1406 msgid "Current profile" msgstr "Profil actuel" @@ -10252,47 +10284,47 @@ msgid "Document - 010 - General" msgstr "Document - 010 - Général" #: ishtar_common/forms_common.py:2017 ishtar_common/forms_common.py:2449 -#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4647 +#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4646 msgid "Medium" msgstr "Support" #: ishtar_common/forms_common.py:2020 ishtar_common/forms_common.py:2229 #: ishtar_common/forms_common.py:2448 ishtar_common/forms_common.py:2671 -#: ishtar_common/models.py:4654 ishtar_common/models_imports.py:1062 +#: ishtar_common/models.py:4653 ishtar_common/models_imports.py:1062 #: ishtar_common/models_imports.py:1064 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 -#: ishtar_common/templates/ishtar/sheet_document.html:50 +#: ishtar_common/templates/ishtar/sheet_document.html:48 msgid "Format" msgstr "Format" #: ishtar_common/forms_common.py:2022 ishtar_common/forms_common.py:2450 -#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4659 +#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4658 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "Échelle" #: ishtar_common/forms_common.py:2024 ishtar_common/forms_common.py:2451 -#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4662 +#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4661 msgid "Shooting angle" msgstr "Angle de prise de vue" #: ishtar_common/forms_common.py:2043 ishtar_common/forms_common.py:2231 #: ishtar_common/forms_common.py:2916 ishtar_common/forms_common.py:2917 #: ishtar_common/models.py:3987 ishtar_common/models.py:4271 -#: ishtar_common/models.py:4668 +#: ishtar_common/models.py:4667 ishtar_common/models.py:4712 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:69 +#: ishtar_common/templates/ishtar/sheet_document.html:67 msgid "Authors" msgstr "Auteurs" #: ishtar_common/forms_common.py:2049 ishtar_common/forms_common.py:2455 -#: ishtar_common/models.py:4595 +#: ishtar_common/models.py:4594 msgid "Publisher" msgstr "Éditions" #: ishtar_common/forms_common.py:2073 ishtar_common/forms_common.py:2477 -#: ishtar_common/models.py:4602 +#: ishtar_common/models.py:4601 msgid "Year of publication" msgstr "Année de publication" @@ -10302,54 +10334,54 @@ msgid "Rights of use / licenses" msgstr "Droits d’utilisation / licences" #: ishtar_common/forms_common.py:2081 ishtar_common/forms_common.py:2483 -#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4609 +#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4608 msgid "Rights owner" msgstr "Propriétaire des droits" #: ishtar_common/forms_common.py:2091 ishtar_common/forms_common.py:2490 -#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4614 +#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4613 msgid "Copyright" msgstr "Crédit photographique / mentions obligatoires" #: ishtar_common/forms_common.py:2094 ishtar_common/forms_common.py:2674 -#: ishtar_common/models.py:4615 +#: ishtar_common/models.py:4614 msgid "Tags" msgstr "Mots-clés" #: ishtar_common/forms_common.py:2100 ishtar_common/forms_common.py:2478 -#: ishtar_common/models.py:4618 ishtar_common/models_imports.py:1067 +#: ishtar_common/models.py:4617 ishtar_common/models_imports.py:1067 #: overload_translation/models.py:11 msgid "Language" msgstr "Langue" #: ishtar_common/forms_common.py:2103 ishtar_common/forms_common.py:2480 -#: ishtar_common/models.py:4623 +#: ishtar_common/models.py:4622 msgid "ISSN" msgstr "ISSN" #: ishtar_common/forms_common.py:2109 ishtar_common/forms_common.py:2479 -#: ishtar_common/models.py:4624 +#: ishtar_common/models.py:4623 msgid "ISBN" msgstr "ISBN" #: ishtar_common/forms_common.py:2115 ishtar_common/forms_common.py:2234 -#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4627 -#: ishtar_common/models.py:5710 +#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4626 +#: ishtar_common/models.py:5719 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:98 +#: ishtar_common/templates/ishtar/sheet_document.html:96 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 -#: ishtar_common/views.py:2318 +#: ishtar_common/views.py:2320 msgid "Source" msgstr "Source" #: ishtar_common/forms_common.py:2118 ishtar_common/forms_common.py:2504 -#: ishtar_common/models.py:4634 +#: ishtar_common/models.py:4633 msgid "Source - free input" msgstr "Source - saisie libre" -#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4640 +#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4639 msgid "Source - page range" msgstr "Source - intervalle de pages" @@ -10363,7 +10395,7 @@ msgstr "" "\"242;245;249\", pages et intervalles de pages multiples : " "\"242-245;249;262-265\"." -#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4678 +#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4677 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" @@ -10372,40 +10404,40 @@ msgid "Image" msgstr "Image" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:59 msgctxt "Not directory" msgid "File" msgstr "Fichier" -#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4681 +#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4680 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "Date de réception" -#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4687 +#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4686 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4701 +#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4700 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "Information supplémentaire" #: ishtar_common/forms_common.py:2176 ishtar_common/forms_common.py:2494 -#: ishtar_common/models.py:4703 +#: ishtar_common/models.py:4702 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "Existe en doublon" #: ishtar_common/forms_common.py:2227 ishtar_common/forms_common.py:3106 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 -#: ishtar_common/templates/ishtar/sheet_document.html:123 +#: ishtar_common/templates/ishtar/sheet_document.html:121 msgid "Related items" msgstr "Éléments reliés" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:86 +#: ishtar_common/templates/ishtar/sheet_document.html:84 msgid "Publishing" msgstr "Éditions" @@ -10569,7 +10601,7 @@ msgstr "Élément géographique" msgid "Geo item - 010 - General" msgstr "Élément géographique - 010 - Général" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2249 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 msgid "Import key" msgstr "Clé d'import" @@ -10581,26 +10613,26 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2264 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "Type de donnée" -#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2256 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2267 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "Origine" -#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2272 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2283 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "Fournisseur" #: ishtar_common/forms_common.py:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2238 +#: ishtar_common/models_common.py:2249 msgid "Buffer" msgstr "Tampon" @@ -10608,18 +10640,18 @@ msgstr "Tampon" msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2285 -#: ishtar_common/models_common.py:4192 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 +#: ishtar_common/models_common.py:4203 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 +#: ishtar_common/models_common.py:4206 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2291 -#: ishtar_common/models_common.py:4198 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:4209 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" @@ -10628,10 +10660,10 @@ msgid "Metadata" msgstr "Métadonnées" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2050 ishtar_common/models_common.py:2108 -#: ishtar_common/models_common.py:2140 ishtar_common/models_common.py:2157 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2187 -#: ishtar_common/models_common.py:2316 ishtar_common/models_common.py:3418 +#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 +#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 msgid "Geography" msgstr "Géographie" @@ -10659,8 +10691,8 @@ msgstr "Type de géométrie" msgid "Coordinates" msgstr "Coordonnées" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2207 -#: ishtar_common/models_common.py:4207 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:4218 msgid "Point" msgstr "Point" @@ -10711,11 +10743,11 @@ msgstr "Ajout/modification" msgid "Imports" msgstr "Imports" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1645 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1647 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2187 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2189 msgid "Old imports" msgstr "Anciens imports" @@ -10921,7 +10953,7 @@ msgid "Archaeological entity" msgstr "Entité (EA)" #: ishtar_common/models.py:1044 -#: ishtar_common/templates/ishtar/sheet_document.html:126 +#: ishtar_common/templates/ishtar/sheet_document.html:124 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "Sites" @@ -11622,8 +11654,8 @@ msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" #: ishtar_common/models.py:1589 ishtar_common/models.py:1900 -#: ishtar_common/models.py:2123 ishtar_common/models.py:5465 -#: ishtar_common/models.py:5495 ishtar_common/models_imports.py:135 +#: ishtar_common/models.py:2123 ishtar_common/models.py:5474 +#: ishtar_common/models.py:5504 ishtar_common/models_imports.py:135 msgid "General settings" msgstr "Paramêtres généraux" @@ -12108,15 +12140,15 @@ msgstr "Profil d'utilisateur" msgid "User profiles" msgstr "Profils d'utilisateurs" -#: ishtar_common/models.py:3620 ishtar_common/models.py:5472 +#: ishtar_common/models.py:3620 ishtar_common/models.py:5481 msgid "Scheduled" msgstr "Planifié" -#: ishtar_common/models.py:3621 ishtar_common/models.py:5473 +#: ishtar_common/models.py:3621 ishtar_common/models.py:5482 msgid "In progress" msgstr "En cours" -#: ishtar_common/models.py:3622 ishtar_common/models.py:5475 +#: ishtar_common/models.py:3622 ishtar_common/models.py:5484 #: ishtar_common/models_imports.py:1292 ishtar_common/models_imports.py:1306 msgid "Finished" msgstr "Terminé" @@ -12134,11 +12166,11 @@ msgstr "Voir" msgid "Arguments" msgstr "Arguments" -#: ishtar_common/models.py:3650 ishtar_common/models.py:5489 -#: ishtar_common/models.py:5648 +#: ishtar_common/models.py:3650 ishtar_common/models.py:5498 +#: ishtar_common/models.py:5657 #: ishtar_common/templates/ishtar/import_table.html:4 #: ishtar_common/templates/ishtar/sheet_import_gen.html:4 -#: ishtar_common/views.py:2320 +#: ishtar_common/views.py:2322 msgid "Result" msgstr "Résultat" @@ -12394,7 +12426,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1835 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" @@ -12449,106 +12481,111 @@ msgctxt "key for text search" msgid "treatment-file" msgstr "dossier-traitement" -#: ishtar_common/models.py:4605 +#: ishtar_common/models.py:4574 +msgctxt "pdf, odt, zip, ..." +msgid "Associated file" +msgstr "Fichier associé" + +#: ishtar_common/models.py:4604 msgid "Rights of use / license" msgstr "Droit d’utilisation / licence" -#: ishtar_common/models.py:4672 +#: ishtar_common/models.py:4671 msgid "Authors (raw)" msgstr "Auteurs (brut)" -#: ishtar_common/models.py:4689 +#: ishtar_common/models.py:4688 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "Nombre d'éléments" -#: ishtar_common/models.py:4692 +#: ishtar_common/models.py:4691 msgid "Container ID" msgstr "ID contenant" -#: ishtar_common/models.py:4696 +#: ishtar_common/models.py:4695 msgid "Container reference ID" msgstr "ID contenant de référence" -#: ishtar_common/models.py:4704 +#: ishtar_common/models.py:4703 msgid "Symbolic links" msgstr "Liens symboliques" -#: ishtar_common/models.py:4706 +#: ishtar_common/models.py:4705 msgid "Related" msgstr "Lié" -#: ishtar_common/models.py:4715 +#: ishtar_common/models.py:4721 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "Document" -#: ishtar_common/models.py:4719 +#: ishtar_common/models.py:4725 msgid "Can view own Document" msgstr "Peut voir ses propres Documents" -#: ishtar_common/models.py:4720 +#: ishtar_common/models.py:4726 msgid "Can add own Document" msgstr "Peut ajouter son propre Document" -#: ishtar_common/models.py:4721 +#: ishtar_common/models.py:4727 msgid "Can change own Document" msgstr "Peut modifier ses propres Documents" -#: ishtar_common/models.py:4722 +#: ishtar_common/models.py:4728 msgid "Can delete own Document" msgstr "Peut supprimer ses propres Documents" -#: ishtar_common/models.py:4952 +#: ishtar_common/models.py:4958 msgid "Add sub-document" msgstr "Ajouter un sous-document" -#: ishtar_common/models.py:4954 +#: ishtar_common/models.py:4960 msgid "sub-document" msgstr "sous-document" -#: ishtar_common/models.py:5367 +#: ishtar_common/models.py:5376 msgid "Is judiciary" msgstr "Est judiciaire" -#: ishtar_common/models.py:5371 +#: ishtar_common/models.py:5380 msgid "Operation types" msgstr "Types d'opération" -#: ishtar_common/models.py:5421 +#: ishtar_common/models.py:5430 msgid "Judiciary" msgstr "Judiciaire" -#: ishtar_common/models.py:5425 +#: ishtar_common/models.py:5434 msgid "Research" msgstr "Programmé" -#: ishtar_common/models.py:5458 +#: ishtar_common/models.py:5467 msgid "Filename" msgstr "Nom de fichier" -#: ishtar_common/models.py:5462 +#: ishtar_common/models.py:5471 msgid "Administration script" msgstr "Script d'administration" -#: ishtar_common/models.py:5463 +#: ishtar_common/models.py:5472 msgid "Administration scripts" msgstr "Scripts d'administration" -#: ishtar_common/models.py:5474 ishtar_common/models_imports.py:1291 +#: ishtar_common/models.py:5483 ishtar_common/models_imports.py:1291 #: ishtar_common/models_imports.py:1305 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: ishtar_common/models.py:5492 +#: ishtar_common/models.py:5501 msgid "Administration task" msgstr "Tâche d'administration" -#: ishtar_common/models.py:5493 +#: ishtar_common/models.py:5502 msgid "Administration tasks" msgstr "Tâches d'administration" -#: ishtar_common/models.py:5513 +#: ishtar_common/models.py:5522 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." @@ -12556,7 +12593,7 @@ msgstr "" "ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. " "Contactez l'administrateur." -#: ishtar_common/models.py:5525 +#: ishtar_common/models.py:5534 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " @@ -12567,11 +12604,11 @@ msgstr "" "problème de sécurité et cela n'est pas permis. Seul un chemin complet est " "permis." -#: ishtar_common/models.py:5538 +#: ishtar_common/models.py:5547 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "ISHTAR_SCRIPT_DIR : « {} » n'est pas un répertoire valable." -#: ishtar_common/models.py:5556 +#: ishtar_common/models.py:5565 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -12579,30 +12616,30 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:5598 ishtar_common/models_imports.py:1282 +#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 #: ishtar_common/models_imports.py:1299 #: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "Créé" -#: ishtar_common/models.py:5603 +#: ishtar_common/models.py:5612 msgid "Filter on" msgstr "Filtrer sur" -#: ishtar_common/models.py:5606 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5615 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "Requête filtrante" -#: ishtar_common/models.py:5609 +#: ishtar_common/models.py:5618 msgid "Textual query on this item (try it on the main interface)" msgstr "" "Requête textuelle sur cet élément (testez-la sur l'interface principale)" -#: ishtar_common/models.py:5612 +#: ishtar_common/models.py:5621 msgid "Export geographic data" msgstr "Exporter les données géographiques" -#: ishtar_common/models.py:5615 +#: ishtar_common/models.py:5624 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" @@ -12610,15 +12647,15 @@ msgstr "" "Les données géographiques peuvent représenter un volume important " "d'information. Celles-ci peuvent être exclues de l'export." -#: ishtar_common/models.py:5623 +#: ishtar_common/models.py:5632 msgid "Put locks on associated items" msgstr "Mettre un verrou sur les éléments associés" -#: ishtar_common/models.py:5628 +#: ishtar_common/models.py:5637 msgid "Lock user" msgstr "Utilisateur pour le verrou" -#: ishtar_common/models.py:5632 +#: ishtar_common/models.py:5641 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." @@ -12627,68 +12664,68 @@ msgstr "" "aucun utilisateur n'est désigné les verrous pourront être supprimés par " "n'importe quel utilisateur avec les permissions d'édition." -#: ishtar_common/models.py:5637 +#: ishtar_common/models.py:5646 msgid "Export types" msgstr "Exporter les types" -#: ishtar_common/models.py:5638 +#: ishtar_common/models.py:5647 msgid "Export configuration" msgstr "Exporter la configuration" -#: ishtar_common/models.py:5639 +#: ishtar_common/models.py:5648 msgid "Export importers" msgstr "Exporter les importeurs" -#: ishtar_common/models.py:5640 +#: ishtar_common/models.py:5649 msgid "Export towns, areas..." msgstr "Exporter les villes, les zones, ..." -#: ishtar_common/models.py:5641 +#: ishtar_common/models.py:5650 msgid "Export directory" msgstr "Exporter l'annuaire" -#: ishtar_common/models.py:5642 +#: ishtar_common/models.py:5651 msgid "Export documents" msgstr "Exporter les documents" -#: ishtar_common/models.py:5643 +#: ishtar_common/models.py:5652 msgid "Export main items" msgstr "Exporter les éléments principaux" -#: ishtar_common/models.py:5650 +#: ishtar_common/models.py:5659 msgid "Result information" msgstr "Informations" -#: ishtar_common/models.py:5653 +#: ishtar_common/models.py:5662 msgid "Archive - Export" msgstr "Archive - Export" -#: ishtar_common/models.py:5654 +#: ishtar_common/models.py:5663 msgid "Archive - Exports" msgstr "Archive - Exports" -#: ishtar_common/models.py:5656 ishtar_common/models.py:5716 +#: ishtar_common/models.py:5665 ishtar_common/models.py:5725 #: ishtar_common/templates/ishtar/import_table.html:91 #: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "Archive" -#: ishtar_common/models.py:5666 +#: ishtar_common/models.py:5675 msgid "Whole database" msgstr "Base de données complète" -#: ishtar_common/models.py:5678 +#: ishtar_common/models.py:5687 msgid "To filter filter type and filter text must be filled." msgstr "" "Pour filtrer, à la fois le type de filtre et la requête filtrante doivent " "être remplis." -#: ishtar_common/models.py:5690 +#: ishtar_common/models.py:5699 msgid "Import user" msgstr "Utilisateur pour l'import" -#: ishtar_common/models.py:5694 +#: ishtar_common/models.py:5703 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." @@ -12697,23 +12734,23 @@ msgstr "" "version des éléments. Si ce champ est laissé vide aucun historique ne sera " "renseigné." -#: ishtar_common/models.py:5703 +#: ishtar_common/models.py:5712 msgid "Delete before adding" msgstr "Supprimer avant ajout" -#: ishtar_common/models.py:5705 +#: ishtar_common/models.py:5714 msgid "Delete existing items before adding" msgstr "Supprime les éléments existants avant d'ajouter de nouveaux éléments" -#: ishtar_common/models.py:5708 +#: ishtar_common/models.py:5717 msgid "Releasing locks on associated items" msgstr "Relâcher les verrous sur les éléments associés" -#: ishtar_common/models.py:5713 +#: ishtar_common/models.py:5722 msgid "Archive - Import" msgstr "Archive - Import" -#: ishtar_common/models.py:5714 +#: ishtar_common/models.py:5723 msgid "Archive - Imports" msgstr "Archive - Imports" @@ -12725,383 +12762,383 @@ msgstr "Vecteur de recherche" msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1130 +#: ishtar_common/models_common.py:1141 msgid "Created by imports" msgstr "Créé par les imports" -#: ishtar_common/models_common.py:1132 +#: ishtar_common/models_common.py:1143 msgid "Timestamp geo" msgstr "Horodatage géographique" -#: ishtar_common/models_common.py:1133 +#: ishtar_common/models_common.py:1144 msgid "Timestamp label" msgstr "Horodatage libellé" -#: ishtar_common/models_common.py:1136 +#: ishtar_common/models_common.py:1147 msgid "Updated by imports" msgstr "Mis à jour par les imports" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1152 msgctxt "key for text search" msgid "imports" msgstr "imports" -#: ishtar_common/models_common.py:1528 +#: ishtar_common/models_common.py:1539 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1536 +#: ishtar_common/models_common.py:1547 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1543 ishtar_common/models_common.py:2242 +#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1545 +#: ishtar_common/models_common.py:1556 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1551 +#: ishtar_common/models_common.py:1562 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1571 +#: ishtar_common/models_common.py:1582 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1575 +#: ishtar_common/models_common.py:1586 msgctxt "key for text search" msgid "created-before" msgstr "creee-avant" -#: ishtar_common/models_common.py:1579 +#: ishtar_common/models_common.py:1590 msgctxt "key for text search" msgid "created-after" msgstr "creee-apres" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1593 msgctxt "key for text search" msgid "modified-before" msgstr "modifie-avant" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1597 msgctxt "key for text search" msgid "modified-after" msgstr "modifie-apres" -#: ishtar_common/models_common.py:1589 +#: ishtar_common/models_common.py:1600 msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:1839 +#: ishtar_common/models_common.py:1850 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:1843 +#: ishtar_common/models_common.py:1854 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:1847 +#: ishtar_common/models_common.py:1858 msgctxt "key for text search" msgid "document-type" msgstr "type-document" -#: ishtar_common/models_common.py:1931 +#: ishtar_common/models_common.py:1942 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:1933 +#: ishtar_common/models_common.py:1944 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:2096 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2097 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2098 +#: ishtar_common/models_common.py:2109 msgid "Number of decimal places" msgstr "Nombre de décimales" -#: ishtar_common/models_common.py:2099 +#: ishtar_common/models_common.py:2110 msgid "Number of decimal places for Z" msgstr "Nombre de décimales pour Z" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2113 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2103 +#: ishtar_common/models_common.py:2114 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2134 +#: ishtar_common/models_common.py:2145 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2146 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2151 +#: ishtar_common/models_common.py:2162 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2163 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2179 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2180 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2181 +#: ishtar_common/models_common.py:2192 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:2193 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2219 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2209 +#: ishtar_common/models_common.py:2220 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2210 +#: ishtar_common/models_common.py:2221 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2250 +#: ishtar_common/models_common.py:2261 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2257 +#: ishtar_common/models_common.py:2268 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2265 +#: ishtar_common/models_common.py:2276 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2284 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:4188 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 msgid "X" msgstr "X/Long" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2278 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 +#: ishtar_common/models_common.py:2289 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2277 ishtar_common/models_common.py:4189 +#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 msgid "Y" msgstr "Y/Lat" -#: ishtar_common/models_common.py:2278 ishtar_common/models_common.py:4190 +#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 msgid "Z" msgstr "Z" -#: ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2292 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2282 +#: ishtar_common/models_common.py:2293 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2283 +#: ishtar_common/models_common.py:2294 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2295 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: ishtar_common/models_common.py:2300 ishtar_common/models_common.py:4208 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 msgid "Point (2D)" msgstr "Point (2D)" -#: ishtar_common/models_common.py:2301 +#: ishtar_common/models_common.py:2312 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:2313 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2314 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2315 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2307 ishtar_common/models_common.py:2308 +#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2437 +#: ishtar_common/models_common.py:2448 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:2901 +#: ishtar_common/models_common.py:2912 msgid "Main geodata" msgstr "Élément géographique principal" -#: ishtar_common/models_common.py:2905 +#: ishtar_common/models_common.py:2916 msgid "Geodata" msgstr "Élément géographique" -#: ishtar_common/models_common.py:2909 +#: ishtar_common/models_common.py:2920 msgctxt "key for text search" msgid "geo-name" msgstr "geo-nom" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2923 msgctxt "key for text search" msgid "geo-type" msgstr "geo-type" -#: ishtar_common/models_common.py:2915 +#: ishtar_common/models_common.py:2926 msgctxt "key for text search" msgid "geo-origin" msgstr "geo-origine" -#: ishtar_common/models_common.py:2918 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-provider" msgstr "geo-fournisseur" -#: ishtar_common/models_common.py:2921 +#: ishtar_common/models_common.py:2932 msgctxt "key for text search" msgid "z-higher" msgstr "z-plus-grand" -#: ishtar_common/models_common.py:2925 +#: ishtar_common/models_common.py:2936 msgctxt "key for text search" msgid "z-lower" msgstr "z-plus-petit" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2940 msgctxt "key for text search" msgid "geo-comment" msgstr "geo-commentaire" -#: ishtar_common/models_common.py:2955 +#: ishtar_common/models_common.py:2966 msgid "Add geographic item" msgstr "Ajouter élément géographique" -#: ishtar_common/models_common.py:2957 +#: ishtar_common/models_common.py:2968 msgid "geo." msgstr "géo." -#: ishtar_common/models_common.py:3352 +#: ishtar_common/models_common.py:3363 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:3354 +#: ishtar_common/models_common.py:3365 msgid "regen." msgstr "regén." -#: ishtar_common/models_common.py:3374 +#: ishtar_common/models_common.py:3385 msgid "Localisation" msgstr "Localisation" -#: ishtar_common/models_common.py:3376 +#: ishtar_common/models_common.py:3387 msgid "Limit" msgstr "Limite" -#: ishtar_common/models_common.py:3386 +#: ishtar_common/models_common.py:3397 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:3390 +#: ishtar_common/models_common.py:3401 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" "Remplir ce champ est nécessaire pour distinguer les anciennes communes des " "nouvelles communes." -#: ishtar_common/models_common.py:3394 +#: ishtar_common/models_common.py:3405 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:3660 +#: ishtar_common/models_common.py:3671 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:3692 +#: ishtar_common/models_common.py:3703 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:3709 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3742 msgid "Town with code: {} does not exists" msgstr "La commune avec le code : {} n'existe pas" -#: ishtar_common/models_common.py:3768 +#: ishtar_common/models_common.py:3779 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3849 +#: ishtar_common/models_common.py:3860 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3859 +#: ishtar_common/models_common.py:3870 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:3877 +#: ishtar_common/models_common.py:3888 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4221 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:4224 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:4217 +#: ishtar_common/models_common.py:4228 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4235 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" @@ -13647,7 +13684,7 @@ msgstr "Désarchiver" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2908 ishtar_common/widgets.py:453 +#: ishtar_common/views.py:2910 ishtar_common/widgets.py:453 #: ishtar_common/widgets.py:489 msgid "Delete" msgstr "Supprimer" @@ -14015,15 +14052,15 @@ msgstr "Voir sur le site" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1945 -#: ishtar_common/views.py:1949 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1947 +#: ishtar_common/views.py:1951 msgid "Previous" msgstr "Précédent" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1952 -#: ishtar_common/views.py:1954 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1954 +#: ishtar_common/views.py:1956 msgid "Next" msgstr "Suivant" @@ -14535,7 +14572,7 @@ msgid "Link" msgstr "Lien" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1298 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1300 msgid "Changelog" msgstr "Journal des modifications" @@ -14772,7 +14809,7 @@ msgid "Go" msgstr "Aller" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1788 +#: ishtar_common/views.py:1790 msgid "Import step by step" msgstr "Import pas à pas" @@ -14787,7 +14824,7 @@ msgstr "Colonne" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 #: ishtar_common/templates/ishtar/import_table.html:5 #: ishtar_common/templates/ishtar/sheet_import_gen.html:5 -#: ishtar_common/views.py:2319 +#: ishtar_common/views.py:2321 msgid "Error" msgstr "Erreur" @@ -14879,7 +14916,7 @@ msgstr "Média" #: ishtar_common/templates/ishtar/import_table.html:6 #: ishtar_common/templates/ishtar/sheet_import_gen.html:6 -#: ishtar_common/views.py:2321 +#: ishtar_common/views.py:2323 msgid "Match" msgstr "Correspondance" @@ -14977,19 +15014,19 @@ msgstr "" msgid "You have locked this item." msgstr "Vous avez verrouillé cet élément." -#: ishtar_common/templates/ishtar/sheet_document.html:63 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgid "Web link" msgstr "Lien Internet" -#: ishtar_common/templates/ishtar/sheet_document.html:111 +#: ishtar_common/templates/ishtar/sheet_document.html:109 msgid "Other" msgstr "Autre" -#: ishtar_common/templates/ishtar/sheet_document.html:124 +#: ishtar_common/templates/ishtar/sheet_document.html:122 msgid "Files" msgstr "Dossiers" -#: ishtar_common/templates/ishtar/sheet_document.html:131 +#: ishtar_common/templates/ishtar/sheet_document.html:129 msgid "Treatment files" msgstr "Demandes de traitement" @@ -15037,73 +15074,73 @@ msgstr "Service instructeur des dossiers" msgid "Publications" msgstr "Publications" -#: ishtar_common/templates/ishtar/sheet_person.html:30 +#: ishtar_common/templates/ishtar/sheet_person.html:29 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:39 msgid "Phone type" msgstr "Type de téléphone" -#: ishtar_common/templates/ishtar/sheet_person.html:53 +#: ishtar_common/templates/ishtar/sheet_person.html:52 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:65 msgid "Business address" msgstr "Adresse professionnelle" -#: ishtar_common/templates/ishtar/sheet_person.html:63 +#: ishtar_common/templates/ishtar/sheet_person.html:62 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:79 msgid "Other address" msgstr "Autre adresse" -#: ishtar_common/templates/ishtar/sheet_person.html:72 +#: ishtar_common/templates/ishtar/sheet_person.html:71 msgid "Associated organization" msgstr "Organisation associée" -#: ishtar_common/templates/ishtar/sheet_person.html:84 +#: ishtar_common/templates/ishtar/sheet_person.html:83 msgid "Associated operations as scientist" msgstr "Opérations associées en tant que responsable d'opération" -#: ishtar_common/templates/ishtar/sheet_person.html:89 +#: ishtar_common/templates/ishtar/sheet_person.html:88 msgid "Associated operations as responsible" msgstr "Opérations associées en tant que responsable du suivi scientifique" -#: ishtar_common/templates/ishtar/sheet_person.html:94 +#: ishtar_common/templates/ishtar/sheet_person.html:93 msgid "Associated operations as collaborator" msgstr "Opérations associées en tant que collaborateur" -#: ishtar_common/templates/ishtar/sheet_person.html:99 +#: ishtar_common/templates/ishtar/sheet_person.html:98 msgid "Operations associees en tant que rapporteur CIRA" msgstr "Opérations associées en tant que rapporteur CIRA" -#: ishtar_common/templates/ishtar/sheet_person.html:104 +#: ishtar_common/templates/ishtar/sheet_person.html:103 msgid "Associated archaeological sites as collaborator" msgstr "Entités archéologiques associées en tant que collaborateur" -#: ishtar_common/templates/ishtar/sheet_person.html:109 +#: ishtar_common/templates/ishtar/sheet_person.html:108 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "Responsable des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:114 +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "Aménageur des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:119 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "Responsable pour le service instructeur des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:141 +#: ishtar_common/templates/ishtar/sheet_person.html:140 msgid "In charge of treatments" msgstr "Responsable des traitements" -#: ishtar_common/templates/ishtar/sheet_person.html:146 +#: ishtar_common/templates/ishtar/sheet_person.html:145 msgid "In charge of treatment files" msgstr "Responsable des dossiers de traitement" -#: ishtar_common/templates/ishtar/sheet_person.html:151 +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "Applicant of treatment files" msgstr "Demandeur des dossiers de traitement" -#: ishtar_common/templates/ishtar/sheet_person.html:156 +#: ishtar_common/templates/ishtar/sheet_person.html:155 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "Responsable des lieux de conservation" @@ -15657,140 +15694,140 @@ msgstr "Gérer les comptes" msgid "Account deletion" msgstr "Supprimer un compte" -#: ishtar_common/views.py:1141 +#: ishtar_common/views.py:1143 msgid "New biographical note" msgstr "Nouvelle notice biographique" -#: ishtar_common/views.py:1164 ishtar_common/views_item.py:180 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:180 #: ishtar_common/views_item.py:223 ishtar_common/views_item.py:240 msgid "Operation not permitted." msgstr "Opération non permise." -#: ishtar_common/views.py:1549 +#: ishtar_common/views.py:1551 msgid "Import: create (table)" msgstr "Import : créer (table)" -#: ishtar_common/views.py:1574 +#: ishtar_common/views.py:1576 msgid "Import: edit (table)" msgstr "Import : modification (table)" -#: ishtar_common/views.py:1581 +#: ishtar_common/views.py:1583 msgid "Import: create (GIS)" msgstr "Import : création (SIG)" -#: ishtar_common/views.py:1588 +#: ishtar_common/views.py:1590 msgid "Import: create (group)" msgstr "Import : création (groupe)" -#: ishtar_common/views.py:1594 +#: ishtar_common/views.py:1596 msgid "Import: pre-form" msgstr "Import : pré-formulaire" -#: ishtar_common/views.py:2137 +#: ishtar_common/views.py:2139 msgid "Col. " msgstr "Col. " -#: ishtar_common/views.py:2144 ishtar_common/views.py:2159 +#: ishtar_common/views.py:2146 ishtar_common/views.py:2161 msgid "* empty *" msgstr "* vide *" -#: ishtar_common/views.py:2248 +#: ishtar_common/views.py:2250 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: ishtar_common/views.py:2286 ishtar_common/views.py:2297 +#: ishtar_common/views.py:2288 ishtar_common/views.py:2299 msgid "Delete import" msgstr "Supprimer un import" -#: ishtar_common/views.py:2459 +#: ishtar_common/views.py:2461 msgid "Merge persons" msgstr "Fusionner des personnes" -#: ishtar_common/views.py:2488 +#: ishtar_common/views.py:2490 msgid "Select the main person" msgstr "Choisir la personne principale" -#: ishtar_common/views.py:2496 +#: ishtar_common/views.py:2498 msgid "Merge organization" msgstr "Fusionner des organisations" -#: ishtar_common/views.py:2506 +#: ishtar_common/views.py:2508 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: ishtar_common/views.py:2546 ishtar_common/views.py:2567 +#: ishtar_common/views.py:2548 ishtar_common/views.py:2569 msgid "Corporation manager" msgstr "Représentant de la personne morale" -#: ishtar_common/views.py:2587 +#: ishtar_common/views.py:2589 msgid "New tag" msgstr "Nouvelle étiquette" -#: ishtar_common/views.py:2600 +#: ishtar_common/views.py:2602 msgid "Document: search" msgstr "Document : recherche" -#: ishtar_common/views.py:2620 +#: ishtar_common/views.py:2622 msgid "Document creation" msgstr "Document : création" -#: ishtar_common/views.py:2688 +#: ishtar_common/views.py:2690 msgid "Document modification" msgstr "Document : modification" -#: ishtar_common/views.py:2716 +#: ishtar_common/views.py:2718 msgid "Main image for" msgstr "Image principale pour" -#: ishtar_common/views.py:2741 +#: ishtar_common/views.py:2743 msgid "Document deletion" msgstr "Document : suppression" -#: ishtar_common/views.py:2778 +#: ishtar_common/views.py:2780 msgid "Error on your template" msgstr "Erreur sur votre patron" -#: ishtar_common/views.py:2884 +#: ishtar_common/views.py:2886 msgid "Delete bookmark" msgstr "Supprimer le marque-page" -#: ishtar_common/views.py:2907 +#: ishtar_common/views.py:2909 msgid "Bookmark - Delete" msgstr "Marque-page - Suppression" -#: ishtar_common/views.py:2950 +#: ishtar_common/views.py:2952 msgid "Some items have been locked by other users." msgstr "Des éléments ont été verrouillés par d'autres utilisateurs." -#: ishtar_common/views.py:2951 +#: ishtar_common/views.py:2953 msgid "Some items are locked." msgstr "Des éléments sont verrouillés." -#: ishtar_common/views.py:2956 +#: ishtar_common/views.py:2958 msgid "Not available" msgstr "Non disponible" -#: ishtar_common/views.py:2957 +#: ishtar_common/views.py:2959 msgid "Action not available for these items." msgstr "Action non disponible pour ces éléments." -#: ishtar_common/views.py:3076 +#: ishtar_common/views.py:3078 msgid "lock/unlock" msgstr "verrouiller/déverrouiller" -#: ishtar_common/views.py:3214 ishtar_common/views.py:3309 +#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 msgid "Geo item creation" msgstr "Élément géographique création" -#: ishtar_common/views.py:3346 ishtar_common/views.py:3400 +#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 msgid "Main geo item for" msgstr "Élément géo. principal pour" -#: ishtar_common/views.py:3360 +#: ishtar_common/views.py:3362 msgid "Geo item modification" msgstr "Élément géographique modification" -#: ishtar_common/views.py:3413 +#: ishtar_common/views.py:3415 msgid "Delete geographic item" msgstr "Supprimer des données géographiques" @@ -15875,6 +15912,15 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Scientific manager" +#~ msgstr "Responsable de suivi scientifique" + +#~ msgid "Operation monitor" +#~ msgstr "Responsable de suivi scientifique" + +#~ msgid "File reference" +#~ msgstr "Référence du dossier" + #~ msgid "List of associated containers" #~ msgstr "Liste des contenants associés" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 2ca13cf40..377f7d331 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-07 15:30+0200\n" +"POT-Creation-Date: 2024-06-17 12:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,7 +29,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1256 #: archaeological_operations/ishtar_menu.py:35 #: archaeological_operations/models.py:1589 #: archaeological_operations/models.py:2534 @@ -41,7 +41,7 @@ msgstr "" #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 #: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 -#: ishtar_common/models.py:5590 ishtar_common/views.py:500 +#: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" @@ -88,15 +88,15 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 -#: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1230 -#: archaeological_operations/forms.py:1443 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1447 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 @@ -104,16 +104,16 @@ msgid "Full text search" msgstr "" #: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:304 -#: archaeological_context_records/forms.py:567 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/forms.py:571 +#: archaeological_context_records/forms.py:625 #: archaeological_context_records/models.py:752 #: archaeological_context_records/models.py:1390 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1762 +#: archaeological_operations/forms.py:1766 msgid "Code PATRIARCHE" msgstr "" @@ -131,10 +131,10 @@ msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:732 #: archaeological_context_records/models.py:746 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5591 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" @@ -144,12 +144,12 @@ msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:719 +#: archaeological_context_records/forms.py:723 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:532 #: archaeological_context_records/models.py:830 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 @@ -157,7 +157,7 @@ msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/forms.py:523 #: archaeological_context_records/models.py:531 #: archaeological_context_records/models.py:823 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 @@ -180,25 +180,25 @@ msgstr "" #: archaeological_context_records/models.py:786 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2096 -#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1244 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:295 -#: archaeological_context_records/forms.py:569 -#: archaeological_context_records/forms.py:622 +#: archaeological_context_records/forms.py:297 +#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:518 #: archaeological_context_records/models.py:519 #: archaeological_context_records/models.py:724 #: archaeological_context_records/models.py:1392 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1080 -#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1084 +#: archaeological_operations/forms.py:1461 #: archaeological_operations/models.py:3180 #: archaeological_operations/models.py:3474 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 @@ -216,26 +216,26 @@ msgid "Search within relations" msgstr "" #: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:317 #: archaeological_context_records/models.py:533 #: archaeological_context_records/models.py:835 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:209 -#: archaeological_context_records/forms.py:230 +#: archaeological_context_records/forms.py:211 +#: archaeological_context_records/forms.py:232 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:279 +#: archaeological_context_records/forms.py:281 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:689 #: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1516 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -250,38 +250,38 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:280 +#: archaeological_context_records/forms.py:282 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:296 -#: archaeological_context_records/forms.py:559 -#: archaeological_context_records/forms.py:623 -#: archaeological_context_records/forms.py:721 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:627 +#: archaeological_context_records/forms.py:725 #: archaeological_context_records/models.py:515 #: archaeological_context_records/models.py:516 #: archaeological_context_records/models.py:732 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1056 #: archaeological_operations/models.py:3161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:301 -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:303 +#: archaeological_context_records/forms.py:568 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:570 -#: archaeological_context_records/forms.py:625 +#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:574 +#: archaeological_context_records/forms.py:629 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:528 #: archaeological_context_records/models.py:777 @@ -289,7 +289,7 @@ msgstr "" msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:308 +#: archaeological_context_records/forms.py:310 #: archaeological_context_records/models.py:753 #: archaeological_context_records/models.py:1393 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 @@ -305,7 +305,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2447 -#: ishtar_common/models.py:1089 ishtar_common/models.py:4690 +#: ishtar_common/models.py:1089 ishtar_common/models.py:4689 #: ishtar_common/models_imports.py:160 ishtar_common/models_imports.py:439 #: ishtar_common/models_imports.py:707 ishtar_common/models_imports.py:807 #: ishtar_common/models_imports.py:826 @@ -316,12 +316,12 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:310 +#: archaeological_context_records/forms.py:312 #: archaeological_context_records/models.py:783 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:312 +#: archaeological_context_records/forms.py:314 #: archaeological_context_records/models.py:754 #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 #: archaeological_finds/models_finds.py:2175 @@ -331,51 +331,51 @@ msgstr "" msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:646 archaeological_operations/forms.py:744 +#: archaeological_context_records/forms.py:325 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:818 +#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:757 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:330 +#: archaeological_context_records/forms.py:332 #: archaeological_context_records/models.py:758 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/forms.py:333 #: archaeological_context_records/models.py:759 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/forms.py:334 #: archaeological_context_records/models.py:760 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:333 +#: archaeological_context_records/forms.py:335 #: archaeological_context_records/models.py:761 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/forms.py:337 #: archaeological_context_records/models.py:763 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:338 +#: archaeological_context_records/forms.py:340 #: archaeological_context_records/models.py:755 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:341 +#: archaeological_context_records/forms.py:343 #: archaeological_context_records/models.py:756 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:609 +#: archaeological_files/models.py:624 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 @@ -390,12 +390,12 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/forms.py:346 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/forms.py:352 #: archaeological_context_records/models.py:767 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:226 @@ -406,16 +406,16 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:434 +#: archaeological_context_records/forms.py:438 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:439 +#: archaeological_context_records/forms.py:443 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:444 -#: archaeological_context_records/forms.py:466 +#: archaeological_context_records/forms.py:448 +#: archaeological_context_records/forms.py:470 #: archaeological_context_records/models.py:165 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 #: archaeological_finds/models_finds.py:2093 @@ -429,7 +429,7 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:451 +#: archaeological_context_records/forms.py:455 #: archaeological_context_records/models.py:109 #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 @@ -451,11 +451,11 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:452 +#: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:786 archaeological_files/models.py:76 -#: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:190 +#: archaeological_files/forms.py:782 archaeological_files/models.py:76 +#: archaeological_files/models.py:730 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 @@ -497,10 +497,10 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:457 #: archaeological_context_records/models.py:112 -#: archaeological_files/forms.py:791 archaeological_files/models.py:77 -#: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 +#: archaeological_files/forms.py:787 archaeological_files/models.py:77 +#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:396 @@ -544,7 +544,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:454 +#: archaeological_context_records/forms.py:458 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -557,7 +557,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -571,7 +571,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:460 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -579,11 +579,11 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:467 +#: archaeological_context_records/forms.py:471 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:479 +#: archaeological_context_records/forms.py:483 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:276 #: archaeological_context_records/models.py:1521 @@ -595,11 +595,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1724 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 -#: ishtar_common/models.py:5592 ishtar_common/views.py:504 +#: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:497 +#: archaeological_context_records/forms.py:501 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -611,86 +611,86 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:502 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:504 -#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/forms.py:508 +#: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/forms.py:509 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/forms.py:525 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:522 +#: archaeological_context_records/forms.py:526 #: archaeological_context_records/models.py:789 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:527 #: archaeological_context_records/models.py:798 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/forms.py:528 #: archaeological_context_records/models.py:804 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:529 #: archaeological_context_records/models.py:813 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_operations/forms.py:1146 -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1866 +#: archaeological_context_records/forms.py:531 +#: archaeological_operations/forms.py:1150 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1870 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:535 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:548 #: archaeological_operations/forms.py:624 #: archaeological_operations/forms.py:637 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:549 +#: archaeological_context_records/forms.py:553 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:559 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:657 +#: archaeological_context_records/forms.py:661 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1832 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:687 +#: archaeological_context_records/forms.py:691 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:707 +#: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:1282 #: archaeological_context_records/models.py:1321 #: archaeological_context_records/models.py:1389 @@ -698,21 +698,21 @@ msgstr "" msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/forms.py:715 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:736 +#: archaeological_context_records/forms.py:740 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:761 +#: archaeological_context_records/forms.py:765 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:780 +#: archaeological_context_records/forms.py:784 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -862,7 +862,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5593 +#: ishtar_common/forms_common.py:2551 ishtar_common/models.py:5602 #: ishtar_common/views.py:508 man_app/templates/ishtar/sheet_museum_find.html:4 #: na_app/templates/ishtar/sheet_find.html:4 #: pdl_app/templates/ishtar/sheet_find.html:4 @@ -892,10 +892,10 @@ msgstr "" #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 -#: ishtar_common/models.py:5365 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2095 ishtar_common/models_common.py:2131 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2165 -#: ishtar_common/models_common.py:2178 ishtar_common/models_imports.py:474 +#: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 +#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 +#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" @@ -950,9 +950,9 @@ msgstr "" #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1237 -#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1144 +#: archaeological_operations/forms.py:1241 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:495 @@ -1010,7 +1010,7 @@ msgstr "" #: archaeological_context_records/models.py:577 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:475 archaeological_finds/models_finds.py:1307 +#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1307 #: archaeological_operations/models.py:378 #: archaeological_operations/models.py:1143 #: archaeological_operations/tests.py:3107 @@ -1101,7 +1101,7 @@ msgid "identification" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:478 archaeological_operations/models.py:1149 +#: archaeological_files/models.py:493 archaeological_operations/models.py:1149 #: archaeological_operations/models.py:2716 msgctxt "key for text search" msgid "parcel" @@ -1167,24 +1167,23 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1691 #: ishtar_common/admin.py:1834 ishtar_common/models.py:4556 -#: ishtar_common/models.py:4929 ishtar_common/views.py:3133 -#: ishtar_common/views.py:3151 +#: ishtar_common/models.py:4935 ishtar_common/views.py:3135 +#: ishtar_common/views.py:3153 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:718 -#: archaeological_files/models.py:547 archaeological_finds/models_finds.py:551 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:2023 #: archaeological_finds/models_treatments.py:259 -#: archaeological_finds/models_treatments.py:1112 #: archaeological_operations/models.py:3169 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4583 +#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:720 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:553 +#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 #: archaeological_finds/models_finds.py:2025 #: archaeological_operations/models.py:3172 #: archaeological_warehouse/models.py:441 @@ -1193,7 +1192,7 @@ msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:765 -#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3372 +#: archaeological_operations/models.py:1403 ishtar_common/models_common.py:3383 msgid "Surface (m2)" msgstr "" @@ -1227,7 +1226,7 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:736 archaeological_finds/models_finds.py:2300 +#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2300 #: archaeological_finds/models_treatments.py:279 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/templates/ishtar/sheet_find.html:65 @@ -1237,21 +1236,21 @@ msgstr "" #: archaeological_operations/models.py:1477 #: archaeological_operations/models.py:2916 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:96 +#: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1193 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 #: cd17_app/templates/ishtar/sheet_find.html:65 ishtar_common/models.py:1035 #: ishtar_common/models.py:2421 ishtar_common/models.py:4058 #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 -#: ishtar_common/models.py:4145 ishtar_common/models.py:4716 -#: ishtar_common/models.py:4727 ishtar_common/models_common.py:3400 +#: ishtar_common/models.py:4145 ishtar_common/models.py:4722 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:162 +#: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1265,7 +1264,7 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:742 archaeological_finds/models_finds.py:2306 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2306 #: archaeological_finds/models_treatments.py:285 #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:540 @@ -1273,7 +1272,7 @@ msgstr "" #: archaeological_operations/models.py:2923 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3406 +#: ishtar_common/models_common.py:3417 msgid "Main image" msgstr "" @@ -1296,7 +1295,7 @@ msgstr "" #: archaeological_operations/models.py:1571 #: archaeological_operations/models.py:1577 #: archaeological_operations/models.py:1583 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4362 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 msgid "Generated automatically - do not edit" msgstr "" @@ -1468,11 +1467,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:92 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:189 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 -#: ishtar_common/templates/ishtar/sheet_document.html:129 +#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:242 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1490,7 +1489,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:104 +#: archaeological_operations/templates/ishtar/sheet_site.html:103 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1533,7 +1532,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4365 +#: ishtar_common/models_common.py:4376 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1546,7 +1545,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:263 +#: archaeological_files/templates/ishtar/sheet_file.html:270 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1560,8 +1559,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:67 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:168 +#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1571,15 +1570,24 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 +#: archaeological_files/templates/ishtar/sheet_file.html:240 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:102 +#: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 +#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 +#: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 +#: ishtar_common/templates/ishtar/sheet_person.html:166 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1619,9 +1627,9 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:393 #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 -#: ishtar_common/models.py:5484 ishtar_common/models.py:5621 -#: ishtar_common/models.py:5700 ishtar_common/models_common.py:2024 -#: ishtar_common/models_common.py:2039 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5493 ishtar_common/models.py:5630 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1747,9 +1755,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 -#: archaeological_files/forms.py:237 archaeological_files/forms.py:667 -#: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 -#: archaeological_files/models.py:388 archaeological_files/models.py:539 +#: archaeological_files/forms.py:237 archaeological_files/forms.py:663 +#: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 +#: archaeological_files/models.py:403 archaeological_files/models.py:554 #: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 @@ -1764,8 +1772,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1106 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1447 -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1768 #: archaeological_operations/models.py:989 #: archaeological_operations/models.py:1387 #: archaeological_operations/models.py:2666 @@ -1778,38 +1786,38 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:673 archaeological_files/models.py:541 +#: archaeological_files/forms.py:669 archaeological_files/models.py:556 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1137 -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1352 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/forms.py:1526 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 +#: archaeological_operations/forms.py:1239 +#: archaeological_operations/forms.py:1356 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1530 #: archaeological_operations/models.py:493 #: archaeological_operations/models.py:2898 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 -#: archaeological_files/forms.py:1167 archaeological_files/models.py:1376 +#: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1460 -#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2047 -#: ishtar_common/models_common.py:3380 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/models.py:2538 ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:3391 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:99 archaeological_files/forms.py:1177 +#: archaeological_files/forms.py:99 archaeological_files/forms.py:1173 msgid "File name" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 -#: archaeological_files/models.py:389 archaeological_files/models.py:394 -#: archaeological_files/models.py:553 +#: archaeological_files/models.py:404 archaeological_files/models.py:409 +#: archaeological_files/models.py:568 msgid "File type" msgstr "" @@ -1823,32 +1831,32 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 -#: archaeological_files/forms.py:529 archaeological_files/models.py:306 -#: archaeological_files/models.py:393 archaeological_files/models.py:602 +#: archaeological_files/forms.py:529 archaeological_files/models.py:321 +#: archaeological_files/models.py:408 archaeological_files/models.py:617 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:531 -#: archaeological_files/models.py:607 +#: archaeological_files/forms.py:104 archaeological_files/forms.py:467 +#: archaeological_files/forms.py:531 archaeological_files/models.py:622 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:616 -#: archaeological_files/forms.py:664 archaeological_files/models.py:655 -#: archaeological_finds/forms.py:799 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1425 archaeological_finds/forms.py:2585 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:660 +#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 +#: archaeological_finds/forms.py:2585 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_treatments.py:261 #: archaeological_finds/models_treatments.py:1158 #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1366 -#: archaeological_operations/forms.py:1463 -#: archaeological_operations/forms.py:1525 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/forms.py:1529 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1472 #: archaeological_operations/models.py:2912 @@ -1857,8 +1865,8 @@ msgstr "" #: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 -#: ishtar_common/models.py:4699 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2275 ishtar_common/models_imports.py:890 +#: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1867,32 +1875,32 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1179 archaeological_files/models.py:565 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:127 archaeological_files/forms.py:1189 +#: archaeological_files/forms.py:127 archaeological_files/forms.py:1185 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 +#: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1465 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:146 archaeological_files/forms.py:1228 +#: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1475 msgid "Modified by" msgstr "" @@ -1904,17 +1912,18 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:622 +#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/models.py:1348 ishtar_common/forms_common.py:2164 -#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4684 +#: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:639 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 #: archaeological_finds/templates/ishtar/sheet_find.html:509 @@ -1952,12 +1961,12 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:455 archaeological_files/models.py:619 +#: archaeological_files/models.py:470 archaeological_files/models.py:634 #: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1066 -#: archaeological_operations/forms.py:1071 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1054 +#: archaeological_operations/forms.py:1070 +#: archaeological_operations/forms.py:1075 +#: archaeological_operations/forms.py:1406 #: archaeological_operations/models.py:304 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1076 @@ -1967,17 +1976,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3414 +#: ishtar_common/models_common.py:3425 #: ishtar_common/templates/ishtar/sheet_area.html:71 -#: ishtar_common/templates/ishtar/sheet_document.html:134 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/forms.py:576 archaeological_files/models.py:658 -#: archaeological_operations/models.py:2901 ishtar_common/models_common.py:2048 +#: archaeological_files/models.py:673 archaeological_operations/models.py:2901 +#: ishtar_common/models_common.py:2059 msgid "Departments" msgstr "" @@ -1986,7 +1995,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:650 +#: archaeological_files/models.py:665 msgid "Locality" msgstr "" @@ -2000,16 +2009,16 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/forms.py:747 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:743 msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:812 archaeological_files/models.py:648 +#: archaeological_files/forms.py:808 archaeological_files/models.py:663 msgid "Total developed surface (m2)" msgstr "" @@ -2017,7 +2026,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 #: ishtar_common/forms_common.py:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 +#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2051,11 +2060,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:467 -msgid "File reference" -msgstr "" - -#: archaeological_files/forms.py:470 archaeological_files/models.py:626 +#: archaeological_files/forms.py:470 archaeological_files/models.py:641 msgid "Date of planning service file" msgstr "" @@ -2068,7 +2073,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:586 +#: archaeological_files/forms.py:515 archaeological_files/models.py:601 msgid "Responsible for planning service" msgstr "" @@ -2081,162 +2086,166 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:596 archaeological_files/models.py:682 +#: archaeological_files/forms.py:592 archaeological_files/models.py:697 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2852 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:599 archaeological_files/models.py:666 +#: archaeological_files/forms.py:595 archaeological_files/models.py:681 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:602 +#: archaeological_files/forms.py:598 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:625 archaeological_files/models.py:688 +#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/templates/ishtar/sheet_file.html:170 +msgid "Research archaeology comment" +msgstr "" + +#: archaeological_files/forms.py:621 archaeological_files/models.py:703 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:626 archaeological_files/models.py:690 +#: archaeological_files/forms.py:622 archaeological_files/models.py:705 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:639 +#: archaeological_files/forms.py:635 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:640 +#: archaeological_files/forms.py:636 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:644 +#: archaeological_files/forms.py:640 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:657 archaeological_files/models.py:630 +#: archaeological_files/forms.py:653 archaeological_files/models.py:645 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:665 archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:64 +#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:730 +#: archaeological_files/forms.py:726 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:735 +#: archaeological_files/forms.py:731 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:739 +#: archaeological_files/forms.py:735 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:740 +#: archaeological_files/forms.py:736 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:79 +#: archaeological_files/forms.py:742 ishtar_common/forms_common.py:2232 +#: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:748 +#: archaeological_files/forms.py:744 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:771 archaeological_files/models.py:707 +#: archaeological_files/forms.py:767 archaeological_files/models.py:722 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:776 archaeological_files/models.py:710 +#: archaeological_files/forms.py:772 archaeological_files/models.py:725 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:781 archaeological_files/models.py:713 +#: archaeological_files/forms.py:777 archaeological_files/models.py:728 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:796 archaeological_files/models.py:717 +#: archaeological_files/forms.py:792 archaeological_files/models.py:732 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:801 archaeological_files/models.py:718 +#: archaeological_files/forms.py:797 archaeological_files/models.py:733 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:806 archaeological_files/models.py:720 +#: archaeological_files/forms.py:802 archaeological_files/models.py:735 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:829 +#: archaeological_files/forms.py:825 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:335 -#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/forms.py:885 archaeological_files/forms.py:887 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/forms.py:886 archaeological_files/forms.py:888 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 msgid "Days" msgstr "" -#: archaeological_files/forms.py:893 archaeological_files/models.py:116 -#: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:277 -#: archaeological_files/templates/ishtar/sheet_file.html:329 +#: archaeological_files/forms.py:889 archaeological_files/models.py:116 +#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" msgstr "" -#: archaeological_files/forms.py:914 archaeological_files/models.py:80 +#: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:703 +#: archaeological_files/models.py:206 archaeological_files/models.py:718 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:968 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:973 +#: archaeological_files/forms.py:969 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:273 +#: archaeological_files/forms.py:993 +#: archaeological_files/templates/ishtar/sheet_file.html:280 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:999 +#: archaeological_files/forms.py:995 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/forms.py:1001 archaeological_files/forms.py:1003 +#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:397 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:381 +#: archaeological_files/forms.py:1005 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1123 archaeological_files/forms.py:1159 -#: archaeological_files/forms.py:1294 +#: archaeological_files/forms.py:1119 archaeological_files/forms.py:1155 +#: archaeological_files/forms.py:1290 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:566 @@ -2249,13 +2258,13 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1581 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1585 #: archaeological_operations/models.py:2837 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 #: archaeological_warehouse/models.py:1174 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 -#: ishtar_common/models.py:4582 +#: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 #: na_app/templates/ishtar/sheet_find.html:370 #: pdl_app/templates/ishtar/sheet_find.html:361 @@ -2263,83 +2272,83 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1125 archaeological_files/forms.py:1161 -#: archaeological_files/forms.py:1283 +#: archaeological_files/forms.py:1121 archaeological_files/forms.py:1157 +#: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1454 -#: archaeological_operations/forms.py:1515 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1519 #: archaeological_operations/models.py:2568 #: archaeological_operations/models.py:2827 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1126 +#: archaeological_files/forms.py:1122 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1162 +#: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1455 -#: archaeological_operations/forms.py:1651 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1655 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1169 +#: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1522 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1526 #: archaeological_operations/models.py:2896 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1172 +#: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/forms_treatments.py:850 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:1175 +#: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 #: archaeological_finds/forms_treatments.py:848 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:1200 +#: archaeological_files/forms.py:1196 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1202 +#: archaeological_files/forms.py:1198 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:1200 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1207 +#: archaeological_files/forms.py:1203 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1217 +#: archaeological_files/forms.py:1213 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1281 +#: archaeological_files/forms.py:1277 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:766 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:949 +#: archaeological_operations/forms.py:953 #: archaeological_operations/models.py:2032 #: archaeological_operations/models.py:2551 #: archaeological_operations/models.py:2667 @@ -2366,12 +2375,12 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 -#: archaeological_files/models.py:254 archaeological_files/models.py:334 -#: archaeological_files/models.py:354 archaeological_files/models.py:1422 -#: archaeological_files/models.py:1439 archaeological_files/models.py:1464 +#: archaeological_files/models.py:254 archaeological_files/models.py:349 +#: archaeological_files/models.py:369 archaeological_files/models.py:1439 +#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 -#: ishtar_common/models.py:5423 +#: ishtar_common/models.py:5432 #: sra_idf_app/templates/ishtar/sheet_operation.html:298 msgid "Preventive" msgstr "" @@ -2476,7 +2485,7 @@ msgstr "" msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:266 +#: archaeological_files/models.py:225 archaeological_files/models.py:281 msgid "Flat rate" msgstr "" @@ -2521,51 +2530,51 @@ msgstr "" msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:286 +#: archaeological_files/models.py:301 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:287 +#: archaeological_files/models.py:302 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:307 +#: archaeological_files/models.py:322 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:333 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:346 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:347 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:343 +#: archaeological_files/models.py:358 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:345 +#: archaeological_files/models.py:360 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:362 msgid "Category" msgstr "" -#: archaeological_files/models.py:351 +#: archaeological_files/models.py:366 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:352 +#: archaeological_files/models.py:367 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1199 +#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 #: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 @@ -2573,13 +2582,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:391 archaeological_finds/models_finds.py:1202 +#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:991 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:400 archaeological_finds/models_finds.py:1223 +#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2587,8 +2596,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2020 ishtar_common/models_common.py:2036 -#: ishtar_common/templates/ishtar/sheet_person.html:31 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -2604,15 +2613,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:401 +#: archaeological_files/models.py:416 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:417 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:466 archaeological_finds/models_finds.py:1311 +#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1311 #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1130 @@ -2623,7 +2632,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:483 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:362 #: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 @@ -2631,19 +2640,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:486 #: archaeological_finds/models_treatments.py:155 #: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:483 archaeological_operations/models.py:1154 +#: archaeological_files/models.py:498 archaeological_operations/models.py:1154 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:487 +#: archaeological_files/models.py:502 #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:365 #: archaeological_operations/models.py:1158 @@ -2654,7 +2663,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:490 +#: archaeological_files/models.py:505 #: archaeological_finds/models_treatments.py:161 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1164 @@ -2668,27 +2677,27 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:493 +#: archaeological_files/models.py:508 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:496 +#: archaeological_files/models.py:511 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:501 +#: archaeological_files/models.py:516 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:506 +#: archaeological_files/models.py:521 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:510 archaeological_finds/models_finds.py:1517 +#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1517 #: archaeological_operations/models.py:384 #: archaeological_operations/models.py:1209 #: archaeological_operations/models.py:2812 @@ -2697,41 +2706,41 @@ msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:513 archaeological_finds/models_finds.py:1676 +#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1676 #: archaeological_finds/models_treatments.py:1065 #: archaeological_finds/tests.py:1614 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2747 +#: archaeological_files/models.py:532 archaeological_operations/models.py:2747 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:522 archaeological_operations/models.py:2751 +#: archaeological_files/models.py:537 archaeological_operations/models.py:2751 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:544 +#: archaeological_files/models.py:559 #: archaeological_finds/models_treatments.py:1109 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:552 +#: archaeological_files/models.py:567 #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1136 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1824 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 @@ -2746,9 +2755,9 @@ msgstr "" #: ishtar_common/models.py:1083 ishtar_common/models.py:1688 #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 -#: ishtar_common/models.py:3639 ishtar_common/models.py:5459 -#: ishtar_common/models_common.py:2243 ishtar_common/models_common.py:3371 -#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 +#: ishtar_common/models.py:3639 ishtar_common/models.py:5468 +#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 +#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2775,7 +2784,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:557 +#: archaeological_files/models.py:572 #: archaeological_finds/models_treatments.py:1123 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 @@ -2788,35 +2797,35 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:586 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:576 +#: archaeological_files/models.py:591 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:590 +#: archaeological_files/models.py:605 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:597 +#: archaeological_files/models.py:612 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:627 msgid "Main town" msgstr "" -#: archaeological_files/models.py:651 +#: archaeological_files/models.py:666 msgid "Main address" msgstr "" -#: archaeological_files/models.py:653 +#: archaeological_files/models.py:668 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:672 +#: archaeological_files/models.py:687 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:252 @@ -2832,111 +2841,131 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:685 -msgid "Research archaeology comment" -msgstr "" - -#: archaeological_files/models.py:722 +#: archaeological_files/models.py:737 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:741 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:731 +#: archaeological_files/models.py:746 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:747 +#: archaeological_files/models.py:762 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:782 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:794 +#: archaeological_files/models.py:809 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1047 +#: archaeological_files/models.py:1062 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1053 +#: archaeological_files/models.py:1068 msgid "No town" msgstr "" -#: archaeological_files/models.py:1262 archaeological_operations/models.py:1979 +#: archaeological_files/models.py:1277 archaeological_operations/models.py:1979 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1264 archaeological_operations/models.py:1981 +#: archaeological_files/models.py:1279 archaeological_operations/models.py:1981 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1274 +#: archaeological_files/models.py:1289 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1276 +#: archaeological_files/models.py:1291 msgid "plan" msgstr "" -#: archaeological_files/models.py:1285 +#: archaeological_files/models.py:1300 #: archaeological_finds/models_treatments.py:409 #: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:2012 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1287 +#: archaeological_files/models.py:1302 #: archaeological_finds/models_treatments.py:411 #: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:2014 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1311 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1298 +#: archaeological_files/models.py:1313 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1373 archaeological_operations/models.py:1392 +#: archaeological_files/models.py:1388 archaeological_operations/models.py:1392 #: archaeological_operations/models.py:3146 msgid "File" msgstr "" -#: archaeological_files/models.py:1392 +#: archaeological_files/models.py:1407 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1394 archaeological_files/models.py:1456 +#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1396 +#: archaeological_files/models.py:1411 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1398 archaeological_files/models.py:1460 +#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1454 +#: archaeological_files/models.py:1437 +msgid "Human requirement on field" +msgstr "" + +#: archaeological_files/models.py:1438 +msgid "Human requirements on field" +msgstr "" + +#: archaeological_files/models.py:1456 +msgid "Human requirement for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1457 +msgid "Human requirements for post-excavation" +msgstr "" + +#: archaeological_files/models.py:1473 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1458 +#: archaeological_files/models.py:1477 msgid "Quantity by day - worked" msgstr "" +#: archaeological_files/models.py:1483 +msgid "Equipment requirement" +msgstr "" + +#: archaeological_files/models.py:1484 +msgid "Equipment requirements" +msgstr "" + #: archaeological_files/templates/admin/copy_price_change_list.html:9 msgid "Copy price agreement" msgstr "" @@ -2959,9 +2988,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:278 -#: archaeological_files/templates/ishtar/sheet_file.html:330 -#: archaeological_files/templates/ishtar/sheet_file.html:382 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Planned" msgstr "" @@ -3015,12 +3044,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:140 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 -#: ishtar_common/templates/ishtar/sheet_document.html:125 +#: ishtar_common/templates/ishtar/sheet_document.html:123 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3033,19 +3062,19 @@ msgstr "" msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:516 -#: archaeological_warehouse/models.py:737 ishtar_common/models.py:4584 +#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: ishtar_common/models.py:4583 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 @@ -3072,7 +3101,7 @@ msgstr "" #: ishtar_common/forms_common.py:2014 ishtar_common/forms_common.py:2444 #: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:3398 #: ishtar_common/models.py:767 ishtar_common/models.py:2656 -#: ishtar_common/models.py:4273 ishtar_common/models.py:4588 +#: ishtar_common/models.py:4273 ishtar_common/models.py:4587 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:1123 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 @@ -3105,7 +3134,7 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" @@ -3135,52 +3164,52 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:255 +#: archaeological_files/templates/ishtar/sheet_file.html:262 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:270 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:295 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 +#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:303 -#: archaeological_files/templates/ishtar/sheet_file.html:355 -#: archaeological_files/templates/ishtar/sheet_file.html:411 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:246 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 +#: archaeological_files/templates/ishtar/sheet_file.html:310 +#: archaeological_files/templates/ishtar/sheet_file.html:362 +#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:252 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:276 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:234 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:314 -#: archaeological_files/templates/ishtar/sheet_file.html:366 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:321 +#: archaeological_files/templates/ishtar/sheet_file.html:373 +#: archaeological_files/templates/ishtar/sheet_file.html:425 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:325 +#: archaeological_files/templates/ishtar/sheet_file.html:332 msgid "Post-excavation jobs" msgstr "" @@ -3955,9 +3984,9 @@ msgid "Operation - Remains" msgstr "" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 +#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 -#: ishtar_common/templates/ishtar/sheet_document.html:135 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4301,7 +4330,7 @@ msgstr "" #: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 #: archaeological_finds/models_treatments.py:399 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4347,7 +4376,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2019 ishtar_common/models_common.py:2035 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4547,7 +4576,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:105 +#: ishtar_common/templates/ishtar/sheet_document.html:103 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4628,7 +4657,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4585 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4859,7 +4888,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 -#: ishtar_common/templates/ishtar/sheet_document.html:130 +#: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" msgstr "" @@ -5035,7 +5064,8 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4710 +#: archaeological_finds/models_finds.py:2340 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5060,6 +5090,12 @@ msgstr "" msgid "kg" msgstr "" +#: archaeological_finds/models_finds.py:909 +#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 +msgid "Associated finds" +msgstr "" + #: archaeological_finds/models_finds.py:914 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 @@ -5069,7 +5105,7 @@ msgstr "" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3112 +#: ishtar_common/views.py:3114 msgid "Modify" msgstr "" @@ -5121,11 +5157,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1701 -#: archaeological_operations/forms.py:1769 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1773 #: archaeological_operations/models.py:988 #: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1400 ishtar_common/models.py:5370 +#: archaeological_operations/models.py:1400 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5294,7 +5330,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1429 -#: ishtar_common/models_common.py:1567 +#: ishtar_common/models_common.py:1578 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5796,9 +5832,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4946 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3159 +#: ishtar_common/views.py:3161 msgid "Packaging" msgstr "" @@ -5997,7 +6033,7 @@ msgid "TREATMENT" msgstr "" #: archaeological_finds/models_treatments.py:389 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" @@ -6028,7 +6064,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:105 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" @@ -6070,6 +6106,20 @@ msgctxt "key for text search" msgid "exhibition-end-after" msgstr "" +#: archaeological_finds/models_treatments.py:1112 +#: archaeological_operations/forms.py:1139 +#: archaeological_operations/forms.py:1236 +#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/models.py:492 +#: archaeological_warehouse/forms.py:339 +#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 +#: ishtar_common/models.py:2410 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + #: archaeological_finds/models_treatments.py:1184 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 @@ -6337,10 +6387,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:132 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: cd17_app/templates/ishtar/sheet_find.html:539 -#: ishtar_common/templates/ishtar/sheet_document.html:141 +#: ishtar_common/templates/ishtar/sheet_document.html:139 #: man_app/templates/ishtar/sheet_museum_find.html:617 #: na_app/templates/ishtar/sheet_find.html:542 #: pdl_app/templates/ishtar/sheet_find.html:535 @@ -6348,6 +6398,10 @@ msgstr "" msgid "Associated documents" msgstr "" +#: archaeological_finds/templates/ishtar/sheet_findbasket.html:14 +msgid "Owned by" +msgstr "" + #: archaeological_finds/templates/ishtar/sheet_findbasket.html:20 msgid "Associated treatment files" msgstr "" @@ -6356,7 +6410,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:60 +#: ishtar_common/templates/ishtar/sheet_document.html:58 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6552,9 +6606,9 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1093 -#: archaeological_operations/forms.py:1099 +#: archaeological_operations/forms.py:1081 +#: archaeological_operations/forms.py:1097 +#: archaeological_operations/forms.py:1103 #: archaeological_operations/models.py:3181 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6633,7 +6687,7 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:945 +#: archaeological_operations/forms.py:949 #: archaeological_operations/models.py:1388 #: archaeological_operations/models.py:2048 msgid "Yearly index" @@ -6664,13 +6718,14 @@ msgstr "" #: archaeological_operations/forms.py:518 #: archaeological_operations/forms.py:777 +#: archaeological_operations/models.py:1377 #: archaeological_operations/models.py:2834 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 #: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1709 #: archaeological_operations/models.py:1370 msgid "Operator" msgstr "" @@ -6682,10 +6737,10 @@ msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1143 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1358 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1147 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1875 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:497 @@ -6743,7 +6798,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:1520 msgid "Documentation provided" @@ -6751,7 +6806,7 @@ msgstr "" #: archaeological_operations/forms.py:574 #: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1717 +#: archaeological_operations/forms.py:1721 #: archaeological_operations/models.py:1515 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" @@ -6767,7 +6822,7 @@ msgstr "" #: archaeological_operations/forms.py:581 #: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1720 +#: archaeological_operations/forms.py:1724 #: archaeological_operations/models.py:996 #: archaeological_operations/models.py:1526 msgid "Finds provided" @@ -6775,7 +6830,7 @@ msgstr "" #: archaeological_operations/forms.py:583 #: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1724 +#: archaeological_operations/forms.py:1728 #: archaeological_operations/models.py:1522 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" @@ -6789,7 +6844,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:677 ishtar_common/models.py:4575 +#: archaeological_operations/forms.py:677 msgid "Associated file" msgstr "" @@ -6798,7 +6853,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1767 +#: archaeological_operations/forms.py:1771 #: archaeological_operations/models.py:1470 msgid "Generic name" msgstr "" @@ -6808,13 +6863,15 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:753 +#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:2852 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1727 -#: archaeological_operations/forms.py:1860 +#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1731 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1384 msgid "Collaborators" @@ -6853,307 +6910,295 @@ msgstr "" msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:900 +#: archaeological_operations/forms.py:904 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:905 +#: archaeological_operations/forms.py:909 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:935 +#: archaeological_operations/forms.py:939 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:943 msgid "Bad operation index" msgstr "" -#: archaeological_operations/forms.py:980 +#: archaeological_operations/forms.py:984 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:981 +#: archaeological_operations/forms.py:985 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:990 +#: archaeological_operations/forms.py:994 #: archaeological_operations/models.py:1533 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:993 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1535 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:999 +#: archaeological_operations/forms.py:1003 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1547 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1011 +#: archaeological_operations/forms.py:1015 #: archaeological_operations/models.py:1555 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1016 +#: archaeological_operations/forms.py:1020 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1017 +#: archaeological_operations/forms.py:1021 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1024 #: archaeological_operations/models.py:1410 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1025 #: archaeological_operations/models.py:1414 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1023 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1035 +#: archaeological_operations/forms.py:1039 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1040 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1041 +#: archaeological_operations/forms.py:1045 #: archaeological_operations/models.py:1442 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1043 +#: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:1446 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1046 +#: archaeological_operations/forms.py:1050 #: archaeological_operations/models.py:1449 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1067 +#: archaeological_operations/forms.py:1071 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1072 +#: archaeological_operations/forms.py:1076 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1094 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1101 +#: archaeological_operations/forms.py:1105 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1135 -#: archaeological_operations/forms.py:1232 -#: archaeological_operations/forms.py:1350 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 -#: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 -#: ishtar_common/models.py:2410 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_operations/forms.py:1168 -#: archaeological_operations/forms.py:1396 -#: archaeological_operations/forms.py:1839 +#: archaeological_operations/forms.py:1172 +#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1843 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1216 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1221 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1226 +#: archaeological_operations/forms.py:1230 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1250 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1369 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1373 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1261 -#: archaeological_operations/forms.py:1373 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1377 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1421 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1267 -#: archaeological_operations/forms.py:1419 +#: archaeological_operations/forms.py:1271 +#: archaeological_operations/forms.py:1423 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1273 +#: archaeological_operations/forms.py:1425 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1272 -#: archaeological_operations/forms.py:1429 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1433 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1275 -#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1279 +#: archaeological_operations/forms.py:1427 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1277 -#: archaeological_operations/forms.py:1425 +#: archaeological_operations/forms.py:1281 +#: archaeological_operations/forms.py:1429 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 +#: archaeological_operations/forms.py:1283 +#: archaeological_operations/forms.py:1431 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1345 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1403 +#: archaeological_operations/forms.py:1407 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1412 -#: archaeological_operations/templates/ishtar/sheet_site.html:53 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1417 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1496 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1507 -#: archaeological_operations/forms.py:1609 -#: archaeological_operations/forms.py:1676 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1680 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1521 #: archaeological_operations/models.py:2859 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1524 +#: archaeological_operations/forms.py:1528 #: archaeological_operations/models.py:2894 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1535 +#: archaeological_operations/forms.py:1539 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1569 +#: archaeological_operations/forms.py:1573 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1577 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1586 +#: archaeological_operations/forms.py:1590 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1591 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1615 #: archaeological_operations/forms.py:1619 +#: archaeological_operations/forms.py:1623 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1641 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1643 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1660 +#: archaeological_operations/forms.py:1664 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1685 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1794 +#: archaeological_operations/forms.py:1798 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1854 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7302,8 +7347,8 @@ msgid "top ope." msgstr "" #: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 -#: ishtar_common/models.py:5498 ishtar_common/models.py:5659 -#: ishtar_common/models.py:5719 ishtar_common/views_item.py:1740 +#: ishtar_common/models.py:5507 ishtar_common/models.py:5668 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1740 msgid "Unknown" msgstr "" @@ -7497,14 +7542,6 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1361 -msgid "Scientific manager" -msgstr "" - -#: archaeological_operations/models.py:1377 -msgid "Operation monitor" -msgstr "" - #: archaeological_operations/models.py:1495 msgid "Sites for which this operation is top operation" msgstr "" @@ -7523,9 +7560,9 @@ msgid "Cached label" msgstr "" #: archaeological_operations/models.py:1590 -#: archaeological_operations/templates/ishtar/sheet_site.html:86 +#: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:127 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7784,8 +7821,8 @@ msgstr "" #: archaeological_operations/models.py:3176 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 -#: ishtar_common/models_common.py:4358 +#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 +#: ishtar_common/models_common.py:4369 msgid "Cached name" msgstr "" @@ -7801,7 +7838,7 @@ msgstr "" msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3506 ishtar_common/models.py:5366 +#: archaeological_operations/models.py:3506 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" @@ -7840,7 +7877,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 #: ishtar_common/models.py:1039 -#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 @@ -7853,9 +7890,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:215 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7916,8 +7953,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7932,8 +7969,8 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:225 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:182 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7941,8 +7978,8 @@ msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:230 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8091,7 +8128,7 @@ msgstr "" #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:934 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5594 +#: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 msgid "Warehouse" msgstr "" @@ -8113,8 +8150,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:188 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8159,35 +8196,35 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 -#: ishtar_common/models_common.py:3842 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 +#: ishtar_common/models_common.py:3853 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 -#: ishtar_common/templates/ishtar/sheet_person.html:28 +#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:253 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3694 -#: ishtar_common/templates/ishtar/sheet_person.html:46 +#: ishtar_common/models_common.py:3705 +#: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" @@ -8217,7 +8254,7 @@ msgstr "" #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:904 #: archaeological_warehouse/models.py:1153 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:155 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" @@ -8353,10 +8390,10 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 -#: ishtar_common/templates/ishtar/sheet_document.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:190 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 +#: ishtar_common/templates/ishtar/sheet_document.html:131 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8392,7 +8429,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 -#: ishtar_common/templates/ishtar/sheet_document.html:132 +#: ishtar_common/templates/ishtar/sheet_document.html:130 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8652,27 +8689,27 @@ msgstr "" msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:201 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:232 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 #: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:238 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:262 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:268 #: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:290 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:296 #: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -8681,43 +8718,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:114 msgid "Geographic localisation/contact details" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:147 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:151 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:156 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:254 msgid "Document for this warehouse" msgstr "" @@ -8727,11 +8764,6 @@ msgid "" "have any parent container. You probably want to fix that." msgstr "" -#: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 -msgid "Associated finds" -msgstr "" - #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:33 msgid "" "These finds are inside this item. If you delete this item, they won't be " @@ -8802,7 +8834,7 @@ msgstr "" msgid "Precise on dating" msgstr "" -#: docs/generate_values_doc.py:77 +#: docs/generate_values_doc.py:81 msgid "Field not available for imports" msgstr "" @@ -8819,16 +8851,16 @@ msgid "warehouse" msgstr "" #: example_project/__init__.py:13 ishtar_common/views.py:345 -#: ishtar_common/views.py:1127 +#: ishtar_common/views.py:1129 msgid "New organization" msgstr "" #: example_project/__init__.py:14 ishtar_common/views.py:287 -#: ishtar_common/views.py:1118 ishtar_common/views.py:1123 +#: ishtar_common/views.py:1120 ishtar_common/views.py:1125 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:1133 +#: example_project/__init__.py:15 ishtar_common/views.py:1135 msgid "New author" msgstr "" @@ -9437,7 +9469,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1890 +#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" @@ -9471,8 +9503,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1968 -#: ishtar_common/views.py:1978 +#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" @@ -9554,7 +9586,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1619 -#: ishtar_common/views.py:3060 +#: ishtar_common/views.py:3062 msgid "Confirm" msgstr "" @@ -9819,8 +9851,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 -#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 +#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 msgid "Email" msgstr "" @@ -9851,7 +9883,7 @@ msgstr "" #: ishtar_common/forms_common.py:1141 ishtar_common/forms_common.py:2009 #: ishtar_common/forms_common.py:2443 ishtar_common/forms_common.py:2707 #: ishtar_common/models.py:2936 ishtar_common/models.py:2940 -#: ishtar_common/models.py:4573 ishtar_common/models_imports.py:1058 +#: ishtar_common/models.py:4572 ishtar_common/models_imports.py:1058 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 @@ -9894,12 +9926,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 -#: ishtar_common/models_common.py:3686 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 +#: ishtar_common/models_common.py:3697 msgid "Phone description 2" msgstr "" @@ -9907,11 +9939,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 msgid "Phone 3" msgstr "" @@ -9919,23 +9951,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 msgid "Other address: country" msgstr "" @@ -10020,7 +10052,7 @@ msgid "Send the new password by email?" msgstr "" #: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3512 -#: ishtar_common/views.py:1404 +#: ishtar_common/views.py:1406 msgid "Current profile" msgstr "" @@ -10075,47 +10107,47 @@ msgid "Document - 010 - General" msgstr "" #: ishtar_common/forms_common.py:2017 ishtar_common/forms_common.py:2449 -#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4647 +#: ishtar_common/forms_common.py:2672 ishtar_common/models.py:4646 msgid "Medium" msgstr "" #: ishtar_common/forms_common.py:2020 ishtar_common/forms_common.py:2229 #: ishtar_common/forms_common.py:2448 ishtar_common/forms_common.py:2671 -#: ishtar_common/models.py:4654 ishtar_common/models_imports.py:1062 +#: ishtar_common/models.py:4653 ishtar_common/models_imports.py:1062 #: ishtar_common/models_imports.py:1064 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 -#: ishtar_common/templates/ishtar/sheet_document.html:50 +#: ishtar_common/templates/ishtar/sheet_document.html:48 msgid "Format" msgstr "" #: ishtar_common/forms_common.py:2022 ishtar_common/forms_common.py:2450 -#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4659 +#: ishtar_common/forms_common.py:2673 ishtar_common/models.py:4658 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" #: ishtar_common/forms_common.py:2024 ishtar_common/forms_common.py:2451 -#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4662 +#: ishtar_common/forms_common.py:2680 ishtar_common/models.py:4661 msgid "Shooting angle" msgstr "" #: ishtar_common/forms_common.py:2043 ishtar_common/forms_common.py:2231 #: ishtar_common/forms_common.py:2916 ishtar_common/forms_common.py:2917 #: ishtar_common/models.py:3987 ishtar_common/models.py:4271 -#: ishtar_common/models.py:4668 +#: ishtar_common/models.py:4667 ishtar_common/models.py:4712 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:69 +#: ishtar_common/templates/ishtar/sheet_document.html:67 msgid "Authors" msgstr "" #: ishtar_common/forms_common.py:2049 ishtar_common/forms_common.py:2455 -#: ishtar_common/models.py:4595 +#: ishtar_common/models.py:4594 msgid "Publisher" msgstr "" #: ishtar_common/forms_common.py:2073 ishtar_common/forms_common.py:2477 -#: ishtar_common/models.py:4602 +#: ishtar_common/models.py:4601 msgid "Year of publication" msgstr "" @@ -10125,54 +10157,54 @@ msgid "Rights of use / licenses" msgstr "" #: ishtar_common/forms_common.py:2081 ishtar_common/forms_common.py:2483 -#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4609 +#: ishtar_common/forms_common.py:2677 ishtar_common/models.py:4608 msgid "Rights owner" msgstr "" #: ishtar_common/forms_common.py:2091 ishtar_common/forms_common.py:2490 -#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4614 +#: ishtar_common/forms_common.py:2679 ishtar_common/models.py:4613 msgid "Copyright" msgstr "" #: ishtar_common/forms_common.py:2094 ishtar_common/forms_common.py:2674 -#: ishtar_common/models.py:4615 +#: ishtar_common/models.py:4614 msgid "Tags" msgstr "" #: ishtar_common/forms_common.py:2100 ishtar_common/forms_common.py:2478 -#: ishtar_common/models.py:4618 ishtar_common/models_imports.py:1067 +#: ishtar_common/models.py:4617 ishtar_common/models_imports.py:1067 #: overload_translation/models.py:11 msgid "Language" msgstr "" #: ishtar_common/forms_common.py:2103 ishtar_common/forms_common.py:2480 -#: ishtar_common/models.py:4623 +#: ishtar_common/models.py:4622 msgid "ISSN" msgstr "" #: ishtar_common/forms_common.py:2109 ishtar_common/forms_common.py:2479 -#: ishtar_common/models.py:4624 +#: ishtar_common/models.py:4623 msgid "ISBN" msgstr "" #: ishtar_common/forms_common.py:2115 ishtar_common/forms_common.py:2234 -#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4627 -#: ishtar_common/models.py:5710 +#: ishtar_common/forms_common.py:2498 ishtar_common/models.py:4626 +#: ishtar_common/models.py:5719 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:98 +#: ishtar_common/templates/ishtar/sheet_document.html:96 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 -#: ishtar_common/views.py:2318 +#: ishtar_common/views.py:2320 msgid "Source" msgstr "" #: ishtar_common/forms_common.py:2118 ishtar_common/forms_common.py:2504 -#: ishtar_common/models.py:4634 +#: ishtar_common/models.py:4633 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4640 +#: ishtar_common/forms_common.py:2123 ishtar_common/models.py:4639 msgid "Source - page range" msgstr "" @@ -10183,7 +10215,7 @@ msgid "" "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4678 +#: ishtar_common/forms_common.py:2133 ishtar_common/models.py:4677 msgid "Numerical ressource (web address)" msgstr "" @@ -10192,40 +10224,40 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:59 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4681 +#: ishtar_common/forms_common.py:2161 ishtar_common/models.py:4680 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4687 +#: ishtar_common/forms_common.py:2167 ishtar_common/models.py:4686 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4701 +#: ishtar_common/forms_common.py:2174 ishtar_common/models.py:4700 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" #: ishtar_common/forms_common.py:2176 ishtar_common/forms_common.py:2494 -#: ishtar_common/models.py:4703 +#: ishtar_common/models.py:4702 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" #: ishtar_common/forms_common.py:2227 ishtar_common/forms_common.py:3106 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 -#: ishtar_common/templates/ishtar/sheet_document.html:123 +#: ishtar_common/templates/ishtar/sheet_document.html:121 msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:86 +#: ishtar_common/templates/ishtar/sheet_document.html:84 msgid "Publishing" msgstr "" @@ -10386,7 +10418,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2249 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 msgid "Import key" msgstr "" @@ -10396,26 +10428,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2264 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2256 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2267 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2272 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2283 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2238 +#: ishtar_common/models_common.py:2249 msgid "Buffer" msgstr "" @@ -10423,18 +10455,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2285 -#: ishtar_common/models_common.py:4192 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 +#: ishtar_common/models_common.py:4203 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 +#: ishtar_common/models_common.py:4206 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2291 -#: ishtar_common/models_common.py:4198 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:4209 msgid "Estimated error for Z" msgstr "" @@ -10443,10 +10475,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2050 ishtar_common/models_common.py:2108 -#: ishtar_common/models_common.py:2140 ishtar_common/models_common.py:2157 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2187 -#: ishtar_common/models_common.py:2316 ishtar_common/models_common.py:3418 +#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 +#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 msgid "Geography" msgstr "" @@ -10474,8 +10506,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2207 -#: ishtar_common/models_common.py:4207 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:4218 msgid "Point" msgstr "" @@ -10526,11 +10558,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1645 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1647 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2187 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2189 msgid "Old imports" msgstr "" @@ -10732,7 +10764,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 -#: ishtar_common/templates/ishtar/sheet_document.html:126 +#: ishtar_common/templates/ishtar/sheet_document.html:124 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -11362,8 +11394,8 @@ msgid "Ishtar site profiles" msgstr "" #: ishtar_common/models.py:1589 ishtar_common/models.py:1900 -#: ishtar_common/models.py:2123 ishtar_common/models.py:5465 -#: ishtar_common/models.py:5495 ishtar_common/models_imports.py:135 +#: ishtar_common/models.py:2123 ishtar_common/models.py:5474 +#: ishtar_common/models.py:5504 ishtar_common/models_imports.py:135 msgid "General settings" msgstr "" @@ -11833,15 +11865,15 @@ msgstr "" msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3620 ishtar_common/models.py:5472 +#: ishtar_common/models.py:3620 ishtar_common/models.py:5481 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3621 ishtar_common/models.py:5473 +#: ishtar_common/models.py:3621 ishtar_common/models.py:5482 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3622 ishtar_common/models.py:5475 +#: ishtar_common/models.py:3622 ishtar_common/models.py:5484 #: ishtar_common/models_imports.py:1292 ishtar_common/models_imports.py:1306 msgid "Finished" msgstr "" @@ -11859,11 +11891,11 @@ msgstr "" msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3650 ishtar_common/models.py:5489 -#: ishtar_common/models.py:5648 +#: ishtar_common/models.py:3650 ishtar_common/models.py:5498 +#: ishtar_common/models.py:5657 #: ishtar_common/templates/ishtar/import_table.html:4 #: ishtar_common/templates/ishtar/sheet_import_gen.html:4 -#: ishtar_common/views.py:2320 +#: ishtar_common/views.py:2322 msgid "Result" msgstr "" @@ -12117,7 +12149,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1835 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12172,252 +12204,257 @@ msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4605 +#: ishtar_common/models.py:4574 +msgctxt "pdf, odt, zip, ..." +msgid "Associated file" +msgstr "" + +#: ishtar_common/models.py:4604 msgid "Rights of use / license" msgstr "" -#: ishtar_common/models.py:4672 +#: ishtar_common/models.py:4671 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4689 +#: ishtar_common/models.py:4688 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4692 +#: ishtar_common/models.py:4691 msgid "Container ID" msgstr "" -#: ishtar_common/models.py:4696 +#: ishtar_common/models.py:4695 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4704 +#: ishtar_common/models.py:4703 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4706 +#: ishtar_common/models.py:4705 msgid "Related" msgstr "" -#: ishtar_common/models.py:4715 +#: ishtar_common/models.py:4721 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4719 +#: ishtar_common/models.py:4725 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4720 +#: ishtar_common/models.py:4726 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4721 +#: ishtar_common/models.py:4727 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4722 +#: ishtar_common/models.py:4728 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4952 +#: ishtar_common/models.py:4958 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4954 +#: ishtar_common/models.py:4960 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5367 +#: ishtar_common/models.py:5376 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5371 +#: ishtar_common/models.py:5380 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5421 +#: ishtar_common/models.py:5430 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5425 +#: ishtar_common/models.py:5434 msgid "Research" msgstr "" -#: ishtar_common/models.py:5458 +#: ishtar_common/models.py:5467 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5462 +#: ishtar_common/models.py:5471 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5463 +#: ishtar_common/models.py:5472 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5474 ishtar_common/models_imports.py:1291 +#: ishtar_common/models.py:5483 ishtar_common/models_imports.py:1291 #: ishtar_common/models_imports.py:1305 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5492 +#: ishtar_common/models.py:5501 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5493 +#: ishtar_common/models.py:5502 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5513 +#: ishtar_common/models.py:5522 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5525 +#: ishtar_common/models.py:5534 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5538 +#: ishtar_common/models.py:5547 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5556 +#: ishtar_common/models.py:5565 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5598 ishtar_common/models_imports.py:1282 +#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 #: ishtar_common/models_imports.py:1299 #: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5603 +#: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5606 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5615 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5609 +#: ishtar_common/models.py:5618 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5612 +#: ishtar_common/models.py:5621 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5615 +#: ishtar_common/models.py:5624 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5623 +#: ishtar_common/models.py:5632 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5628 +#: ishtar_common/models.py:5637 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5632 +#: ishtar_common/models.py:5641 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5637 +#: ishtar_common/models.py:5646 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5638 +#: ishtar_common/models.py:5647 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5639 +#: ishtar_common/models.py:5648 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5640 +#: ishtar_common/models.py:5649 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5641 +#: ishtar_common/models.py:5650 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5642 +#: ishtar_common/models.py:5651 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5643 +#: ishtar_common/models.py:5652 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5650 +#: ishtar_common/models.py:5659 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5653 +#: ishtar_common/models.py:5662 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5654 +#: ishtar_common/models.py:5663 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5656 ishtar_common/models.py:5716 +#: ishtar_common/models.py:5665 ishtar_common/models.py:5725 #: ishtar_common/templates/ishtar/import_table.html:91 #: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5666 +#: ishtar_common/models.py:5675 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5678 +#: ishtar_common/models.py:5687 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5690 +#: ishtar_common/models.py:5699 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5694 +#: ishtar_common/models.py:5703 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5703 +#: ishtar_common/models.py:5712 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5705 +#: ishtar_common/models.py:5714 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5708 +#: ishtar_common/models.py:5717 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5713 +#: ishtar_common/models.py:5722 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5714 +#: ishtar_common/models.py:5723 msgid "Archive - Imports" msgstr "" @@ -12429,381 +12466,381 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1130 +#: ishtar_common/models_common.py:1141 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1132 +#: ishtar_common/models_common.py:1143 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1133 +#: ishtar_common/models_common.py:1144 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1136 +#: ishtar_common/models_common.py:1147 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1152 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1528 +#: ishtar_common/models_common.py:1539 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1536 +#: ishtar_common/models_common.py:1547 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1543 ishtar_common/models_common.py:2242 +#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1545 +#: ishtar_common/models_common.py:1556 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1551 +#: ishtar_common/models_common.py:1562 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1571 +#: ishtar_common/models_common.py:1582 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1575 +#: ishtar_common/models_common.py:1586 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1579 +#: ishtar_common/models_common.py:1590 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1593 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1597 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1589 +#: ishtar_common/models_common.py:1600 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1839 +#: ishtar_common/models_common.py:1850 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1843 +#: ishtar_common/models_common.py:1854 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1847 +#: ishtar_common/models_common.py:1858 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1931 +#: ishtar_common/models_common.py:1942 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1933 +#: ishtar_common/models_common.py:1944 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2096 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2097 ishtar_common/models_common.py:2117 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2098 +#: ishtar_common/models_common.py:2109 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2099 +#: ishtar_common/models_common.py:2110 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2113 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2103 +#: ishtar_common/models_common.py:2114 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2134 +#: ishtar_common/models_common.py:2145 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2146 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2151 +#: ishtar_common/models_common.py:2162 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2163 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2179 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2180 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2181 +#: ishtar_common/models_common.py:2192 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:2193 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2219 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2209 +#: ishtar_common/models_common.py:2220 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2210 +#: ishtar_common/models_common.py:2221 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2250 +#: ishtar_common/models_common.py:2261 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2257 +#: ishtar_common/models_common.py:2268 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2265 +#: ishtar_common/models_common.py:2276 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2284 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:4188 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2278 +#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 +#: ishtar_common/models_common.py:2289 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2277 ishtar_common/models_common.py:4189 +#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2278 ishtar_common/models_common.py:4190 +#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2292 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2282 +#: ishtar_common/models_common.py:2293 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2283 +#: ishtar_common/models_common.py:2294 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2295 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2300 ishtar_common/models_common.py:4208 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2301 +#: ishtar_common/models_common.py:2312 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2302 +#: ishtar_common/models_common.py:2313 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2314 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2315 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2307 ishtar_common/models_common.py:2308 +#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2437 +#: ishtar_common/models_common.py:2448 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2901 +#: ishtar_common/models_common.py:2912 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2905 +#: ishtar_common/models_common.py:2916 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2909 +#: ishtar_common/models_common.py:2920 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2923 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2915 +#: ishtar_common/models_common.py:2926 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2918 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2921 +#: ishtar_common/models_common.py:2932 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:2925 +#: ishtar_common/models_common.py:2936 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2940 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2955 +#: ishtar_common/models_common.py:2966 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2957 +#: ishtar_common/models_common.py:2968 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3352 +#: ishtar_common/models_common.py:3363 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3354 +#: ishtar_common/models_common.py:3365 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3374 +#: ishtar_common/models_common.py:3385 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3376 +#: ishtar_common/models_common.py:3387 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3386 +#: ishtar_common/models_common.py:3397 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3390 +#: ishtar_common/models_common.py:3401 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3394 +#: ishtar_common/models_common.py:3405 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3660 +#: ishtar_common/models_common.py:3671 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3692 +#: ishtar_common/models_common.py:3703 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:3709 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3742 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3768 +#: ishtar_common/models_common.py:3779 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3849 +#: ishtar_common/models_common.py:3860 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3859 +#: ishtar_common/models_common.py:3870 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3877 +#: ishtar_common/models_common.py:3888 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4186 +#: ishtar_common/models_common.py:4197 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4221 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:4224 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4217 +#: ishtar_common/models_common.py:4228 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4235 msgid "Multi polygon source item" msgstr "" @@ -13321,7 +13358,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2908 ishtar_common/widgets.py:453 +#: ishtar_common/views.py:2910 ishtar_common/widgets.py:453 #: ishtar_common/widgets.py:489 msgid "Delete" msgstr "" @@ -13682,15 +13719,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1945 -#: ishtar_common/views.py:1949 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1947 +#: ishtar_common/views.py:1951 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1952 -#: ishtar_common/views.py:1954 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1954 +#: ishtar_common/views.py:1956 msgid "Next" msgstr "" @@ -14181,7 +14218,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1298 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1300 msgid "Changelog" msgstr "" @@ -14402,7 +14439,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1788 +#: ishtar_common/views.py:1790 msgid "Import step by step" msgstr "" @@ -14417,7 +14454,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 #: ishtar_common/templates/ishtar/import_table.html:5 #: ishtar_common/templates/ishtar/sheet_import_gen.html:5 -#: ishtar_common/views.py:2319 +#: ishtar_common/views.py:2321 msgid "Error" msgstr "" @@ -14507,7 +14544,7 @@ msgstr "" #: ishtar_common/templates/ishtar/import_table.html:6 #: ishtar_common/templates/ishtar/sheet_import_gen.html:6 -#: ishtar_common/views.py:2321 +#: ishtar_common/views.py:2323 msgid "Match" msgstr "" @@ -14601,19 +14638,19 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:63 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgid "Web link" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:111 +#: ishtar_common/templates/ishtar/sheet_document.html:109 msgid "Other" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:124 +#: ishtar_common/templates/ishtar/sheet_document.html:122 msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:131 +#: ishtar_common/templates/ishtar/sheet_document.html:129 msgid "Treatment files" msgstr "" @@ -14661,73 +14698,73 @@ msgstr "" msgid "Publications" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:30 +#: ishtar_common/templates/ishtar/sheet_person.html:29 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:39 msgid "Phone type" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:53 +#: ishtar_common/templates/ishtar/sheet_person.html:52 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:65 msgid "Business address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:63 +#: ishtar_common/templates/ishtar/sheet_person.html:62 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:79 msgid "Other address" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:72 +#: ishtar_common/templates/ishtar/sheet_person.html:71 msgid "Associated organization" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:84 +#: ishtar_common/templates/ishtar/sheet_person.html:83 msgid "Associated operations as scientist" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:89 +#: ishtar_common/templates/ishtar/sheet_person.html:88 msgid "Associated operations as responsible" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:94 +#: ishtar_common/templates/ishtar/sheet_person.html:93 msgid "Associated operations as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:99 +#: ishtar_common/templates/ishtar/sheet_person.html:98 msgid "Operations associees en tant que rapporteur CIRA" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:104 +#: ishtar_common/templates/ishtar/sheet_person.html:103 msgid "Associated archaeological sites as collaborator" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:109 +#: ishtar_common/templates/ishtar/sheet_person.html:108 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:114 +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:119 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:141 +#: ishtar_common/templates/ishtar/sheet_person.html:140 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:146 +#: ishtar_common/templates/ishtar/sheet_person.html:145 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:151 +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:156 +#: ishtar_common/templates/ishtar/sheet_person.html:155 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15257,140 +15294,140 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1141 +#: ishtar_common/views.py:1143 msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1164 ishtar_common/views_item.py:180 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:180 #: ishtar_common/views_item.py:223 ishtar_common/views_item.py:240 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1549 +#: ishtar_common/views.py:1551 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1574 +#: ishtar_common/views.py:1576 msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1581 +#: ishtar_common/views.py:1583 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1588 +#: ishtar_common/views.py:1590 msgid "Import: create (group)" msgstr "" -#: ishtar_common/views.py:1594 +#: ishtar_common/views.py:1596 msgid "Import: pre-form" msgstr "" -#: ishtar_common/views.py:2137 +#: ishtar_common/views.py:2139 msgid "Col. " msgstr "" -#: ishtar_common/views.py:2144 ishtar_common/views.py:2159 +#: ishtar_common/views.py:2146 ishtar_common/views.py:2161 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2248 +#: ishtar_common/views.py:2250 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2286 ishtar_common/views.py:2297 +#: ishtar_common/views.py:2288 ishtar_common/views.py:2299 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2459 +#: ishtar_common/views.py:2461 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2488 +#: ishtar_common/views.py:2490 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2496 +#: ishtar_common/views.py:2498 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2506 +#: ishtar_common/views.py:2508 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2546 ishtar_common/views.py:2567 +#: ishtar_common/views.py:2548 ishtar_common/views.py:2569 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2587 +#: ishtar_common/views.py:2589 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2600 +#: ishtar_common/views.py:2602 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2620 +#: ishtar_common/views.py:2622 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2688 +#: ishtar_common/views.py:2690 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2716 +#: ishtar_common/views.py:2718 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2741 +#: ishtar_common/views.py:2743 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2778 +#: ishtar_common/views.py:2780 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2884 +#: ishtar_common/views.py:2886 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2907 +#: ishtar_common/views.py:2909 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2950 +#: ishtar_common/views.py:2952 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2951 +#: ishtar_common/views.py:2953 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2956 +#: ishtar_common/views.py:2958 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2957 +#: ishtar_common/views.py:2959 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3076 +#: ishtar_common/views.py:3078 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:3214 ishtar_common/views.py:3309 +#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3346 ishtar_common/views.py:3400 +#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3360 +#: ishtar_common/views.py:3362 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3413 +#: ishtar_common/views.py:3415 msgid "Delete geographic item" msgstr "" |