diff options
| -rw-r--r-- | ishtar/furnitures/forms.py | 8 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 10 | ||||
| -rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 1196 | ||||
| -rw-r--r-- | ishtar/templates/sheet_contextrecord.html | 4 | ||||
| -rw-r--r-- | ishtar/templates/sheet_ope.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/sheet_ope_modif.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/sheet_operation.html | 2 |
7 files changed, 742 insertions, 482 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 152439b6f..5553be28c 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1867,7 +1867,7 @@ class RecordFormGeneral(forms.Form): form_label = _("General") associated_models = {'parcel':models.Parcel, 'unit':models.Unit} parcel = forms.ChoiceField(label=_("Parcel"), choices=[]) - label = forms.CharField(label=_(u"Label"), + label = forms.CharField(label=_(u"ID"), validators=[validators.MaxLengthValidator(200)]) description = forms.CharField(label=_(u"Description"), widget=forms.Textarea, required=False) @@ -2002,7 +2002,7 @@ class ItemWizard(Wizard): class ItemFormBase(forms.Form): form_label = _("Base item") base_model = 'base_items' - base_items__label = forms.CharField(label=_(u"General label"), + base_items__label = forms.CharField(label=_(u"General ID"), validators=[validators.MaxLengthValidator(60)]) base_items__description = forms.CharField(label=_("General description"), widget=forms.Textarea) @@ -2012,7 +2012,7 @@ class ItemFormBase(forms.Form): class ItemForm(forms.Form): form_label = _("Item") associated_models = {'material_type':models.MaterialType,} - label = forms.CharField(label=_(u"Label"), + label = forms.CharField(label=_(u"ID"), validators=[validators.MaxLengthValidator(60)]) description = forms.CharField(label=_("Precise description"), widget=forms.Textarea, required=False) @@ -2146,7 +2146,7 @@ def check_treatment(form_name, type_key, type_list=[], not_type_list=[]): class ResultItemForm(forms.Form): form_label = _("Resulting item") associated_models = {'material_type':models.MaterialType} - label = forms.CharField(label=_(u"Label"), + label = forms.CharField(label=_(u"ID"), validators=[validators.MaxLengthValidator(60)]) description = forms.CharField(label=_("Precise description"), widget=forms.Textarea) diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 1e0072c45..17f18a79d 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -125,7 +125,7 @@ class GeneralType(models.Model): Abstract class for "types" """ label = models.CharField(_(u"Label"), max_length=100) - txt_idx = models.CharField(_(u"Textual identifier"), + txt_idx = models.CharField(_(u"Textual ID"), validators=[validate_slug], max_length=30, unique=True) comment = models.TextField(_(u"Comment"), blank=True, null=True) available = models.BooleanField(_(u"Available")) @@ -708,7 +708,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): TABLE_COLS.insert(1, 'parcel.operation.code_patriarche') parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"), related_name='context_record') - label = models.CharField(_(u"Label"), max_length=200) + label = models.CharField(_(u"ID"), max_length=200) description = models.TextField(_("Description"), blank=True, null=True) length = models.IntegerField(_(u"Length"), blank=True, null=True) width = models.IntegerField(_(u"Width"), blank=True, null=True) @@ -798,7 +798,7 @@ class MaterialType(GeneralType): verbose_name_plural = _(u"Material types") class BaseItem(BaseHistorizedItem, OwnPerms): - label = models.CharField(_(u"Label"), max_length=60) + label = models.CharField(_(u"ID"), max_length=60) description = models.TextField(_(u"Description")) context_record = models.ForeignKey(ContextRecord, related_name='base_items', verbose_name=_(u"Context Record")) @@ -832,7 +832,7 @@ class BaseItem(BaseHistorizedItem, OwnPerms): def material_type_label(self): item = self.get_last_item() - lbl = item and (unicode(item.material_type) + unicode(_(": "))) or '' + lbl = item and (unicode(item.material_type) + unicode(_(":"))) or '' if self.context_record.parcel.operation.code_patriarche: return lbl + JOINT.join([unicode(it) for it in ( self.context_record.parcel.operation.code_patriarche, @@ -876,7 +876,7 @@ class Item(BaseHistorizedItem, OwnPerms): base_items = models.ManyToManyField(BaseItem, verbose_name=_(u"Base item"), related_name='item') order = models.IntegerField(_(u"Order")) - label = models.CharField(_(u"Label"), max_length=60) + label = models.CharField(_(u"ID"), max_length=60) description = models.TextField(_(u"Description"), blank=True, null=True) material_type = models.ForeignKey(MaterialType, verbose_name = _(u"Material type")) diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index 8c2b5f5cb..10c5dc6b0 100644 --- a/ishtar/locale/fr/LC_MESSAGES/django.po +++ b/ishtar/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-28 20:25+0200\n" +"POT-Creation-Date: 2011-05-10 12:42+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -32,14 +32,14 @@ msgstr "courriel" msgid "warehouse" msgstr "dépôt" -#: furnitures/context_processors.py:42 furnitures/forms.py:1480 -#: furnitures/menus.py:102 furnitures/models.py:751 furnitures/models.py:777 +#: furnitures/context_processors.py:42 furnitures/forms.py:1519 +#: furnitures/menus.py:102 furnitures/models.py:965 furnitures/models.py:991 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: furnitures/context_processors.py:43 furnitures/forms.py:1453 -#: furnitures/menus.py:132 furnitures/models.py:461 furnitures/models.py:500 -#: furnitures/models.py:752 furnitures/models.py:775 +#: furnitures/context_processors.py:43 furnitures/forms.py:1492 +#: furnitures/menus.py:132 furnitures/models.py:568 furnitures/models.py:607 +#: furnitures/models.py:966 furnitures/models.py:989 msgid "Operation" msgstr "Opération" @@ -51,294 +51,298 @@ msgstr "Il y a des mobiliers identiques." msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: furnitures/forms.py:74 furnitures/forms.py:607 furnitures/models.py:214 -#: furnitures/models.py:244 furnitures/models.py:730 furnitures/models.py:837 +#: furnitures/forms.py:74 furnitures/forms.py:633 furnitures/models.py:319 +#: furnitures/models.py:349 furnitures/models.py:944 furnitures/models.py:1051 msgid "Name" msgstr "Nom" -#: furnitures/forms.py:76 furnitures/models.py:726 furnitures/models.py:732 +#: furnitures/forms.py:76 furnitures/models.py:940 furnitures/models.py:946 msgid "Warehouse type" msgstr "Type de dépôt" -#: furnitures/forms.py:78 furnitures/forms.py:878 furnitures/models.py:322 -#: furnitures/models.py:734 +#: furnitures/forms.py:78 furnitures/forms.py:912 furnitures/models.py:428 +#: furnitures/models.py:948 msgid "Person in charge" msgstr "Responsable" -#: furnitures/forms.py:83 furnitures/forms.py:899 furnitures/forms.py:1492 -#: furnitures/forms.py:2055 furnitures/models.py:111 furnitures/models.py:352 -#: furnitures/models.py:457 furnitures/models.py:735 furnitures/models.py:815 +#: furnitures/forms.py:83 furnitures/forms.py:933 furnitures/forms.py:1535 +#: furnitures/forms.py:2122 furnitures/models.py:130 furnitures/models.py:458 +#: furnitures/models.py:564 furnitures/models.py:949 furnitures/models.py:1029 msgid "Comment" msgstr "Commentaire" -#: furnitures/forms.py:85 furnitures/forms.py:911 furnitures/models.py:192 +#: furnitures/forms.py:85 furnitures/forms.py:945 furnitures/models.py:297 msgid "Address" msgstr "Adresse" -#: furnitures/forms.py:87 furnitures/models.py:193 +#: furnitures/forms.py:87 furnitures/models.py:298 msgid "Address complement" msgstr "Complément d'adresse" -#: furnitures/forms.py:89 furnitures/models.py:195 +#: furnitures/forms.py:89 furnitures/models.py:300 msgid "Postal code" msgstr "Code postal" -#: furnitures/forms.py:91 furnitures/forms.py:95 furnitures/forms.py:848 -#: furnitures/forms.py:926 furnitures/forms.py:955 furnitures/forms.py:1254 -#: furnitures/forms.py:1442 furnitures/forms.py:1547 furnitures/forms.py:1708 -#: furnitures/forms.py:1792 furnitures/forms.py:1990 furnitures/models.py:197 -#: furnitures/models.py:504 furnitures/models.py:851 +#: furnitures/forms.py:91 furnitures/forms.py:95 furnitures/forms.py:882 +#: furnitures/forms.py:962 furnitures/forms.py:991 furnitures/forms.py:1293 +#: furnitures/forms.py:1481 furnitures/forms.py:1590 furnitures/forms.py:1755 +#: furnitures/forms.py:1839 furnitures/forms.py:2053 furnitures/models.py:302 +#: furnitures/models.py:611 furnitures/models.py:1065 msgid "Town" msgstr "Commune" -#: furnitures/forms.py:92 furnitures/models.py:198 +#: furnitures/forms.py:92 furnitures/models.py:303 msgid "Country" msgstr "Pays" -#: furnitures/forms.py:94 furnitures/models.py:200 +#: furnitures/forms.py:94 furnitures/models.py:305 msgid "Phone" msgstr "Téléphone" -#: furnitures/forms.py:112 furnitures/forms.py:759 +#: furnitures/forms.py:112 furnitures/forms.py:785 msgid "Confirm" msgstr "Confirmation" -#: furnitures/forms.py:215 +#: furnitures/forms.py:228 msgid "Yes" msgstr "Oui" -#: furnitures/forms.py:217 +#: furnitures/forms.py:230 msgid "No" msgstr "Non" -#: furnitures/forms.py:592 furnitures/forms.py:595 furnitures/forms.py:2027 -#: furnitures/menus.py:89 furnitures/models.py:255 furnitures/models.py:279 -#: furnitures/models.py:875 furnitures/models.py:897 furnitures/models.py:912 +#: furnitures/forms.py:618 furnitures/forms.py:621 furnitures/forms.py:2094 +#: furnitures/menus.py:89 furnitures/models.py:360 furnitures/models.py:385 +#: furnitures/models.py:1089 furnitures/models.py:1111 +#: furnitures/models.py:1126 msgid "Person" msgstr "Individu" -#: furnitures/forms.py:601 +#: furnitures/forms.py:627 msgid "Identity" msgstr "Identité" -#: furnitures/forms.py:604 furnitures/models.py:242 furnitures/models.py:630 -#: templates/sheet_ope.html:104 +#: furnitures/forms.py:630 furnitures/models.py:347 furnitures/models.py:781 +#: templates/sheet_contextrecord.html:83 templates/sheet_ope.html:104 +#: templates/sheet_ope_modif.html:104 templates/sheet_operation.html:104 msgid "Title" msgstr "Titre" -#: furnitures/forms.py:605 furnitures/models.py:243 +#: furnitures/forms.py:631 furnitures/models.py:348 msgid "Surname" msgstr "Prénom" -#: furnitures/forms.py:609 furnitures/forms.py:724 furnitures/models.py:245 +#: furnitures/forms.py:635 furnitures/forms.py:750 furnitures/models.py:350 msgid "Email" msgstr "Courriel" -#: furnitures/forms.py:611 furnitures/models.py:233 +#: furnitures/forms.py:637 furnitures/models.py:338 msgid "Person type" msgstr "Type d'individu" -#: furnitures/forms.py:613 +#: furnitures/forms.py:639 msgid "Current organization" msgstr "Organisation actuelle" -#: furnitures/forms.py:617 furnitures/models.py:249 +#: furnitures/forms.py:643 furnitures/models.py:354 msgid "Is an author?" msgstr "Est un auteur ?" -#: furnitures/forms.py:620 furnitures/models.py:251 +#: furnitures/forms.py:646 furnitures/models.py:356 msgid "In charge of a storage?" msgstr "Est responsable d'un dépôt ?" -#: furnitures/forms.py:642 furnitures/forms.py:726 +#: furnitures/forms.py:668 furnitures/forms.py:752 msgid "New password" msgstr "Nouveau mot de passe" -#: furnitures/forms.py:696 +#: furnitures/forms.py:722 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création - modification du compte" -#: furnitures/forms.py:719 furnitures/forms.py:723 +#: furnitures/forms.py:745 furnitures/forms.py:749 msgid "Account" msgstr "Compte" -#: furnitures/forms.py:730 +#: furnitures/forms.py:756 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: furnitures/forms.py:748 +#: furnitures/forms.py:774 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: furnitures/forms.py:753 +#: furnitures/forms.py:779 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: furnitures/forms.py:760 +#: furnitures/forms.py:786 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: furnitures/forms.py:852 furnitures/forms.py:893 furnitures/models.py:320 +#: furnitures/forms.py:886 furnitures/forms.py:927 furnitures/models.py:426 msgid "File type" msgstr "Type de dossier" -#: furnitures/forms.py:854 furnitures/forms.py:1030 +#: furnitures/forms.py:888 furnitures/forms.py:1066 msgid "Saisine type" msgstr "Type de saisine" -#: furnitures/forms.py:856 furnitures/forms.py:883 furnitures/forms.py:903 -#: furnitures/forms.py:961 furnitures/forms.py:1450 furnitures/forms.py:1488 -#: furnitures/forms.py:1796 furnitures/forms.py:1992 furnitures/models.py:315 -#: furnitures/models.py:433 furnitures/models.py:501 -#: templates/sheet_file.html:56 templates/sheet_file.html.py:76 -#: templates/sheet_file.html:104 templates/sheet_ope.html:61 -#: templates/sheet_ope.html.py:83 templates/sheet_operation.html:62 +#: furnitures/forms.py:890 furnitures/forms.py:917 furnitures/forms.py:937 +#: furnitures/forms.py:997 furnitures/forms.py:1489 furnitures/forms.py:1531 +#: furnitures/forms.py:1843 furnitures/forms.py:2055 furnitures/models.py:421 +#: furnitures/models.py:539 furnitures/models.py:608 +#: templates/sheet_file.html:68 templates/sheet_file.html.py:88 +#: templates/sheet_file.html:116 templates/sheet_ope.html:61 +#: templates/sheet_ope.html.py:83 templates/sheet_ope_modif.html:61 +#: templates/sheet_ope_modif.html.py:83 templates/sheet_operation.html:62 #: templates/sheet_operation.html.py:83 msgid "Year" msgstr "Année" -#: furnitures/forms.py:859 furnitures/models.py:356 +#: furnitures/forms.py:893 furnitures/models.py:462 msgid "Archaeological file" msgstr "Dossier archéologique" -#: furnitures/forms.py:870 +#: furnitures/forms.py:904 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: furnitures/forms.py:874 furnitures/forms.py:1237 furnitures/forms.py:1468 -#: furnitures/forms.py:1723 furnitures/forms.py:1820 -#: templates/sheet_file.html:5 templates/sheet_ope.html:5 -#: templates/sheet_operation.html:5 +#: furnitures/forms.py:908 furnitures/forms.py:1276 furnitures/forms.py:1507 +#: furnitures/forms.py:1770 furnitures/forms.py:1867 +#: templates/sheet_file.html:17 templates/sheet_ope.html:5 +#: templates/sheet_ope_modif.html:5 templates/sheet_operation.html:5 msgid "General" msgstr "Général" -#: furnitures/forms.py:887 furnitures/forms.py:905 furnitures/models.py:317 +#: furnitures/forms.py:921 furnitures/forms.py:939 furnitures/models.py:423 msgid "Numeric reference" msgstr "Référence numérique" -#: furnitures/forms.py:889 furnitures/forms.py:907 furnitures/models.py:318 +#: furnitures/forms.py:923 furnitures/forms.py:941 furnitures/models.py:424 msgid "Internal reference" msgstr "Référence interne" -#: furnitures/forms.py:891 furnitures/models.py:333 +#: furnitures/forms.py:925 furnitures/models.py:439 msgid "Creation date" msgstr "Date de création" -#: furnitures/forms.py:895 furnitures/models.py:337 +#: furnitures/forms.py:929 furnitures/models.py:443 msgid "Related file" msgstr "Dossier en relation avec" -#: furnitures/forms.py:913 furnitures/models.py:344 +#: furnitures/forms.py:949 furnitures/forms.py:1528 furnitures/models.py:450 msgid "Total surface" msgstr "Surface totale" -#: furnitures/forms.py:916 furnitures/models.py:347 +#: furnitures/forms.py:952 furnitures/models.py:453 msgid "Main address" msgstr "Adresse principale" -#: furnitures/forms.py:917 furnitures/models.py:348 +#: furnitures/forms.py:953 furnitures/models.py:454 msgid "Main address - complement" msgstr "Adresse principale - complément" -#: furnitures/forms.py:919 furnitures/models.py:350 +#: furnitures/forms.py:955 furnitures/models.py:456 msgid "Main address - postal code" msgstr "Adresse principale - code postal" -#: furnitures/forms.py:923 furnitures/forms.py:949 furnitures/forms.py:1545 -#: furnitures/forms.py:1566 furnitures/forms.py:1570 furnitures/models.py:332 -#: furnitures/models.py:440 furnitures/models.py:852 +#: furnitures/forms.py:959 furnitures/forms.py:985 furnitures/forms.py:1588 +#: furnitures/forms.py:1609 furnitures/forms.py:1613 furnitures/models.py:438 +#: furnitures/models.py:547 furnitures/models.py:1066 msgid "Towns" msgstr "Communes" -#: furnitures/forms.py:945 +#: furnitures/forms.py:981 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: furnitures/forms.py:952 furnitures/forms.py:1000 furnitures/forms.py:1573 -#: furnitures/forms.py:1594 furnitures/forms.py:1598 furnitures/models.py:510 +#: furnitures/forms.py:988 furnitures/forms.py:1036 furnitures/forms.py:1616 +#: furnitures/forms.py:1637 furnitures/forms.py:1641 furnitures/models.py:617 msgid "Parcels" msgstr "Parcelles" -#: furnitures/forms.py:957 furnitures/models.py:505 -#: templates/sheet_ope.html:62 templates/sheet_operation.html:63 +#: furnitures/forms.py:993 furnitures/models.py:612 +#: templates/sheet_ope.html:62 templates/sheet_ope_modif.html:62 +#: templates/sheet_operation.html:63 msgid "Section" msgstr "Section" -#: furnitures/forms.py:959 furnitures/models.py:506 +#: furnitures/forms.py:995 furnitures/models.py:613 msgid "Parcel number" msgstr "Numéro de parcelle" -#: furnitures/forms.py:989 +#: furnitures/forms.py:1025 msgid "All fields are required" msgstr "Tous les champs sont nécessaires" -#: furnitures/forms.py:1003 +#: furnitures/forms.py:1039 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: furnitures/forms.py:1008 furnitures/models.py:324 +#: furnitures/forms.py:1044 furnitures/models.py:430 msgid "General contractor" msgstr "Aménageur" -#: furnitures/forms.py:1015 furnitures/models.py:326 +#: furnitures/forms.py:1051 furnitures/models.py:432 msgid "Town planning service" msgstr "Service instructeur" -#: furnitures/forms.py:1021 furnitures/models.py:302 furnitures/models.py:327 +#: furnitures/forms.py:1057 furnitures/models.py:408 furnitures/models.py:433 msgid "Permit type" msgstr "Type de permis" -#: furnitures/forms.py:1023 furnitures/models.py:329 +#: furnitures/forms.py:1059 furnitures/models.py:435 msgid "Permit reference" msgstr "Référence du permis" -#: furnitures/forms.py:1026 furnitures/models.py:345 +#: furnitures/forms.py:1062 furnitures/models.py:451 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: furnitures/forms.py:1032 furnitures/models.py:335 +#: furnitures/forms.py:1068 furnitures/models.py:441 msgid "Reception date" msgstr "Date de réception" -#: furnitures/forms.py:1164 templates/sheet_file.html:74 +#: furnitures/forms.py:1203 templates/sheet_file.html:86 msgid "Associated operations" msgstr "Opérations associées" -#: furnitures/forms.py:1183 +#: furnitures/forms.py:1222 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: furnitures/forms.py:1240 furnitures/forms.py:1258 furnitures/forms.py:1712 -#: furnitures/forms.py:1724 furnitures/models.py:757 furnitures/models.py:765 +#: furnitures/forms.py:1279 furnitures/forms.py:1297 furnitures/forms.py:1759 +#: furnitures/forms.py:1771 furnitures/models.py:971 furnitures/models.py:979 msgid "Act type" msgstr "Type d'acte" -#: furnitures/forms.py:1242 furnitures/models.py:773 +#: furnitures/forms.py:1281 furnitures/models.py:987 msgid "Signatory" msgstr "Signataire" -#: furnitures/forms.py:1246 furnitures/models.py:779 +#: furnitures/forms.py:1285 furnitures/models.py:993 msgid "Object" msgstr "Objet" -#: furnitures/forms.py:1248 furnitures/models.py:778 +#: furnitures/forms.py:1287 furnitures/models.py:992 msgid "Signature date" msgstr "Date de signature" -#: furnitures/forms.py:1262 +#: furnitures/forms.py:1301 msgid "Administrative Act" msgstr "Acte administratif" -#: furnitures/forms.py:1274 +#: furnitures/forms.py:1313 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: furnitures/forms.py:1293 +#: furnitures/forms.py:1332 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" -#: furnitures/forms.py:1436 +#: furnitures/forms.py:1475 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " "the first step." @@ -346,39 +350,39 @@ msgstr "" "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un " "oubli, définissez le à la première étape." -#: furnitures/forms.py:1446 furnitures/forms.py:1484 furnitures/models.py:409 -#: furnitures/models.py:438 +#: furnitures/forms.py:1485 furnitures/forms.py:1523 furnitures/models.py:515 +#: furnitures/models.py:544 msgid "Operation type" msgstr "Type d'opération" -#: furnitures/forms.py:1448 furnitures/models.py:439 +#: furnitures/forms.py:1487 furnitures/models.py:546 msgid "Remains" msgstr "Vestiges" -#: furnitures/forms.py:1464 +#: furnitures/forms.py:1503 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: furnitures/forms.py:1473 furnitures/models.py:767 +#: furnitures/forms.py:1512 furnitures/models.py:981 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: furnitures/forms.py:1486 furnitures/forms.py:1870 furnitures/forms.py:1970 -#: furnitures/forms.py:2036 furnitures/models.py:429 furnitures/models.py:524 -#: furnitures/models.py:548 furnitures/models.py:714 furnitures/models.py:877 -#: furnitures/models.py:913 templates/sheet_file.html:81 +#: furnitures/forms.py:1525 furnitures/forms.py:1917 furnitures/forms.py:2033 +#: furnitures/forms.py:2103 furnitures/models.py:535 furnitures/models.py:630 +#: furnitures/models.py:654 furnitures/models.py:928 furnitures/models.py:1091 +#: furnitures/models.py:1127 templates/sheet_file.html:93 msgid "Start date" msgstr "Date de début" -#: furnitures/forms.py:1496 +#: furnitures/forms.py:1539 msgid "References" msgstr "Référence" -#: furnitures/forms.py:1503 furnitures/models.py:434 +#: furnitures/forms.py:1546 furnitures/models.py:540 msgid "Operation code" msgstr "Code de l'opération" -#: furnitures/forms.py:1520 +#: furnitures/forms.py:1563 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -387,248 +391,273 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: furnitures/forms.py:1526 +#: furnitures/forms.py:1569 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: furnitures/forms.py:1527 furnitures/models.py:441 +#: furnitures/forms.py:1570 furnitures/models.py:548 msgid "Cost" msgstr "Coût" -#: furnitures/forms.py:1535 +#: furnitures/forms.py:1578 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: furnitures/forms.py:1538 furnitures/models.py:452 +#: furnitures/forms.py:1581 furnitures/models.py:559 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: furnitures/forms.py:1540 furnitures/models.py:454 +#: furnitures/forms.py:1583 furnitures/models.py:561 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: furnitures/forms.py:1542 furnitures/models.py:456 +#: furnitures/forms.py:1585 furnitures/models.py:563 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: furnitures/forms.py:1575 furnitures/forms.py:1822 furnitures/models.py:509 -#: furnitures/models.py:580 furnitures/models.py:713 -#: templates/sheet_ope.html:63 templates/sheet_ope.html.py:129 -#: templates/sheet_operation.html:64 templates/sheet_operation.html.py:107 +#: furnitures/forms.py:1618 furnitures/forms.py:1869 furnitures/models.py:616 +#: furnitures/models.py:709 furnitures/models.py:927 +#: templates/sheet_contextrecord.html:110 templates/sheet_ope.html:63 +#: templates/sheet_ope.html.py:129 templates/sheet_ope_modif.html:63 +#: templates/sheet_ope_modif.html.py:129 templates/sheet_ope_modif.html:157 +#: templates/sheet_operation.html:64 templates/sheet_operation.html.py:128 +#: templates/sheet_operation.html:159 msgid "Parcel" msgstr "Parcelle" -#: furnitures/forms.py:1601 furnitures/forms.py:1613 furnitures/models.py:424 +#: furnitures/forms.py:1644 furnitures/forms.py:1656 furnitures/models.py:530 msgid "Remain types" msgstr "Types de vestige" -#: furnitures/forms.py:1603 furnitures/models.py:423 +#: furnitures/forms.py:1646 furnitures/models.py:529 msgid "Remain type" msgstr "Type de vestige" -#: furnitures/forms.py:1616 furnitures/forms.py:1628 furnitures/models.py:442 +#: furnitures/forms.py:1659 furnitures/forms.py:1671 furnitures/models.py:549 +#: templates/sheet_contextrecord.html:106 templates/sheet_ope_modif.html:153 +#: templates/sheet_operation.html:155 msgid "Periods" msgstr "Périodes" -#: furnitures/forms.py:1618 furnitures/forms.py:1797 furnitures/forms.py:1868 -#: furnitures/forms.py:1968 furnitures/forms.py:1994 furnitures/models.py:547 +#: furnitures/forms.py:1661 furnitures/forms.py:1844 furnitures/forms.py:1915 +#: furnitures/forms.py:2031 furnitures/forms.py:2057 furnitures/models.py:653 msgid "Period" msgstr "Période" -#: furnitures/forms.py:1670 furnitures/forms.py:1671 furnitures/models.py:430 +#: furnitures/forms.py:1717 furnitures/forms.py:1718 furnitures/models.py:536 msgid "Closing date" msgstr "Date de clotûre" -#: furnitures/forms.py:1681 +#: furnitures/forms.py:1728 msgid "Would you like to close this operation?" msgstr "Voulez vous clôturer cette opération ?" -#: furnitures/forms.py:1691 +#: furnitures/forms.py:1738 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: furnitures/forms.py:1799 +#: furnitures/forms.py:1846 msgid "Unit type" msgstr "Type d'unité" -#: furnitures/forms.py:1803 furnitures/menus.py:174 +#: furnitures/forms.py:1850 furnitures/menus.py:174 +#: templates/sheet_contextrecord.html:105 templates/sheet_operation.html:154 msgid "Context record" msgstr "Unité d'Enregistrement" -#: furnitures/forms.py:1814 +#: furnitures/forms.py:1861 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: furnitures/forms.py:1823 furnitures/forms.py:1952 furnitures/forms.py:2082 -#: furnitures/models.py:108 furnitures/models.py:180 furnitures/models.py:582 -#: furnitures/models.py:650 furnitures/models.py:684 -#: templates/sheet_ope.html:125 templates/sheet_operation.html:103 -msgid "Label" -msgstr "Libellé" - -#: furnitures/forms.py:1825 furnitures/forms.py:2025 furnitures/models.py:583 -#: furnitures/models.py:651 furnitures/models.py:685 furnitures/models.py:870 -#: templates/sheet_ope.html:128 templates/sheet_operation.html:106 +#: furnitures/forms.py:1870 furnitures/forms.py:2015 furnitures/forms.py:2149 +#: furnitures/models.py:711 furnitures/models.py:801 furnitures/models.py:879 +#: templates/sheet_ope.html:125 templates/sheet_ope_modif.html:125 +#: templates/sheet_operation.html:124 +msgid "ID" +msgstr "Identifiant" + +#: furnitures/forms.py:1872 furnitures/forms.py:2092 furnitures/models.py:712 +#: furnitures/models.py:802 furnitures/models.py:880 furnitures/models.py:1084 +#: templates/sheet_contextrecord.html:23 +#: templates/sheet_contextrecord.html:107 templates/sheet_ope.html:128 +#: templates/sheet_ope_modif.html:128 templates/sheet_ope_modif.html.py:154 +#: templates/sheet_operation.html:127 templates/sheet_operation.html.py:156 msgid "Description" msgstr "Description" -#: furnitures/forms.py:1827 furnitures/models.py:584 furnitures/models.py:800 +#: furnitures/forms.py:1874 furnitures/models.py:713 furnitures/models.py:1014 msgid "Length" msgstr "Longueur (cm)" -#: furnitures/forms.py:1828 furnitures/models.py:585 furnitures/models.py:801 +#: furnitures/forms.py:1875 furnitures/models.py:714 furnitures/models.py:1015 msgid "Width" msgstr "Largeur (cm)" -#: furnitures/forms.py:1829 furnitures/models.py:586 +#: furnitures/forms.py:1876 furnitures/models.py:715 msgid "Thickness" msgstr "Épaisseur (cm)" -#: furnitures/forms.py:1830 furnitures/models.py:587 +#: furnitures/forms.py:1877 furnitures/models.py:716 msgid "Depth" msgstr "Profondeur (cm)" -#: furnitures/forms.py:1831 furnitures/models.py:592 +#: furnitures/forms.py:1878 furnitures/models.py:721 msgid "Unit" msgstr "Unité" -#: furnitures/forms.py:1833 furnitures/forms.py:2031 furnitures/models.py:588 -#: furnitures/models.py:811 furnitures/models.py:873 +#: furnitures/forms.py:1880 furnitures/forms.py:2098 furnitures/models.py:717 +#: furnitures/models.py:1025 furnitures/models.py:1087 msgid "Location" msgstr "Lieu" -#: furnitures/forms.py:1863 furnitures/forms.py:1879 furnitures/forms.py:1963 -#: furnitures/models.py:556 furnitures/models.py:695 +#: furnitures/forms.py:1910 furnitures/forms.py:1926 furnitures/forms.py:2026 +#: furnitures/models.py:662 furnitures/models.py:890 msgid "Dating" msgstr "Datation" -#: furnitures/forms.py:1871 furnitures/forms.py:1972 furnitures/forms.py:2038 -#: furnitures/models.py:525 furnitures/models.py:549 furnitures/models.py:715 -#: furnitures/models.py:878 furnitures/models.py:914 -#: templates/sheet_file.html:82 +#: furnitures/forms.py:1918 furnitures/forms.py:2035 furnitures/forms.py:2105 +#: furnitures/models.py:631 furnitures/models.py:655 furnitures/models.py:929 +#: furnitures/models.py:1092 furnitures/models.py:1128 +#: templates/sheet_file.html:94 msgid "End date" msgstr "Date de fin" -#: furnitures/forms.py:1872 furnitures/forms.py:1973 furnitures/models.py:552 +#: furnitures/forms.py:1919 furnitures/forms.py:2036 furnitures/models.py:658 msgid "Quality" msgstr "Qualité" -#: furnitures/forms.py:1874 furnitures/forms.py:1975 furnitures/models.py:538 -#: furnitures/models.py:550 +#: furnitures/forms.py:1921 furnitures/forms.py:2038 furnitures/models.py:644 +#: furnitures/models.py:656 msgid "Dating type" msgstr "Type de datation" -#: furnitures/forms.py:1882 furnitures/forms.py:1887 furnitures/models.py:597 +#: furnitures/forms.py:1929 furnitures/forms.py:1936 furnitures/models.py:726 +#: templates/sheet_contextrecord.html:32 msgid "Interpretation" msgstr "Interpretation" -#: furnitures/forms.py:1883 +#: furnitures/forms.py:1932 msgid "Has furniture?" msgstr "A du matériel ?" -#: furnitures/forms.py:1885 furnitures/models.py:596 +#: furnitures/forms.py:1934 furnitures/models.py:725 msgid "Filling" msgstr "Remplissage" -#: furnitures/forms.py:1889 furnitures/models.py:599 +#: furnitures/forms.py:1938 furnitures/models.py:741 +msgid "Activity" +msgstr "Activité" + +#: furnitures/forms.py:1940 furnitures/models.py:739 +msgid "Identification" +msgstr "Identification" + +#: furnitures/forms.py:1942 furnitures/models.py:728 msgid "TAQ" msgstr "TAQ" -#: furnitures/forms.py:1890 furnitures/models.py:602 +#: furnitures/forms.py:1943 furnitures/models.py:731 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: furnitures/forms.py:1892 furnitures/models.py:604 +#: furnitures/forms.py:1945 furnitures/models.py:733 msgid "TPQ" msgstr "TPQ" -#: furnitures/forms.py:1893 furnitures/models.py:607 +#: furnitures/forms.py:1946 furnitures/models.py:736 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: furnitures/forms.py:1921 +#: furnitures/forms.py:1984 msgid "Would you like to delete this context record?" msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?" -#: furnitures/forms.py:1940 furnitures/models.py:660 furnitures/models.py:681 +#: furnitures/forms.py:2003 furnitures/models.py:813 furnitures/models.py:876 msgid "Base item" msgstr "Mobilier de base" -#: furnitures/forms.py:1942 -msgid "General label" -msgstr "Libellé général" +#: furnitures/forms.py:2005 +msgid "General ID" +msgstr "Identifiant général" -#: furnitures/forms.py:1944 +#: furnitures/forms.py:2007 msgid "General description" msgstr "Description générale" -#: furnitures/forms.py:1946 furnitures/forms.py:1997 furnitures/models.py:654 +#: furnitures/forms.py:2009 furnitures/forms.py:2060 furnitures/models.py:805 msgid "Is isolated?" msgstr "Est isolé ?" -#: furnitures/forms.py:1950 furnitures/forms.py:2000 furnitures/menus.py:193 -#: furnitures/models.py:699 furnitures/models.py:909 +#: furnitures/forms.py:2013 furnitures/forms.py:2063 furnitures/menus.py:193 +#: furnitures/models.py:894 furnitures/models.py:1123 msgid "Item" msgstr "Mobilier" -#: furnitures/forms.py:1954 furnitures/forms.py:2084 +#: furnitures/forms.py:2017 furnitures/forms.py:2151 msgid "Precise description" msgstr "Description précise" -#: furnitures/forms.py:1956 furnitures/forms.py:1996 furnitures/forms.py:2086 -#: furnitures/models.py:646 furnitures/models.py:687 +#: furnitures/forms.py:2019 furnitures/forms.py:2059 furnitures/forms.py:2153 +#: furnitures/models.py:797 furnitures/models.py:882 +#: templates/sheet_contextrecord.html:104 templates/sheet_operation.html:153 msgid "Material type" msgstr "Type de matériaux" -#: furnitures/forms.py:1958 furnitures/forms.py:2088 furnitures/models.py:688 -#: furnitures/models.py:803 +#: furnitures/forms.py:2021 furnitures/forms.py:2155 furnitures/models.py:883 +#: furnitures/models.py:1017 msgid "Volume" msgstr "Volume" -#: furnitures/forms.py:1959 furnitures/forms.py:2089 furnitures/models.py:689 +#: furnitures/forms.py:2022 furnitures/forms.py:2156 furnitures/models.py:884 +#: templates/sheet_contextrecord.html:108 templates/sheet_ope_modif.html:155 +#: templates/sheet_operation.html:157 msgid "Weight" msgstr "Poids" -#: furnitures/forms.py:1960 furnitures/forms.py:2090 furnitures/models.py:690 +#: furnitures/forms.py:2023 furnitures/forms.py:2157 furnitures/models.py:885 msgid "Item number" msgstr "Nombre d'artefacts" -#: furnitures/forms.py:2019 +#: furnitures/forms.py:2086 msgid "Base treatment" msgstr "Traitement de base" -#: furnitures/forms.py:2023 furnitures/models.py:864 furnitures/models.py:872 +#: furnitures/forms.py:2090 furnitures/models.py:1078 +#: furnitures/models.py:1086 msgid "Treatment type" msgstr "Type de traitement" -#: furnitures/forms.py:2042 +#: furnitures/forms.py:2109 msgid "Upstream items" msgstr "Mobilier amont" -#: furnitures/forms.py:2050 furnitures/models.py:818 furnitures/models.py:868 +#: furnitures/forms.py:2117 furnitures/models.py:1032 +#: furnitures/models.py:1082 msgid "Container" msgstr "Contenant" -#: furnitures/forms.py:2052 furnitures/models.py:804 furnitures/models.py:814 -#: templates/sheet_file.html:57 templates/sheet_file.html.py:77 -#: templates/sheet_file.html:105 templates/sheet_ope.html:84 +#: furnitures/forms.py:2119 furnitures/models.py:1018 +#: furnitures/models.py:1028 templates/sheet_file.html:69 +#: templates/sheet_file.html.py:89 templates/sheet_file.html:117 +#: templates/sheet_ope.html:84 templates/sheet_ope_modif.html:84 #: templates/sheet_operation.html:84 msgid "Reference" msgstr "Référence" -#: furnitures/forms.py:2053 furnitures/models.py:807 furnitures/models.py:813 +#: furnitures/forms.py:2120 furnitures/models.py:1021 +#: furnitures/models.py:1027 msgid "Container type" msgstr "Type de contenant" -#: furnitures/forms.py:2080 +#: furnitures/forms.py:2147 msgid "Resulting item" msgstr "Mobilier résultant" -#: furnitures/forms.py:2094 +#: furnitures/forms.py:2161 msgid "Resulting items" msgstr "Mobiliers résultants" -#: furnitures/forms.py:2098 +#: furnitures/forms.py:2164 msgid "Upstream item" msgstr "Mobilier amont" @@ -652,7 +681,7 @@ msgid "Account management" msgstr "Gestion des comptes" #: furnitures/menus.py:104 furnitures/menus.py:134 furnitures/menus.py:176 -#: furnitures/menus.py:195 furnitures/widgets.py:159 +#: furnitures/menus.py:195 furnitures/widgets.py:219 msgid "Search" msgstr "Recherche" @@ -661,13 +690,13 @@ msgstr "Recherche" msgid "Deletion" msgstr "Suppression" -#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:785 -#: furnitures/models.py:911 +#: furnitures/menus.py:116 furnitures/menus.py:155 furnitures/models.py:999 +#: furnitures/models.py:1125 msgid "Administrative act" msgstr "Acte administratif" -#: furnitures/menus.py:119 furnitures/menus.py:158 furnitures/widgets.py:121 -#: furnitures/widgets.py:192 templates/window.html:33 +#: furnitures/menus.py:119 furnitures/menus.py:158 furnitures/widgets.py:181 +#: furnitures/widgets.py:252 templates/window.html:33 msgid "Add" msgstr "Ajout" @@ -679,7 +708,7 @@ msgstr "Clotûre" msgid "Add a treatment" msgstr "Ajouter un traitement" -#: furnitures/menus.py:212 furnitures/models.py:738 +#: furnitures/menus.py:212 furnitures/models.py:952 msgid "Warehouse" msgstr "Dépôt" @@ -707,275 +736,303 @@ msgstr "Tableau de bord" msgid "Files" msgstr "Dossiers" -#: furnitures/menus.py:232 furnitures/models.py:462 +#: furnitures/menus.py:232 furnitures/models.py:569 msgid "Operations" msgstr "Opérations" -#: furnitures/menus.py:235 furnitures/models.py:883 +#: furnitures/menus.py:235 furnitures/models.py:1097 msgid "Treatments" msgstr "Traitements" -#: furnitures/menus.py:238 furnitures/models.py:739 +#: furnitures/menus.py:238 furnitures/models.py:953 msgid "Warehouses" msgstr "Dépôts" -#: furnitures/models.py:46 +#: furnitures/models.py:65 msgid "Not a valid item." msgstr "Mobilier invalide." -#: furnitures/models.py:56 +#: furnitures/models.py:75 msgid "This item already exist." msgstr "Ce mobilier existe déjà." -#: furnitures/models.py:109 -msgid "Textual identifier" +#: furnitures/models.py:127 furnitures/models.py:285 +msgid "Label" +msgstr "Libellé" + +#: furnitures/models.py:128 +msgid "Textual ID" msgstr "Identifiant textuel" -#: furnitures/models.py:112 +#: furnitures/models.py:131 msgid "Available" msgstr "Disponible" -#: furnitures/models.py:162 +#: furnitures/models.py:187 msgid "Last modifier" msgstr "Dernier modifieur" -#: furnitures/models.py:181 +#: furnitures/models.py:286 msgid "Number" msgstr "Nombre" -#: furnitures/models.py:184 +#: furnitures/models.py:289 msgid "Departement" msgstr "Département" -#: furnitures/models.py:185 +#: furnitures/models.py:290 msgid "Departements" msgstr "Départements" -#: furnitures/models.py:201 +#: furnitures/models.py:306 msgid "Mobile phone" msgstr "Téléphone portable" -#: furnitures/models.py:210 +#: furnitures/models.py:315 msgid "Organization type" msgstr "Type d'organisation" -#: furnitures/models.py:211 +#: furnitures/models.py:316 msgid "Organization types" msgstr "Types d'organisation" -#: furnitures/models.py:216 furnitures/models.py:246 furnitures/models.py:631 -#: templates/sheet_file.html:58 templates/sheet_file.html.py:79 -#: templates/sheet_file.html:106 templates/sheet_ope.html:85 -#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 -#: templates/sheet_operation.html:85 templates/sheet_operation.html.py:104 +#: furnitures/models.py:321 furnitures/models.py:351 furnitures/models.py:782 +#: templates/sheet_contextrecord.html:84 templates/sheet_file.html:70 +#: templates/sheet_file.html.py:91 templates/sheet_file.html:118 +#: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105 +#: templates/sheet_ope.html:126 templates/sheet_ope_modif.html:85 +#: templates/sheet_ope_modif.html.py:105 templates/sheet_ope_modif.html:126 +#: templates/sheet_operation.html:85 templates/sheet_operation.html.py:105 +#: templates/sheet_operation.html:125 msgid "Type" msgstr "Type" -#: furnitures/models.py:219 +#: furnitures/models.py:324 msgid "Organization" msgstr "Organisation" -#: furnitures/models.py:220 +#: furnitures/models.py:325 msgid "Organizations" msgstr "Organisations" -#: furnitures/models.py:222 +#: furnitures/models.py:327 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: furnitures/models.py:223 +#: furnitures/models.py:328 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: furnitures/models.py:224 +#: furnitures/models.py:329 msgid "Can change own Organization" msgstr "Peut changer sa propre Organisation" -#: furnitures/models.py:225 +#: furnitures/models.py:330 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: furnitures/models.py:234 +#: furnitures/models.py:339 msgid "Person types" msgstr "Types d'individu" -#: furnitures/models.py:237 +#: furnitures/models.py:342 msgid "Mr" msgstr "M" -#: furnitures/models.py:238 +#: furnitures/models.py:343 msgid "Miss" msgstr "Mlle" -#: furnitures/models.py:239 +#: furnitures/models.py:344 msgid "Mrs" msgstr "Mme" -#: furnitures/models.py:240 +#: furnitures/models.py:345 msgid "Doctor" msgstr "Dr" -#: furnitures/models.py:248 +#: furnitures/models.py:353 msgid "Is attached to" msgstr "Est rattaché à" -#: furnitures/models.py:256 +#: furnitures/models.py:361 msgid "Persons" msgstr "Individus" -#: furnitures/models.py:258 +#: furnitures/models.py:363 msgid "Can view Person" msgstr "Peut voir les Personnes" -#: furnitures/models.py:259 +#: furnitures/models.py:364 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: furnitures/models.py:260 +#: furnitures/models.py:365 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: furnitures/models.py:261 +#: furnitures/models.py:366 msgid "Can change own Person" msgstr "Peut changer sa propre Personne" -#: furnitures/models.py:262 +#: furnitures/models.py:367 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: furnitures/models.py:282 +#: furnitures/models.py:388 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: furnitures/models.py:283 +#: furnitures/models.py:389 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: furnitures/models.py:288 +#: furnitures/models.py:394 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: furnitures/models.py:289 +#: furnitures/models.py:395 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: furnitures/models.py:303 +#: furnitures/models.py:409 msgid "Permit types" msgstr "Types de permis" -#: furnitures/models.py:307 +#: furnitures/models.py:413 msgid "Delay (in days)" msgstr "Delai (en jours)" -#: furnitures/models.py:331 +#: furnitures/models.py:437 msgid "Is active?" msgstr "Est actif ?" -#: furnitures/models.py:342 +#: furnitures/models.py:448 msgid "Reference number" msgstr "Référence" -#: furnitures/models.py:357 +#: furnitures/models.py:463 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: furnitures/models.py:359 +#: furnitures/models.py:465 msgid "Can view own Archaelogical file" msgstr "Peut voir son propre Dossier archéologique" -#: furnitures/models.py:360 +#: furnitures/models.py:466 msgid "Can add own Archaelogical file" msgstr "Peut ajouter son propre Dossier archéologique" -#: furnitures/models.py:361 +#: furnitures/models.py:467 msgid "Can change own Archaelogical file" msgstr "Peut changer son propre Dossier archéologique" -#: furnitures/models.py:362 +#: furnitures/models.py:468 msgid "Can delete own Archaelogical file" msgstr "Peut supprimer son propre Dossier archéologique" -#: furnitures/models.py:367 furnitures/models.py:471 +#: furnitures/models.py:473 furnitures/models.py:578 msgid "Intercommunal" msgstr "Intercommunal" -#: furnitures/models.py:410 +#: furnitures/models.py:516 msgid "Operation types" msgstr "Types d'opération" -#: furnitures/models.py:432 templates/sheet_file.html:80 +#: furnitures/models.py:538 templates/sheet_file.html:92 msgid "In charge" msgstr "Responsable" -#: furnitures/models.py:436 furnitures/models.py:498 +#: furnitures/models.py:542 furnitures/models.py:605 msgid "File" msgstr "Dossier" -#: furnitures/models.py:464 +#: furnitures/models.py:545 +msgid "Surface (m²)" +msgstr "Area (m²)" + +#: furnitures/models.py:571 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: furnitures/models.py:465 +#: furnitures/models.py:572 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: furnitures/models.py:466 +#: furnitures/models.py:573 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: furnitures/models.py:467 +#: furnitures/models.py:574 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: furnitures/models.py:523 furnitures/models.py:563 furnitures/models.py:683 +#: furnitures/models.py:629 furnitures/models.py:673 furnitures/models.py:685 +#: furnitures/models.py:695 furnitures/models.py:878 msgid "Order" msgstr "Ordre" -#: furnitures/models.py:526 +#: furnitures/models.py:632 msgid "Parent period" msgstr "Période parente" -#: furnitures/models.py:530 +#: furnitures/models.py:636 msgid "Type Period" msgstr "Type de période" -#: furnitures/models.py:531 +#: furnitures/models.py:637 msgid "Types Period" msgstr "Types de période" -#: furnitures/models.py:539 +#: furnitures/models.py:645 msgid "Dating types" msgstr "Types de datation" -#: furnitures/models.py:543 +#: furnitures/models.py:649 msgid "Dating quality" msgstr "Qualité de datation" -#: furnitures/models.py:544 +#: furnitures/models.py:650 msgid "Dating qualities" msgstr "Qualités de datation" -#: furnitures/models.py:557 +#: furnitures/models.py:663 msgid "Datings" msgstr "Datations" -#: furnitures/models.py:564 +#: furnitures/models.py:674 msgid "Parent unit" msgstr "Unité parente" -#: furnitures/models.py:568 +#: furnitures/models.py:678 msgid "Type Unit" msgstr "Type d'unité" -#: furnitures/models.py:569 +#: furnitures/models.py:679 msgid "Types Unit" msgstr "Types d'unité" -#: furnitures/models.py:590 +#: furnitures/models.py:688 +msgid "Type Activity" +msgstr "Type d'activité" + +#: furnitures/models.py:689 +msgid "Types Activity" +msgstr "Types d'activités" + +#: furnitures/models.py:697 +msgid "Type Identification" +msgstr "Type d'identification" + +#: furnitures/models.py:698 +msgid "Types Identification" +msgstr "Types d'identification" + +#: furnitures/models.py:719 msgid "A short description of the location of the context record" msgstr "Une courte description de la situation de l'Unité d'Enregistrement" -#: furnitures/models.py:600 +#: furnitures/models.py:729 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -983,11 +1040,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été crée après " "cette date" -#: furnitures/models.py:603 +#: furnitures/models.py:732 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: furnitures/models.py:605 +#: furnitures/models.py:734 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -995,245 +1052,255 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été crée avant " "cette date" -#: furnitures/models.py:608 +#: furnitures/models.py:737 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: furnitures/models.py:612 furnitures/models.py:613 furnitures/models.py:653 +#: furnitures/models.py:745 furnitures/models.py:746 furnitures/models.py:804 +#: templates/sheet_contextrecord.html:6 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: furnitures/models.py:615 +#: furnitures/models.py:748 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: furnitures/models.py:616 +#: furnitures/models.py:749 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: furnitures/models.py:617 +#: furnitures/models.py:750 msgid "Can change own Context Record" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: furnitures/models.py:618 +#: furnitures/models.py:751 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: furnitures/models.py:626 +#: furnitures/models.py:777 msgid "Source type" msgstr "Type de source" -#: furnitures/models.py:627 +#: furnitures/models.py:778 msgid "Source types" msgstr "Types de source" -#: furnitures/models.py:634 furnitures/models.py:898 +#: furnitures/models.py:785 furnitures/models.py:1112 msgid "Source" msgstr "Source" -#: furnitures/models.py:635 +#: furnitures/models.py:786 msgid "Sources" msgstr "Sources" -#: furnitures/models.py:641 +#: furnitures/models.py:792 msgid "Recommendation" msgstr "Recommendation" -#: furnitures/models.py:643 +#: furnitures/models.py:794 msgid "Parent material" msgstr "Matériau parent" -#: furnitures/models.py:647 +#: furnitures/models.py:798 msgid "Material types" msgstr "Types de matériaux" -#: furnitures/models.py:661 +#: furnitures/models.py:814 msgid "Base items" msgstr "Mobiliers de base" -#: furnitures/models.py:663 +#: furnitures/models.py:816 msgid "Can view own Base item" msgstr "Peut voir son propre Mobilier de base" -#: furnitures/models.py:664 +#: furnitures/models.py:817 msgid "Can add own Base item" msgstr "Peut ajouter son propre Mobilier de base" -#: furnitures/models.py:665 +#: furnitures/models.py:818 msgid "Can change own Base item" msgstr "Peut changer son propre Mobilier de base" -#: furnitures/models.py:666 +#: furnitures/models.py:819 msgid "Can delete own Base item" msgstr "Peut supprimer son propre Mobilier de base" -#: furnitures/models.py:692 +#: furnitures/models.py:835 +msgid ":" +msgstr ": " + +#: furnitures/models.py:887 msgid "Upstream treatment" msgstr "Traitement amont" -#: furnitures/models.py:694 +#: furnitures/models.py:889 msgid "Downstream treatment" msgstr "Traitement aval" -#: furnitures/models.py:700 +#: furnitures/models.py:895 msgid "Items" msgstr "Mobiliers" -#: furnitures/models.py:702 +#: furnitures/models.py:897 msgid "Can view own Item" msgstr "Peut voir son propre Mobilier" -#: furnitures/models.py:703 +#: furnitures/models.py:898 msgid "Can add own Item" msgstr "Peut ajouter son propre Mobilier" -#: furnitures/models.py:704 +#: furnitures/models.py:899 msgid "Can change own Item" msgstr "Peut changer son propre Mobilier" -#: furnitures/models.py:705 +#: furnitures/models.py:900 msgid "Can delete own Item" msgstr "Peut supprimer son propre Mobilier" -#: furnitures/models.py:712 templates/sheet_ope.html:64 +#: furnitures/models.py:926 templates/sheet_ope.html:64 +#: templates/sheet_ope_modif.html:64 msgid "Owner" msgstr "Propriétaire" -#: furnitures/models.py:718 +#: furnitures/models.py:932 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: furnitures/models.py:719 +#: furnitures/models.py:933 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: furnitures/models.py:727 +#: furnitures/models.py:941 msgid "Warehouse types" msgstr "Types de dépôts" -#: furnitures/models.py:741 +#: furnitures/models.py:955 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: furnitures/models.py:742 +#: furnitures/models.py:956 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: furnitures/models.py:743 +#: furnitures/models.py:957 msgid "Can change own Warehouse" msgstr "Peut changer son propre Dépôt" -#: furnitures/models.py:744 +#: furnitures/models.py:958 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: furnitures/models.py:754 +#: furnitures/models.py:968 msgid "Intended to" msgstr "Destiné à" -#: furnitures/models.py:758 +#: furnitures/models.py:972 msgid "Act types" msgstr "Types d'acte" -#: furnitures/models.py:769 +#: furnitures/models.py:983 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: furnitures/models.py:771 +#: furnitures/models.py:985 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: furnitures/models.py:786 +#: furnitures/models.py:1000 msgid "Administrative acts" msgstr "Actes administratifs" -#: furnitures/models.py:788 +#: furnitures/models.py:1002 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: furnitures/models.py:789 +#: furnitures/models.py:1003 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: furnitures/models.py:790 +#: furnitures/models.py:1004 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: furnitures/models.py:791 +#: furnitures/models.py:1005 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: furnitures/models.py:802 +#: furnitures/models.py:1016 msgid "Height" msgstr "Hauteur" -#: furnitures/models.py:808 +#: furnitures/models.py:1022 msgid "Container types" msgstr "Types de contenant" -#: furnitures/models.py:819 +#: furnitures/models.py:1033 msgid "Containers" msgstr "Contenants" -#: furnitures/models.py:838 +#: furnitures/models.py:1052 msgid "Surface" msgstr "Surface" -#: furnitures/models.py:839 templates/sheet_file.html:31 +#: furnitures/models.py:1053 templates/sheet_contextrecord.html:72 +#: templates/sheet_contextrecord.html:86 templates/sheet_file.html:43 #: templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 -#: templates/sheet_operation.html:46 +#: templates/sheet_ope_modif.html:46 templates/sheet_ope_modif.html.py:107 +#: templates/sheet_operation.html:46 templates/sheet_operation.html.py:107 msgid "Localisation" msgstr "Localisation" -#: furnitures/models.py:862 +#: furnitures/models.py:1076 msgid "Virtual" msgstr "Virtuel" -#: furnitures/models.py:865 +#: furnitures/models.py:1079 msgid "Treatment types" msgstr "Types de traitements" -#: furnitures/models.py:882 +#: furnitures/models.py:1096 msgid "Treatment" msgstr "Traitement" -#: furnitures/models.py:885 +#: furnitures/models.py:1099 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: furnitures/models.py:886 +#: furnitures/models.py:1100 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: furnitures/models.py:887 +#: furnitures/models.py:1101 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: furnitures/models.py:888 +#: furnitures/models.py:1102 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: furnitures/models.py:893 furnitures/models.py:899 +#: furnitures/models.py:1107 furnitures/models.py:1113 msgid "Author type" msgstr "Type d'auteur" -#: furnitures/models.py:894 +#: furnitures/models.py:1108 msgid "Author types" msgstr "Types d'auteur" -#: furnitures/models.py:902 +#: furnitures/models.py:1116 msgid "Author" msgstr "Auteur" -#: furnitures/models.py:903 templates/sheet_ope.html:106 +#: furnitures/models.py:1117 templates/sheet_contextrecord.html:85 +#: templates/sheet_ope.html:106 templates/sheet_ope_modif.html:106 +#: templates/sheet_operation.html:106 msgid "Authors" msgstr "Auteurs" -#: furnitures/models.py:917 +#: furnitures/models.py:1131 msgid "Property" msgstr "Propriété" -#: furnitures/models.py:918 +#: furnitures/models.py:1132 msgid "Properties" msgstr "Propriétés" @@ -1245,16 +1312,18 @@ msgstr "Oui" msgid "False" msgstr "Non" -#: furnitures/views.py:229 templates/sheet_file.html:94 -#: templates/sheet_ope.html:139 templates/sheet_operation.html:118 +#: furnitures/views.py:255 templates/sheet_contextrecord.html:128 +#: templates/sheet_file.html:106 templates/sheet_ope.html:139 +#: templates/sheet_ope_modif.html:139 templates/sheet_ope_modif.html.py:175 +#: templates/sheet_operation.html:139 templates/sheet_operation.html.py:179 msgid "Details" msgstr "Détails" -#: furnitures/views.py:449 furnitures/views.py:479 +#: furnitures/views.py:511 furnitures/views.py:541 msgid "Operation not permitted." msgstr "Opération non permise" -#: furnitures/views.py:452 +#: furnitures/views.py:514 msgid "New " msgstr "Nouveau " @@ -1262,23 +1331,23 @@ msgstr "Nouveau " msgid "Delete" msgstr "Supprimer" -#: furnitures/widgets.py:159 +#: furnitures/widgets.py:219 msgid "Search and select an item" msgstr "Rechercher puis sélectionner un Mobilier" -#: furnitures/widgets.py:186 +#: furnitures/widgets.py:246 msgid "Export as CSV" msgstr "Export en CSV" -#: furnitures/widgets.py:197 +#: furnitures/widgets.py:257 msgid "No results" msgstr "Pas de résultats" -#: furnitures/widgets.py:197 +#: furnitures/widgets.py:257 msgid "Loading..." msgstr "Chargement..." -#: furnitures/widgets.py:198 +#: furnitures/widgets.py:258 msgid "Remove" msgstr "Enlever" @@ -1313,324 +1382,515 @@ msgid "Would you like to save them?" msgstr "Voulez vous sauver ces informations ?" #: templates/confirm_wizard.html:30 templates/default_wizard.html:17 -#: templates/default_wizard.html.py:33 +#: templates/default_wizard.html.py:33 templates/search.html:13 msgid "Validate" msgstr "Valider" -#: templates/default_wizard.html:24 +#: templates/default_wizard.html:24 templates/search.html:20 msgid "Add/Modify" msgstr "Ajouter-Modifier" -#: templates/sheet.html:18 +#: templates/sheet.html:19 msgid "Close" msgstr "Fermer" -#: templates/sheet.html:20 +#: templates/sheet.html:21 msgid "Close all windows" msgstr "Fermer toutes les fenêtres" -#: templates/sheet_file.html:4 templates/sheet_ope.html:4 +#: templates/sheet_contextrecord.html:4 templates/sheet_file.html:16 +#: templates/sheet_ope.html:4 templates/sheet_ope_modif.html:4 #: templates/sheet_operation.html:4 msgid "Export as:" msgstr "Export en :" -#: templates/sheet_file.html:4 templates/sheet_ope.html:4 +#: templates/sheet_contextrecord.html:4 templates/sheet_file.html:16 +#: templates/sheet_ope.html:4 templates/sheet_ope_modif.html:4 #: templates/sheet_operation.html:4 msgid "OpenOffice.org file" msgstr "fichier OpenOffice.org" -#: templates/sheet_file.html:4 templates/sheet_ope.html:4 +#: templates/sheet_contextrecord.html:4 templates/sheet_file.html:16 +#: templates/sheet_ope.html:4 templates/sheet_ope_modif.html:4 #: templates/sheet_operation.html:4 msgid "PDF file" msgstr "fichier PDF" -#: templates/sheet_file.html:6 templates/sheet_ope.html:6 +#: templates/sheet_contextrecord.html:9 +msgid "Complete ID:" +msgstr "Identifiant complet :" + +#: templates/sheet_contextrecord.html:11 templates/sheet_contextrecord.html:54 +#: templates/sheet_operation.html:10 +msgid "Patriarche OA code not yet recorded!" +msgstr "Code Patriarche pas encore enregistré !" + +#: templates/sheet_contextrecord.html:12 +msgid "Temporary ID:" +msgstr "Identifiant temporaire :" + +#: templates/sheet_contextrecord.html:16 templates/sheet_contextrecord.html:68 +#: templates/sheet_file.html:38 templates/sheet_ope.html:24 +#: templates/sheet_ope_modif.html:24 templates/sheet_operation.html:24 +msgid "Type:" +msgstr "Type :" + +#: templates/sheet_contextrecord.html:18 +msgid "Chronology:" +msgstr "Chronologie :" + +#: templates/sheet_contextrecord.html:19 +msgid "Place:" +msgstr "Lieu :" + +#: templates/sheet_contextrecord.html:20 +msgid "Parcel:" +msgstr "Parcelle :" + +#: templates/sheet_contextrecord.html:25 +msgid "Description:" +msgstr "Description :" + +#: templates/sheet_contextrecord.html:26 +msgid "Length (cm):" +msgstr "Longueur (cm) :" + +#: templates/sheet_contextrecord.html:27 +msgid "Width (cm):" +msgstr "Largeur (cm) :" + +#: templates/sheet_contextrecord.html:28 +msgid "Depth (cm):" +msgstr "Profondeur (cm) :" + +#: templates/sheet_contextrecord.html:34 +msgid "Activity:" +msgstr "Activité :" + +#: templates/sheet_contextrecord.html:35 +msgid "Identification:" +msgstr "Identification :" + +#: templates/sheet_contextrecord.html:36 +msgid "Interpretation:" +msgstr "Interpretation :" + +#: templates/sheet_contextrecord.html:40 +msgid "Datations" +msgstr "Datations" + +#: templates/sheet_contextrecord.html:41 +msgid "TAQ:" +msgstr "TAQ :" + +#: templates/sheet_contextrecord.html:42 +msgid "TAQ estimated:" +msgstr "TAQ estimé :" + +#: templates/sheet_contextrecord.html:43 +msgid "TPQ:" +msgstr "TPQ :" + +#: templates/sheet_contextrecord.html:44 +msgid "TPQ estimated:" +msgstr "TPQ estimé :" + +#: templates/sheet_contextrecord.html:48 +msgid "Operation resume" +msgstr "Résumé de l'opération" + +#: templates/sheet_contextrecord.html:49 templates/sheet_file.html:18 +#: templates/sheet_ope.html:6 templates/sheet_ope_modif.html:6 #: templates/sheet_operation.html:6 msgid "Year:" msgstr "Année :" -#: templates/sheet_file.html:7 templates/sheet_ope.html:7 +#: templates/sheet_contextrecord.html:50 templates/sheet_file.html:19 +#: templates/sheet_ope.html:7 templates/sheet_ope_modif.html:7 #: templates/sheet_operation.html:7 msgid "Numerical reference:" msgstr "Référence numérique :" -#: templates/sheet_file.html:9 -msgid "File's name:" -msgstr "Nom du dossier archéologique :" - -#: templates/sheet_file.html:11 templates/sheet_ope.html:14 -#: templates/sheet_operation.html:14 -msgid "Edition date:" -msgstr "Date d'édition :" - -#: templates/sheet_file.html:12 -msgid "Reception date:" -msgstr "Date de réception :" - -#: templates/sheet_file.html:13 -msgid "Creation date:" -msgstr "Date de création :" +#: templates/sheet_contextrecord.html:52 templates/sheet_ope.html:9 +#: templates/sheet_ope_modif.html:9 templates/sheet_operation.html:9 +msgid "Patriarche OA code:" +msgstr "Code Patriarche :" -#: templates/sheet_file.html:16 -msgid "Deadline:" -msgstr "Date d'échéance :" +#: templates/sheet_contextrecord.html:56 templates/sheet_ope.html:12 +#: templates/sheet_ope_modif.html:12 +msgid "Operation's name:" +msgstr "Nom de l'opération" -#: templates/sheet_file.html:20 -msgid "In charge:" -msgstr "Responsable :" +#: templates/sheet_contextrecord.html:58 templates/sheet_ope.html:19 +#: templates/sheet_ope_modif.html:19 templates/sheet_operation.html:19 +msgid "Head scientist:" +msgstr "Responsable scientifique :" -#: templates/sheet_file.html:21 templates/sheet_ope.html:20 +#: templates/sheet_contextrecord.html:60 templates/sheet_file.html:33 +#: templates/sheet_ope.html:20 templates/sheet_ope_modif.html:20 #: templates/sheet_operation.html:20 msgid "State:" msgstr "État :" -#: templates/sheet_file.html:21 templates/sheet_ope.html:20 +#: templates/sheet_contextrecord.html:62 templates/sheet_file.html:33 +#: templates/sheet_ope.html:20 templates/sheet_ope_modif.html:20 #: templates/sheet_operation.html:20 msgid "Active file" msgstr "Dossier archéologique actif" -#: templates/sheet_file.html:22 -msgid "Closed file" -msgstr "Dossier archéologique clos" +#: templates/sheet_contextrecord.html:64 templates/sheet_ope.html:21 +#: templates/sheet_ope_modif.html:21 templates/sheet_operation.html:21 +msgid "Closed operation" +msgstr "Opération fermée" -#: templates/sheet_file.html:23 templates/sheet_ope.html:22 +#: templates/sheet_contextrecord.html:65 templates/sheet_file.html:35 +#: templates/sheet_ope.html:22 templates/sheet_ope_modif.html:22 #: templates/sheet_operation.html:22 msgid "Closing date:" msgstr "Date de clotûre :" -#: templates/sheet_file.html:23 templates/sheet_ope.html:22 +#: templates/sheet_contextrecord.html:66 templates/sheet_file.html:35 +#: templates/sheet_ope.html:22 templates/sheet_ope_modif.html:22 #: templates/sheet_operation.html:22 msgid "by" msgstr "par" -#: templates/sheet_file.html:26 templates/sheet_ope.html:24 -#: templates/sheet_operation.html:24 -msgid "Type:" -msgstr "Type :" +#: templates/sheet_contextrecord.html:69 templates/sheet_ope.html:29 +#: templates/sheet_ope_modif.html:29 templates/sheet_operation.html:29 +msgid "Remains:" +msgstr "Vestiges :" -#: templates/sheet_file.html:28 templates/sheet_ope.html:33 -msgid "Related file:" -msgstr "Dossier en relation avec :" +#: templates/sheet_contextrecord.html:70 templates/sheet_ope.html:30 +#: templates/sheet_ope_modif.html:30 templates/sheet_operation.html:30 +msgid "Periods:" +msgstr "Périodes :" -#: templates/sheet_file.html:29 templates/sheet_ope.html:44 +#: templates/sheet_contextrecord.html:71 templates/sheet_file.html:41 +#: templates/sheet_ope.html:44 templates/sheet_ope_modif.html:44 #: templates/sheet_operation.html:44 msgid "Comment:" msgstr "Commentaire :" -#: templates/sheet_file.html:32 templates/sheet_ope.html:47 +#: templates/sheet_contextrecord.html:73 templates/sheet_file.html:44 +#: templates/sheet_ope.html:47 templates/sheet_ope_modif.html:47 #: templates/sheet_operation.html:47 msgid "Towns:" msgstr "Communes :" -#: templates/sheet_file.html:34 templates/sheet_ope.html:49 -#: templates/sheet_operation.html:49 +#: templates/sheet_contextrecord.html:74 +msgid "Related operation:" +msgstr "Operation associée :" + +#: templates/sheet_contextrecord.html:77 +msgid "No operation linked to this context unit!" +msgstr "Pas d'opération associée à ce Unité d'Enregistrement" + +#: templates/sheet_contextrecord.html:81 templates/sheet_ope.html:102 +#: templates/sheet_ope_modif.html:102 templates/sheet_operation.html:102 +msgid "Documents" +msgstr "Documents" + +#: templates/sheet_contextrecord.html:96 +msgid "No document associated to this context record" +msgstr "Pas d'opération associée à cette Unité d'enregistrement" + +#: templates/sheet_contextrecord.html:101 templates/sheet_ope_modif.html:146 +#: templates/sheet_ope_modif.html.py:148 templates/sheet_operation.html:150 +msgid "Finds" +msgstr "Mobilier" + +#: templates/sheet_contextrecord.html:103 templates/sheet_operation.html:152 +msgid "Find" +msgstr "Mobilier" + +#: templates/sheet_contextrecord.html:109 templates/sheet_ope_modif.html:156 +#: templates/sheet_operation.html:158 +msgid "Numbers" +msgstr "Nombre" + +#: templates/sheet_contextrecord.html:132 templates/sheet_ope_modif.html:178 +msgid "No find associated to this operation" +msgstr "Pas de mobilier associé à cette opération" + +#: templates/sheet_file.html:7 +msgid "Previous version" +msgstr "Version précédente" + +#: templates/sheet_file.html:11 +msgid "Are you sure to rollback to this version?" +msgstr "" +"Voulez vous annuler les modifications faites pour revenir à cette version ?" + +#: templates/sheet_file.html:12 +msgid "Next version" +msgstr "Version suivante" + +#: templates/sheet_file.html:21 +msgid "File's name:" +msgstr "Nom du dossier archéologique :" + +#: templates/sheet_file.html:23 templates/sheet_ope.html:14 +#: templates/sheet_ope_modif.html:14 templates/sheet_operation.html:14 +msgid "Edition date:" +msgstr "Date d'édition :" + +#: templates/sheet_file.html:24 +msgid "Reception date:" +msgstr "Date de réception :" + +#: templates/sheet_file.html:25 +msgid "Creation date:" +msgstr "Date de création :" + +#: templates/sheet_file.html:28 +msgid "Deadline:" +msgstr "Date d'échéance :" + +#: templates/sheet_file.html:32 +msgid "In charge:" +msgstr "Responsable :" + +#: templates/sheet_file.html:34 +msgid "Closed file" +msgstr "Dossier archéologique clos" + +#: templates/sheet_file.html:40 templates/sheet_ope.html:33 +#: templates/sheet_ope_modif.html:33 +msgid "Related file:" +msgstr "Dossier en relation avec :" + +#: templates/sheet_file.html:46 templates/sheet_ope.html:49 +#: templates/sheet_ope_modif.html:49 templates/sheet_operation.html:49 msgid "Main address:" msgstr "Adresse principale :" -#: templates/sheet_file.html:35 templates/sheet_ope.html:50 -#: templates/sheet_operation.html:50 +#: templates/sheet_file.html:47 templates/sheet_ope.html:50 +#: templates/sheet_ope_modif.html:50 templates/sheet_operation.html:50 msgid "Complement:" msgstr "Complément :" -#: templates/sheet_file.html:36 templates/sheet_ope.html:51 -#: templates/sheet_operation.html:51 +#: templates/sheet_file.html:48 templates/sheet_ope.html:51 +#: templates/sheet_ope_modif.html:51 templates/sheet_operation.html:51 msgid "Postal code:" msgstr "Code postal :" -#: templates/sheet_file.html:38 templates/sheet_ope.html:25 +#: templates/sheet_file.html:50 templates/sheet_ope.html:25 +#: templates/sheet_ope_modif.html:25 msgid "Surface:" msgstr "Surface :" -#: templates/sheet_file.html:43 +#: templates/sheet_file.html:55 msgid "Preventive archaelogical file" msgstr "Dossier d'archéologie préventive" -#: templates/sheet_file.html:44 +#: templates/sheet_file.html:56 msgid "Planed surface:" msgstr "Surface envisagé :" -#: templates/sheet_file.html:45 +#: templates/sheet_file.html:57 msgid "Saisine type:" msgstr "Type de saisine :" -#: templates/sheet_file.html:46 templates/sheet_ope.html:36 -#: templates/sheet_operation.html:36 +#: templates/sheet_file.html:58 templates/sheet_ope.html:36 +#: templates/sheet_ope_modif.html:36 templates/sheet_operation.html:36 msgid "Town planning service:" msgstr "Service instructeur :" -#: templates/sheet_file.html:47 templates/sheet_ope.html:37 -#: templates/sheet_operation.html:37 +#: templates/sheet_file.html:59 templates/sheet_ope.html:37 +#: templates/sheet_ope_modif.html:37 templates/sheet_operation.html:37 msgid "Permit type:" msgstr "Type de permis :" -#: templates/sheet_file.html:48 templates/sheet_ope.html:38 -#: templates/sheet_operation.html:38 +#: templates/sheet_file.html:60 templates/sheet_ope.html:38 +#: templates/sheet_ope_modif.html:38 templates/sheet_operation.html:38 msgid "Permit reference:" msgstr "Référence du permis :" -#: templates/sheet_file.html:49 templates/sheet_ope.html:39 -#: templates/sheet_operation.html:39 +#: templates/sheet_file.html:61 templates/sheet_ope.html:39 +#: templates/sheet_ope_modif.html:39 templates/sheet_operation.html:39 msgid "General contractor organisation:" msgstr "Organisation de l'aménageur :" -#: templates/sheet_file.html:50 templates/sheet_ope.html:40 -#: templates/sheet_operation.html:40 +#: templates/sheet_file.html:62 templates/sheet_ope.html:40 +#: templates/sheet_ope_modif.html:40 templates/sheet_operation.html:40 msgid "General contractor:" msgstr "Aménageur :" -#: templates/sheet_file.html:54 templates/sheet_ope.html:79 -#: templates/sheet_ope.html.py:81 templates/sheet_operation.html:81 +#: templates/sheet_file.html:66 templates/sheet_ope.html:79 +#: templates/sheet_ope.html.py:81 templates/sheet_ope_modif.html:79 +#: templates/sheet_ope_modif.html.py:81 templates/sheet_operation.html:81 msgid "Admninistrative acts" msgstr "Actes administratifs" -#: templates/sheet_file.html:59 templates/sheet_file.html.py:107 -#: templates/sheet_ope.html:86 templates/sheet_operation.html:86 +#: templates/sheet_file.html:71 templates/sheet_file.html.py:119 +#: templates/sheet_ope.html:86 templates/sheet_ope_modif.html:86 +#: templates/sheet_operation.html:86 msgid "Date" msgstr "Date" -#: templates/sheet_file.html:69 +#: templates/sheet_file.html:81 msgid "No administrative act associated to this archaelogical file" msgstr "Pas d'acte administratif associé à ce dosser" -#: templates/sheet_file.html:97 +#: templates/sheet_file.html:109 msgid "No operation associated to this archaelogical file" msgstr "Pas d'opération associée à ce dosser" -#: templates/sheet_file.html:102 +#: templates/sheet_file.html:114 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés aux opérations" -#: templates/sheet_file.html:117 +#: templates/sheet_file.html:129 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé aux opérations" -#: templates/sheet_ope.html:9 templates/sheet_operation.html:9 -msgid "Patriarche OA code:" -msgstr "Code Patriarche :" - -#: templates/sheet_ope.html:10 +#: templates/sheet_ope.html:10 templates/sheet_ope_modif.html:10 msgid "Patriarche OA code not yet recorded !" msgstr "Code Patriarche pas encore enregistré !" -#: templates/sheet_ope.html:12 -msgid "Operation's name:" -msgstr "Nom de l'opération" - -#: templates/sheet_ope.html:16 templates/sheet_operation.html:16 +#: templates/sheet_ope.html:16 templates/sheet_ope_modif.html:16 +#: templates/sheet_operation.html:16 msgid "Begining date:" msgstr "Date de début :" -#: templates/sheet_ope.html:17 templates/sheet_operation.html:17 +#: templates/sheet_ope.html:17 templates/sheet_ope_modif.html:17 +#: templates/sheet_operation.html:17 msgid "Field work end date:" msgstr "Date de fin de travail sur le terrain :" -#: templates/sheet_ope.html:19 templates/sheet_operation.html:19 -msgid "Head scientist:" -msgstr "Responsable scientifique :" - -#: templates/sheet_ope.html:21 templates/sheet_operation.html:21 -msgid "Closed operation" -msgstr "Opération fermée" - -#: templates/sheet_ope.html:26 templates/sheet_operation.html:26 +#: templates/sheet_ope.html:26 templates/sheet_ope_modif.html:26 +#: templates/sheet_operation.html:26 msgid "Cost:" msgstr "Coût :" -#: templates/sheet_ope.html:27 templates/sheet_operation.html:27 +#: templates/sheet_ope.html:27 templates/sheet_ope_modif.html:27 +#: templates/sheet_operation.html:27 msgid "Duration:" msgstr "Durée :" -#: templates/sheet_ope.html:27 templates/sheet_operation.html:27 +#: templates/sheet_ope.html:27 templates/sheet_ope_modif.html:27 +#: templates/sheet_operation.html:27 msgid "Day" msgstr "Jour" -#: templates/sheet_ope.html:29 templates/sheet_operation.html:29 -msgid "Remains:" -msgstr "Vestiges :" - -#: templates/sheet_ope.html:30 templates/sheet_operation.html:30 -msgid "Periods:" -msgstr "Périodes :" - -#: templates/sheet_ope.html:35 +#: templates/sheet_ope.html:35 templates/sheet_ope_modif.html:35 msgid "Operator's reference code:" msgstr "Référence de l'opérateur :" -#: templates/sheet_ope.html:53 templates/sheet_operation.html:54 +#: templates/sheet_ope.html:53 templates/sheet_ope_modif.html:53 +#: templates/sheet_operation.html:54 msgid "Lambert X:" msgstr "Lambert X :" -#: templates/sheet_ope.html:54 templates/sheet_operation.html:55 +#: templates/sheet_ope.html:54 templates/sheet_ope_modif.html:54 +#: templates/sheet_operation.html:55 msgid "Lambert Y:" msgstr "Lambert Y :" -#: templates/sheet_ope.html:55 templates/sheet_operation.html:56 +#: templates/sheet_ope.html:55 templates/sheet_ope_modif.html:55 +#: templates/sheet_operation.html:56 msgid "Altitude (m NGF):" msgstr "Altitude (m NGF):" -#: templates/sheet_ope.html:58 templates/sheet_operation.html:59 +#: templates/sheet_ope.html:58 templates/sheet_ope_modif.html:58 +#: templates/sheet_operation.html:59 msgid "Associated parcels" msgstr "Parcelles associées" -#: templates/sheet_ope.html:60 templates/sheet_operation.html:61 +#: templates/sheet_ope.html:60 templates/sheet_ope_modif.html:60 +#: templates/sheet_operation.html:61 msgid "Commune" msgstr "Commune" -#: templates/sheet_ope.html:75 templates/sheet_operation.html:76 +#: templates/sheet_ope.html:75 templates/sheet_ope_modif.html:75 +#: templates/sheet_operation.html:76 templates/sheet_operation.html.py:189 msgid "No parcel associated to this operation" msgstr "Pas de parcelle associée à cette opération" -#: templates/sheet_ope.html:96 templates/sheet_operation.html:96 +#: templates/sheet_ope.html:96 templates/sheet_ope_modif.html:96 +#: templates/sheet_operation.html:96 msgid "No administrative act associated to this operation" msgstr "Pas d'acte administratif associé aux opérations" -#: templates/sheet_ope.html:100 +#: templates/sheet_ope.html:100 templates/sheet_ope_modif.html:100 +#: templates/sheet_operation.html:100 msgid "Documentation" msgstr "Documentation" -#: templates/sheet_ope.html:102 -msgid "Documents" -msgstr "Documents" - -#: templates/sheet_ope.html:117 +#: templates/sheet_ope.html:117 templates/sheet_ope_modif.html:117 +#: templates/sheet_operation.html:117 msgid "No document associated to this operation" msgstr "Pas d'opération associée à cette opération" #: templates/sheet_ope.html:121 templates/sheet_ope.html.py:123 +#: templates/sheet_ope_modif.html:121 templates/sheet_ope_modif.html.py:123 msgid "Recording Units" msgstr "Unités d'Enregistrement :" -#: templates/sheet_ope.html:127 templates/sheet_operation.html:105 +#: templates/sheet_ope.html:127 templates/sheet_ope_modif.html:127 +#: templates/sheet_operation.html:126 msgid "Chronology" msgstr "Chronologie" -#: templates/sheet_ope.html:142 +#: templates/sheet_ope.html:142 templates/sheet_ope_modif.html:142 msgid "No recording unit associated to this operation" msgstr "Pas d'Unité d'Enregistrement associée à ce dosser" -#: templates/sheet_operation.html:10 -msgid "Patriarche OA code not yet recorded!" -msgstr "Code Patriarche pas encore enregistré !" +#: templates/sheet_ope_modif.html:150 +msgid "Find_complete_Label" +msgstr "" + +#: templates/sheet_ope_modif.html:151 +msgid "Find_complete_material_type_Label" +msgstr "" + +#: templates/sheet_ope_modif.html:152 +msgid "Context_record" +msgstr "Unité d'Enregistrement" + +#: templates/sheet_ope_modif.html:163 +msgid "find.complete_label" +msgstr "" + +#: templates/sheet_ope_modif.html:164 +msgid "find.not_patriarche_complete_label" +msgstr "" + +#: templates/sheet_ope_modif.html:166 +msgid "find.material_type_complete_label" +msgstr "" + +#: templates/sheet_ope_modif.html:167 +msgid "find.material_type_not_patriarche_complete_label" +msgstr "" #: templates/sheet_operation.html:33 msgid "Associated file:" msgstr "Dossier associé :" -#: templates/sheet_operation.html:101 +#: templates/sheet_operation.html:122 msgid "Context records" msgstr "Unité d'Enregistrement" -#: templates/sheet_operation.html:121 +#: templates/sheet_operation.html:142 msgid "No context record associated to parcel " msgstr "Pas d'Unité d'Enregistrement associée à ce dossier" -#: templates/sheet_operation.html:124 +#: templates/sheet_operation.html:145 msgid "No context record associated to this operation" msgstr "Pas d'Unité d'Enregistrement associée à ce dossier" +#: templates/sheet_operation.html:183 +msgid "No find associated to context record:" +msgstr "Pas d emobilier associé à cette Unité d'Enregistrement :" + +#: templates/sheet_operation.html:186 +msgid "No context record associated to parcel:" +msgstr "Pas d'Unité d'Enregistrement associée à cette parcelle :" + #: templates/wizard_done.html:4 msgid "Item successfully saved" -msgstr "Mobilier enregistré avec succès" +msgstr "Élément enregistré avec succès" #: templates/wizard_done_summary_2.html:7 #: templates/wizard_list_search_result.html:9 diff --git a/ishtar/templates/sheet_contextrecord.html b/ishtar/templates/sheet_contextrecord.html index 76b76183f..b29541d54 100644 --- a/ishtar/templates/sheet_contextrecord.html +++ b/ishtar/templates/sheet_contextrecord.html @@ -6,10 +6,10 @@ <h3>{% trans "Context Record"%}</h3> {% if item.parcel.operation.code_patriarche %} -<p><label>{%trans "Complete label:"%}</label> +<p><label>{%trans "Complete ID:"%}</label> {% else %} <p class='alert'><label>{%trans "Patriarche OA code not yet recorded!"%}</label></p> -<p><label>{%trans "Temporary label:"%}</label> +<p><label>{%trans "Temporary ID:"%}</label> {%endif%} <span class='value'>{{item.full_label}}</span></p> {%if item.unit %} diff --git a/ishtar/templates/sheet_ope.html b/ishtar/templates/sheet_ope.html index aa35350bd..dbe3297b3 100644 --- a/ishtar/templates/sheet_ope.html +++ b/ishtar/templates/sheet_ope.html @@ -122,7 +122,7 @@ <table> <caption>{%trans "Recording Units"%}</caption> <tr> - <th>{% trans "Label" %}</th> + <th>{% trans "ID" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Chronology" %}</th> <th>{% trans "Description" %}</th> diff --git a/ishtar/templates/sheet_ope_modif.html b/ishtar/templates/sheet_ope_modif.html index da8fa640a..cc3a4492e 100644 --- a/ishtar/templates/sheet_ope_modif.html +++ b/ishtar/templates/sheet_ope_modif.html @@ -122,7 +122,7 @@ <table> <caption>{%trans "Recording Units"%}</caption> <tr> - <th>{% trans "Label" %}</th> + <th>{% trans "ID" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Chronology" %}</th> <th>{% trans "Description" %}</th> diff --git a/ishtar/templates/sheet_operation.html b/ishtar/templates/sheet_operation.html index 3a76ccf4e..9a85e03a1 100644 --- a/ishtar/templates/sheet_operation.html +++ b/ishtar/templates/sheet_operation.html @@ -121,7 +121,7 @@ <table> <caption>{%trans "Context records"%}</caption> <tr> - <th>{% trans "Label" %}</th> + <th>{% trans "ID" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Chronology" %}</th> <th>{% trans "Description" %}</th> |