diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/locale/fr/LC_MESSAGES/django.po | 233 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 4 |
2 files changed, 128 insertions, 109 deletions
diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po index 1a647285d..1f2e7f7e9 100644 --- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_operations/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: 2013-04-17 00:39+0200\n" +"POT-Creation-Date: 2013-07-17 01:14+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -18,12 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: forms.py:57 forms.py:111 forms.py:325 forms.py:346 forms.py:350 -#: models.py:327 templates/ishtar/sheet_operation.html:63 +#: forms.py:57 forms.py:111 forms.py:340 forms.py:361 forms.py:365 +#: models.py:339 templates/ishtar/sheet_operation.html:63 msgid "Parcels" msgstr "Parcelles" -#: forms.py:60 forms.py:303 models.py:321 +#: forms.py:60 forms.py:318 models.py:333 #: templates/ishtar/dashboards/dashboard_operation.html:302 #: templates/ishtar/dashboards/dashboard_operation.html:315 #: templates/ishtar/dashboards/dashboard_operation.html:485 @@ -31,17 +31,17 @@ msgstr "Parcelles" msgid "Town" msgstr "Commune" -#: forms.py:62 forms.py:134 forms.py:226 models.py:81 models.py:319 +#: forms.py:62 forms.py:131 forms.py:223 models.py:81 models.py:331 #: templates/ishtar/sheet_operation.html:61 #: templates/ishtar/sheet_operation.html:82 msgid "Year" msgstr "Année" -#: forms.py:65 models.py:322 templates/ishtar/sheet_operation.html:62 +#: forms.py:65 models.py:334 templates/ishtar/sheet_operation.html:62 msgid "Section" msgstr "Section" -#: forms.py:67 models.py:323 +#: forms.py:67 models.py:335 msgid "Parcel number" msgstr "Numéro de parcelle" @@ -57,107 +57,107 @@ msgstr "Il y a des parcelles identiques." msgid "Name (full text search)" msgstr "Nom (recherche texte intégral)" -#: forms.py:122 forms.py:216 forms.py:435 models.py:39 models.py:88 +#: forms.py:119 forms.py:213 forms.py:450 models.py:39 models.py:88 msgid "Operation type" msgstr "Type d'opération" -#: forms.py:129 models.py:80 +#: forms.py:126 models.py:80 msgid "In charge" msgstr "Responsable" -#: forms.py:130 models.py:90 +#: forms.py:127 models.py:90 msgid "Remains" msgstr "Vestiges" -#: forms.py:132 forms.py:370 forms.py:384 models.py:93 -#: templates/ishtar/sheet_operation.html:150 +#: forms.py:129 forms.py:385 forms.py:399 models.py:93 +#: templates/ishtar/sheet_operation.html:151 msgid "Periods" msgstr "Périodes" -#: forms.py:135 +#: forms.py:132 msgid "Started before" msgstr "Commencé avant" -#: forms.py:137 +#: forms.py:134 msgid "Started after" msgstr "Commencé après" -#: forms.py:139 +#: forms.py:136 msgid "Ended before" msgstr "Terminé avant" -#: forms.py:141 +#: forms.py:138 msgid "Ended after" msgstr "Terminé après" -#: forms.py:143 +#: forms.py:140 msgid "Parcel (section/number)" msgstr "Parcelle (section/numéro)" -#: forms.py:144 +#: forms.py:141 msgid "Is open?" msgstr "Est ouvert ?" -#: forms.py:159 forms.py:429 views.py:137 +#: forms.py:156 forms.py:444 views.py:137 msgid "Operation search" msgstr "Recherche d'opérations" -#: forms.py:171 forms.py:431 +#: forms.py:168 forms.py:446 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: forms.py:199 forms.py:485 templates/ishtar/sheet_operation.html:5 +#: forms.py:196 forms.py:500 templates/ishtar/sheet_operation.html:5 msgid "General" msgstr "Général" -#: forms.py:205 models.py:274 +#: forms.py:202 models.py:282 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: forms.py:212 models.py:258 models.py:286 +#: forms.py:209 models.py:266 models.py:295 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: forms.py:218 models.py:60 models.py:75 models.py:360 +#: forms.py:215 models.py:60 models.py:75 models.py:384 msgid "Start date" msgstr "Date de début" -#: forms.py:220 models.py:76 +#: forms.py:217 models.py:76 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: forms.py:223 templates/ishtar/dashboards/dashboard_operation.html:315 +#: forms.py:220 templates/ishtar/dashboards/dashboard_operation.html:315 msgid "Total surface (m²)" msgstr "Surface totale des terrains (m²)" -#: forms.py:230 models.py:82 models.py:166 +#: forms.py:227 models.py:82 models.py:174 msgid "Operation code" msgstr "Code de l'opération" -#: forms.py:233 models.py:118 +#: forms.py:230 models.py:125 msgid "Generic name" msgstr "Nom générique" -#: forms.py:235 models.py:116 +#: forms.py:232 models.py:123 msgid "Operator reference" msgstr "Référence de l'opérateur" -#: forms.py:242 models.py:120 +#: forms.py:252 models.py:127 msgid "Comment" msgstr "Commentaire" -#: forms.py:255 +#: forms.py:265 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: forms.py:258 +#: forms.py:268 msgid "The excavation end date cannot be before the start date." msgstr "La date de fin de chantier ne peut être avant la date de début." -#: forms.py:270 +#: forms.py:282 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -166,86 +166,90 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:276 +#: forms.py:286 +msgid "Bad operation code" +msgstr "Mauvais code d'opération" + +#: forms.py:291 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: forms.py:277 models.py:92 +#: forms.py:292 models.py:92 #: templates/ishtar/dashboards/dashboard_operation.html:498 msgid "Cost (€)" msgstr "Cout (€)" -#: forms.py:278 models.py:94 +#: forms.py:293 models.py:94 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: forms.py:280 models.py:96 +#: forms.py:295 models.py:96 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: forms.py:282 models.py:98 +#: forms.py:297 models.py:98 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: forms.py:291 +#: forms.py:306 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: forms.py:294 models.py:111 +#: forms.py:309 models.py:111 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: forms.py:296 models.py:113 +#: forms.py:311 models.py:113 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: forms.py:298 models.py:115 +#: forms.py:313 models.py:115 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:301 forms.py:322 models.py:91 +#: forms.py:316 forms.py:337 models.py:91 msgid "Towns" msgstr "Communes" -#: forms.py:327 models.py:326 models.py:359 +#: forms.py:342 models.py:338 models.py:383 #: templates/ishtar/sheet_operation.html:127 -#: templates/ishtar/sheet_operation.html:154 +#: templates/ishtar/sheet_operation.html:155 msgid "Parcel" msgstr "Parcelle" -#: forms.py:353 forms.py:367 models.py:56 +#: forms.py:368 forms.py:382 models.py:56 msgid "Remain types" msgstr "Types de vestige" -#: forms.py:356 models.py:55 +#: forms.py:371 models.py:55 msgid "Remain type" msgstr "Type de vestige" -#: forms.py:363 +#: forms.py:378 msgid "There are identical remain types" msgstr "Il y a des types de vestige identiques." -#: forms.py:373 +#: forms.py:388 msgid "Period" msgstr "Période" -#: forms.py:380 +#: forms.py:395 msgid "There are identical periods" msgstr "Il y a des périodes identiques." -#: forms.py:388 +#: forms.py:403 msgid "Would you like to close this operation?" msgstr "Voulez vous clore cette opération ?" -#: forms.py:392 +#: forms.py:407 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: forms.py:400 models.py:253 +#: forms.py:415 models.py:261 msgid "Index" msgstr "Index" -#: forms.py:423 +#: forms.py:438 #, python-format msgid "" "Index already exist for operation: %(operation)s - use a value bigger than " @@ -254,52 +258,52 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:434 +#: forms.py:449 msgid "Operation's town" msgstr "Commune de l'opération" -#: forms.py:437 +#: forms.py:452 msgid "Operation's year" msgstr "Année de l'opération" -#: forms.py:448 +#: forms.py:463 msgid "Documentation search" msgstr "Recherche de document" -#: forms.py:450 +#: forms.py:465 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:458 forms.py:488 models.py:264 models.py:272 +#: forms.py:473 forms.py:503 models.py:272 models.py:280 msgid "Act type" msgstr "Type d'acte" -#: forms.py:468 +#: forms.py:483 msgid "Administrative act search" msgstr "Recherche d'actes administratifs" -#: forms.py:480 +#: forms.py:495 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:489 models.py:280 +#: forms.py:504 models.py:289 msgid "Signatory" msgstr "Signataire" -#: forms.py:493 models.py:289 +#: forms.py:508 models.py:298 msgid "Object" msgstr "Objet" -#: forms.py:495 models.py:287 +#: forms.py:510 models.py:296 msgid "Signature date" msgstr "Date de signature" -#: forms.py:509 +#: forms.py:524 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" -#: ishtar_menu.py:27 models.py:124 models.py:240 models.py:251 models.py:259 -#: models.py:282 models.py:318 +#: ishtar_menu.py:27 models.py:131 models.py:248 models.py:259 models.py:267 +#: models.py:291 models.py:330 msgid "Operation" msgstr "Opération" @@ -323,7 +327,7 @@ msgstr "Clotûre" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:50 models.py:295 +#: ishtar_menu.py:50 models.py:305 msgid "Administrative act" msgstr "Acte administratif" @@ -343,7 +347,7 @@ msgstr "Tableau de bord" msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:93 models.py:125 +#: ishtar_menu.py:93 models.py:132 #: templates/ishtar/dashboards/dashboard_operation.html:9 msgid "Operations" msgstr "Opérations" @@ -360,7 +364,7 @@ msgstr "Types d'opération" msgid "Order" msgstr "Ordre" -#: models.py:61 models.py:361 +#: models.py:61 models.py:385 msgid "End date" msgstr "Date de fin" @@ -380,7 +384,7 @@ msgstr "Types de période" msgid "Closing date" msgstr "Date de clotûre" -#: models.py:86 models.py:316 +#: models.py:86 models.py:328 msgid "File" msgstr "Dossier" @@ -388,118 +392,126 @@ msgstr "Dossier" msgid "Surface (m²)" msgstr "Area (m²)" -#: models.py:127 +#: models.py:134 +msgid "Can view all Operation" +msgstr "Peut voir toutes les Opérations" + +#: models.py:135 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: models.py:128 +#: models.py:136 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: models.py:129 +#: models.py:137 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: models.py:130 +#: models.py:138 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: models.py:134 +#: models.py:142 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:181 +#: models.py:189 msgid "This operation code already exists for this year" msgstr "Cet code d'opération existe déjà pour cette année." -#: models.py:241 templates/ishtar/dashboards/dashboard_operation.html:273 +#: models.py:249 templates/ishtar/dashboards/dashboard_operation.html:273 #: templates/ishtar/dashboards/dashboard_operation.html:286 #: templates/ishtar/dashboards/dashboard_operation.html:456 #: templates/ishtar/dashboards/dashboard_operation.html:469 msgid "Department" msgstr "Département" -#: models.py:249 +#: models.py:257 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:250 +#: models.py:258 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:261 +#: models.py:269 msgid "Intended to" msgstr "Destiné à" -#: models.py:265 +#: models.py:273 msgid "Act types" msgstr "Types d'acte" -#: models.py:276 +#: models.py:284 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:278 +#: models.py:287 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: models.py:296 templates/ishtar/sheet_operation.html:80 +#: models.py:306 templates/ishtar/sheet_operation.html:80 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:299 +#: models.py:309 +msgid "Can view all Administrative act" +msgstr "Peut voir tout les Actes administratifs" + +#: models.py:311 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:301 +#: models.py:313 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:303 +#: models.py:315 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: models.py:305 +#: models.py:317 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:358 +#: models.py:382 msgid "Owner" msgstr "Propriétaire" -#: models.py:364 +#: models.py:388 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:365 +#: models.py:389 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:389 +#: models.py:413 msgid "Recorded" msgstr "Enregistré" -#: models.py:390 +#: models.py:414 msgid "Effective" msgstr "Effectif" -#: models.py:391 +#: models.py:415 msgid "Active" msgstr "Actif" -#: models.py:392 +#: models.py:416 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:393 +#: models.py:417 msgid "Associated report" msgstr "Rapport associé" -#: models.py:394 +#: models.py:418 msgid "Closed" msgstr "Fermé" -#: models.py:395 +#: models.py:419 msgid "Documented and closed" msgstr "Documenté et clôt" @@ -759,12 +771,12 @@ msgid "Chronology" msgstr "Chronologie" #: templates/ishtar/sheet_operation.html:126 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:152 msgid "Description" msgstr "Description" #: templates/ishtar/sheet_operation.html:137 -#: templates/ishtar/sheet_operation.html:170 +#: templates/ishtar/sheet_operation.html:172 msgid "Details" msgstr "Détails" @@ -781,30 +793,35 @@ msgid "Find" msgstr "Mobilier" #: templates/ishtar/sheet_operation.html:148 +msgid "Id by material type" +msgstr "Id. par type matériau" + +#: templates/ishtar/sheet_operation.html:149 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:149 +#: templates/ishtar/sheet_operation.html:150 +msgctxt "short" msgid "Context record" -msgstr "Unité d'Enregistrement" +msgstr "UE" -#: templates/ishtar/sheet_operation.html:152 +#: templates/ishtar/sheet_operation.html:153 msgid "Weight" msgstr "Poids" -#: templates/ishtar/sheet_operation.html:153 +#: templates/ishtar/sheet_operation.html:154 msgid "Numbers" msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:176 msgid "No find associated to context record" msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_operation.html:177 +#: templates/ishtar/sheet_operation.html:179 msgid "No find associated to parcel" msgstr "Pas de mobilier associé à cette parcelle" -#: templates/ishtar/sheet_operation.html:177 +#: templates/ishtar/sheet_operation.html:179 msgid "(no context record)" msgstr "(pas d'Unité d'Enregistrement)" diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 3a6a20e74..1e43c7112 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -145,8 +145,9 @@ <caption>{%trans "Finds"%}</caption> <tr> <th>{% trans "Find" %}</th> + <th>{% trans "Id by material type" %}</th> <th>{% trans "Material type" %}</th> - <th>{% trans "Context record" %}</th> + <th>{% trans "Context record" context "short"%}</th> <th>{% trans "Periods" %}</th> <th>{% trans "Description" %}</th> <th>{% trans "Weight" %}</th> @@ -161,6 +162,7 @@ {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} {# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} <td class="ref">{{ find.material_type_label }}</td> + <td class="string">{{ find.material|default:"" }}</td> <td>{{find.context_record.label}}</td> <td class='string'>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #} <td class='string'>{{ find.get_last_find.description }}</td> |