summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-25 23:30:12 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-25 23:30:12 +0100
commit1992da6a916bff1a1f98e5b4f281a80a3177884d (patch)
treeca16a2cb13462495d79fbf2b9b8a1a8808a0d455
parent4679d9182ba5c5f2a41f2ae51f168deff250aea9 (diff)
downloadIshtar-1992da6a916bff1a1f98e5b4f281a80a3177884d.tar.bz2
Ishtar-1992da6a916bff1a1f98e5b4f281a80a3177884d.zip
Update of french translation (refs #112) - CSS improvment
-rw-r--r--docs/src/INSTALL.t2t5
-rw-r--r--ishtar/locale/fr/LC_MESSAGES/django.po665
-rw-r--r--ishtar/templates/sheet_file.html6
-rw-r--r--static/media/style.css1
4 files changed, 342 insertions, 335 deletions
diff --git a/docs/src/INSTALL.t2t b/docs/src/INSTALL.t2t
index c485f0d96..f411d5e99 100644
--- a/docs/src/INSTALL.t2t
+++ b/docs/src/INSTALL.t2t
@@ -20,7 +20,7 @@ Last update: %%date(%m-%d-%Y)
- libjs-jquery-ui
- django-formwizard
- curl (to fetch towns from OSM)
-
+- python-pisa
To install django-simple-history:
```
@@ -31,6 +31,9 @@ python setup.py install
git clone git://gitorious.org/xhtml2odt/xhtml2odt.git
INSTALL_PATH = "/home/etienne/work/ishtar/xhtml2odt"
+__init__.py
+=> nécessite python-utidylib , python-lxml, python-imaging
+
Import towns:
curl --location --globoff "http://openstreetmap.us/xapi/api/0.6/node[place=village|town|city][bbox=-5.53711,41.90228,8.96484,51.50874]" -o data.osm
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index 2612d0057..b3dfe7b81 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-02-18 01:43+0100\n"
+"POT-Creation-Date: 2011-02-25 23:21+0100\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -29,14 +29,14 @@ msgid "email address"
msgstr "courriel"
#: furnitures/context_processors.py:42 furnitures/forms.py:714
-#: furnitures/forms.py:1308 furnitures/menus.py:103 furnitures/models.py:645
-#: furnitures/models.py:671
+#: furnitures/forms.py:1308 furnitures/menus.py:103 furnitures/models.py:677
+#: furnitures/models.py:703
msgid "Archaelogical file"
msgstr "Dossier archéologique"
#: furnitures/context_processors.py:43 furnitures/forms.py:1281
-#: furnitures/menus.py:132 furnitures/models.py:395 furnitures/models.py:424
-#: furnitures/models.py:646 furnitures/models.py:669
+#: furnitures/menus.py:132 furnitures/models.py:427 furnitures/models.py:456
+#: furnitures/models.py:678 furnitures/models.py:701
msgid "Operation"
msgstr "Opération"
@@ -61,8 +61,8 @@ 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:448 furnitures/forms.py:451 furnitures/menus.py:89
-#: furnitures/models.py:221 furnitures/models.py:240 furnitures/models.py:767
-#: furnitures/models.py:791 furnitures/models.py:806
+#: furnitures/models.py:221 furnitures/models.py:245 furnitures/models.py:799
+#: furnitures/models.py:823 furnitures/models.py:838
msgid "Person"
msgstr "Individu"
@@ -70,7 +70,7 @@ msgstr "Individu"
msgid "Identity"
msgstr "Identité"
-#: furnitures/forms.py:460 furnitures/models.py:208 furnitures/models.py:534
+#: furnitures/forms.py:460 furnitures/models.py:208 furnitures/models.py:566
msgid "Title"
msgstr "Titre"
@@ -79,7 +79,7 @@ msgid "Surname"
msgstr "Prénom"
#: furnitures/forms.py:463 furnitures/models.py:180 furnitures/models.py:210
-#: furnitures/models.py:624 furnitures/models.py:732
+#: furnitures/models.py:656 furnitures/models.py:764
msgid "Name"
msgstr "Nom"
@@ -134,24 +134,24 @@ msgstr "Envoyer le nouveau mot de passe par courriel ?"
#: furnitures/forms.py:703 furnitures/forms.py:792 furnitures/forms.py:820
#: furnitures/forms.py:1088 furnitures/forms.py:1270 furnitures/forms.py:1375
-#: furnitures/forms.py:1544 furnitures/models.py:163 furnitures/models.py:427
-#: furnitures/models.py:746
+#: furnitures/forms.py:1544 furnitures/models.py:163 furnitures/models.py:459
+#: furnitures/models.py:778
msgid "Town"
msgstr "Commune"
-#: furnitures/forms.py:707 furnitures/forms.py:759 furnitures/models.py:281
+#: furnitures/forms.py:707 furnitures/forms.py:759 furnitures/models.py:286
msgid "File type"
msgstr "Type de dossier"
#: furnitures/forms.py:709 furnitures/forms.py:895
-#: templates/wizard_file_sheet.html:48
msgid "Saisine type"
msgstr "Type de saisine"
#: furnitures/forms.py:711 furnitures/forms.py:749 furnitures/forms.py:769
#: furnitures/forms.py:826 furnitures/forms.py:1278 furnitures/forms.py:1316
-#: furnitures/models.py:276 furnitures/models.py:367 furnitures/models.py:425
-#: templates/wizard_file_sheet.html:6
+#: furnitures/models.py:281 furnitures/models.py:399 furnitures/models.py:457
+#: templates/sheet_file.html:56 templates/sheet_file.html.py:76
+#: templates/sheet_file.html:104
msgid "Year"
msgstr "Année"
@@ -160,35 +160,33 @@ msgid "You should select a file."
msgstr "Vous devez sélectionner un dossier archéologique."
#: furnitures/forms.py:740 furnitures/forms.py:1071 furnitures/forms.py:1296
-#: furnitures/forms.py:1559
+#: furnitures/forms.py:1559 templates/sheet_file.html:5
msgid "General"
msgstr "Général"
-#: furnitures/forms.py:744 furnitures/models.py:283 furnitures/models.py:628
+#: furnitures/forms.py:744 furnitures/models.py:288 furnitures/models.py:660
msgid "Person in charge"
msgstr "Responsable"
-#: furnitures/forms.py:753 furnitures/forms.py:771 furnitures/models.py:278
+#: furnitures/forms.py:753 furnitures/forms.py:771 furnitures/models.py:283
msgid "Numeric reference"
msgstr "Référence numérique"
-#: furnitures/forms.py:755 furnitures/forms.py:773 furnitures/models.py:279
+#: furnitures/forms.py:755 furnitures/forms.py:773 furnitures/models.py:284
msgid "Internal reference"
msgstr "Référence interne"
-#: furnitures/forms.py:757 furnitures/models.py:294
-#: templates/wizard_file_sheet.html:13
+#: furnitures/forms.py:757 furnitures/models.py:299
msgid "Creation date"
msgstr "Date de création"
-#: furnitures/forms.py:761 furnitures/models.py:298
-#: templates/wizard_file_sheet.html:30
+#: furnitures/forms.py:761 furnitures/models.py:303
msgid "Related file"
msgstr "Dossier en relation avec"
#: furnitures/forms.py:765 furnitures/forms.py:1320 furnitures/models.py:110
-#: furnitures/models.py:313 furnitures/models.py:391 furnitures/models.py:629
-#: furnitures/models.py:710
+#: furnitures/models.py:318 furnitures/models.py:423 furnitures/models.py:661
+#: furnitures/models.py:742
msgid "Comment"
msgstr "Commentaire"
@@ -196,25 +194,25 @@ msgstr "Commentaire"
msgid "Address"
msgstr "Adresse"
-#: furnitures/forms.py:779 furnitures/models.py:305
+#: furnitures/forms.py:779 furnitures/models.py:310
msgid "Total surface"
msgstr "Surface totale"
-#: furnitures/forms.py:782 furnitures/models.py:308
+#: furnitures/forms.py:782 furnitures/models.py:313
msgid "Main address"
msgstr "Adresse principale"
-#: furnitures/forms.py:783 furnitures/models.py:309
+#: furnitures/forms.py:783 furnitures/models.py:314
msgid "Main address - complement"
msgstr "Adresse principale - complément"
-#: furnitures/forms.py:785 furnitures/models.py:311
+#: furnitures/forms.py:785 furnitures/models.py:316
msgid "Main address - postal code"
msgstr "Adresse principale - code postal"
#: furnitures/forms.py:789 furnitures/forms.py:815 furnitures/forms.py:1373
-#: furnitures/forms.py:1394 furnitures/forms.py:1398 furnitures/models.py:293
-#: furnitures/models.py:374 furnitures/models.py:747
+#: furnitures/forms.py:1394 furnitures/forms.py:1398 furnitures/models.py:298
+#: furnitures/models.py:406 furnitures/models.py:779
msgid "Towns"
msgstr "Communes"
@@ -223,15 +221,15 @@ msgid "There are identical towns."
msgstr "Il y a des communes identiques."
#: furnitures/forms.py:818 furnitures/forms.py:865 furnitures/forms.py:1401
-#: furnitures/forms.py:1422 furnitures/forms.py:1426 furnitures/models.py:433
+#: furnitures/forms.py:1422 furnitures/forms.py:1426 furnitures/models.py:465
msgid "Parcels"
msgstr "Parcelles"
-#: furnitures/forms.py:822 furnitures/models.py:428
+#: furnitures/forms.py:822 furnitures/models.py:460
msgid "Section"
msgstr "Section"
-#: furnitures/forms.py:824 furnitures/models.py:429
+#: furnitures/forms.py:824 furnitures/models.py:461
msgid "Parcel number"
msgstr "Numéro de parcelle"
@@ -243,34 +241,31 @@ msgstr "Tous les champs sont nécessaires"
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: furnitures/forms.py:873 furnitures/models.py:285
+#: furnitures/forms.py:873 furnitures/models.py:290
msgid "General contractor"
msgstr "Aménageur"
-#: furnitures/forms.py:880 furnitures/models.py:287
+#: furnitures/forms.py:880 furnitures/models.py:292
msgid "Town planning service"
msgstr "Service instructeur"
-#: furnitures/forms.py:886 furnitures/models.py:263 furnitures/models.py:288
-#: templates/wizard_file_sheet.html:50
+#: furnitures/forms.py:886 furnitures/models.py:268 furnitures/models.py:293
msgid "Permit type"
msgstr "Type de permis"
-#: furnitures/forms.py:888 furnitures/models.py:290
-#: templates/wizard_file_sheet.html:51
+#: furnitures/forms.py:888 furnitures/models.py:295
msgid "Permit reference"
msgstr "Référence du permis"
-#: furnitures/forms.py:891 furnitures/models.py:306
+#: furnitures/forms.py:891 furnitures/models.py:311
msgid "Total developed surface"
msgstr "Surface totale aménagée"
-#: furnitures/forms.py:897 furnitures/models.py:296
-#: templates/wizard_file_sheet.html:12
+#: furnitures/forms.py:897 furnitures/models.py:301
msgid "Reception date"
msgstr "Date de réception"
-#: furnitures/forms.py:988 templates/wizard_file_sheet.html:81
+#: furnitures/forms.py:988 templates/sheet_file.html:74
msgid "Associated operations"
msgstr "Opérations associées"
@@ -279,19 +274,19 @@ msgid "Would you like to delete this archaelogical file ?"
msgstr "Voulez vous supprimer ce dossier archéologique ?"
#: furnitures/forms.py:1074 furnitures/forms.py:1092 furnitures/forms.py:1548
-#: furnitures/forms.py:1560 furnitures/models.py:651 furnitures/models.py:659
+#: furnitures/forms.py:1560 furnitures/models.py:683 furnitures/models.py:691
msgid "Act type"
msgstr "Type d'acte"
-#: furnitures/forms.py:1076 furnitures/models.py:667
+#: furnitures/forms.py:1076 furnitures/models.py:699
msgid "Signatory"
msgstr "Signataire"
-#: furnitures/forms.py:1080 furnitures/models.py:673
+#: furnitures/forms.py:1080 furnitures/models.py:705
msgid "Object"
msgstr "Objet"
-#: furnitures/forms.py:1082 furnitures/models.py:672
+#: furnitures/forms.py:1082 furnitures/models.py:704
msgid "Signature date"
msgstr "Date de signature"
@@ -315,12 +310,12 @@ 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:1274 furnitures/forms.py:1312 furnitures/models.py:343
-#: furnitures/models.py:372
+#: furnitures/forms.py:1274 furnitures/forms.py:1312 furnitures/models.py:375
+#: furnitures/models.py:404
msgid "Operation type"
msgstr "Type d'opération"
-#: furnitures/forms.py:1276 furnitures/models.py:373
+#: furnitures/forms.py:1276 furnitures/models.py:405
msgid "Remains"
msgstr "Vestiges"
@@ -328,13 +323,13 @@ msgstr "Vestiges"
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
-#: furnitures/forms.py:1301 furnitures/models.py:661
+#: furnitures/forms.py:1301 furnitures/models.py:693
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: furnitures/forms.py:1314 furnitures/models.py:363 furnitures/models.py:442
-#: furnitures/models.py:492 furnitures/models.py:608 furnitures/models.py:768
-#: furnitures/models.py:807
+#: furnitures/forms.py:1314 furnitures/models.py:395 furnitures/models.py:474
+#: furnitures/models.py:524 furnitures/models.py:640 furnitures/models.py:800
+#: furnitures/models.py:839 templates/sheet_file.html:81
msgid "Start date"
msgstr "Date de début"
@@ -342,7 +337,7 @@ msgstr "Date de début"
msgid "References"
msgstr "Référence"
-#: furnitures/forms.py:1331 furnitures/models.py:368
+#: furnitures/forms.py:1331 furnitures/models.py:400
msgid "Operation code"
msgstr "Code de l'opération"
@@ -359,7 +354,7 @@ msgstr ""
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: furnitures/forms.py:1355 furnitures/models.py:375
+#: furnitures/forms.py:1355 furnitures/models.py:407
msgid "Cost"
msgstr "Coût"
@@ -367,40 +362,40 @@ msgstr "Coût"
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostique"
-#: furnitures/forms.py:1366 furnitures/models.py:386
+#: furnitures/forms.py:1366 furnitures/models.py:418
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: furnitures/forms.py:1368 furnitures/models.py:388
+#: furnitures/forms.py:1368 furnitures/models.py:420
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: furnitures/forms.py:1370 furnitures/models.py:390
+#: furnitures/forms.py:1370 furnitures/models.py:422
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géo-archéologique"
-#: furnitures/forms.py:1403 furnitures/models.py:432 furnitures/models.py:502
-#: furnitures/models.py:607
+#: furnitures/forms.py:1403 furnitures/models.py:464 furnitures/models.py:534
+#: furnitures/models.py:639
msgid "Parcel"
msgstr "Parcelle"
-#: furnitures/forms.py:1429 furnitures/forms.py:1441 furnitures/models.py:358
+#: furnitures/forms.py:1429 furnitures/forms.py:1441 furnitures/models.py:390
msgid "Remain types"
msgstr "Types de vestige"
-#: furnitures/forms.py:1431 furnitures/models.py:357
+#: furnitures/forms.py:1431 furnitures/models.py:389
msgid "Remain type"
msgstr "Type de vestige"
-#: furnitures/forms.py:1444 furnitures/forms.py:1456 furnitures/models.py:376
+#: furnitures/forms.py:1444 furnitures/forms.py:1456 furnitures/models.py:408
msgid "Periods"
msgstr "Périodes"
-#: furnitures/forms.py:1446 furnitures/models.py:491
+#: furnitures/forms.py:1446 furnitures/models.py:523
msgid "Period"
msgstr "Période"
-#: furnitures/forms.py:1498 furnitures/forms.py:1499 furnitures/models.py:364
+#: furnitures/forms.py:1498 furnitures/forms.py:1499 furnitures/models.py:396
msgid "Closing date"
msgstr "Date de clotûre"
@@ -438,8 +433,8 @@ msgstr "Gestion de dossier archéologique"
msgid "Deletion"
msgstr "Suppression"
-#: furnitures/menus.py:115 furnitures/menus.py:152 furnitures/models.py:679
-#: furnitures/models.py:805
+#: furnitures/menus.py:115 furnitures/menus.py:152 furnitures/models.py:711
+#: furnitures/models.py:837
msgid "Administrative act"
msgstr "Acte administratif"
@@ -463,8 +458,8 @@ msgstr "Élément invalide."
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:503
-#: furnitures/models.py:554 furnitures/models.py:578
+#: furnitures/models.py:107 furnitures/models.py:146 furnitures/models.py:535
+#: furnitures/models.py:586 furnitures/models.py:610
msgid "Label"
msgstr "Libellé"
@@ -496,7 +491,7 @@ msgstr "Départements"
msgid "Address complement"
msgstr "Complément d'adresse"
-#: furnitures/models.py:161 templates/wizard_file_sheet.html:37
+#: furnitures/models.py:161
msgid "Postal code"
msgstr "Code postal"
@@ -520,8 +515,9 @@ msgstr "Type d'organisation"
msgid "Organization types"
msgstr "Types d'organisation"
-#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:535
-#: templates/wizard_file_sheet.html:28
+#: furnitures/models.py:182 furnitures/models.py:212 furnitures/models.py:567
+#: templates/sheet_file.html:58 templates/sheet_file.html.py:79
+#: templates/sheet_file.html:106
msgid "Type"
msgstr "Type"
@@ -597,480 +593,487 @@ msgstr "Peut changer sa propre Personne"
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: furnitures/models.py:243
+#: furnitures/models.py:248
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: furnitures/models.py:244
+#: furnitures/models.py:249
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: furnitures/models.py:249
+#: furnitures/models.py:254
msgid "Archaeological file type"
msgstr "Type de dossier archéologique"
-#: furnitures/models.py:250
+#: furnitures/models.py:255
msgid "Archaeological file types"
msgstr "Types de dossier archéologique"
-#: furnitures/models.py:264
+#: furnitures/models.py:269
msgid "Permit types"
msgstr "Types de permis"
-#: furnitures/models.py:268
+#: furnitures/models.py:273
msgid "Delay (in days)"
msgstr "Delai (en jours)"
-#: furnitures/models.py:292
+#: furnitures/models.py:297
msgid "Is active?"
msgstr "Est actif ?"
-#: furnitures/models.py:303
+#: furnitures/models.py:308
msgid "Reference number"
msgstr "Référence"
-#: furnitures/models.py:317
+#: furnitures/models.py:322
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: furnitures/models.py:318
+#: furnitures/models.py:323
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: furnitures/models.py:320
+#: furnitures/models.py:325
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier archéologique"
-#: furnitures/models.py:321
+#: furnitures/models.py:326
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier archéologique"
-#: furnitures/models.py:322
+#: furnitures/models.py:327
msgid "Can change own Archaelogical file"
msgstr "Peut changer son propre Dossier archéologique"
-#: furnitures/models.py:323
+#: furnitures/models.py:328
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier archéologique"
-#: furnitures/models.py:328 furnitures/models.py:405
+#: furnitures/models.py:333 furnitures/models.py:437
msgid "Intercommunal"
msgstr "Intercommunal"
-#: furnitures/models.py:344
+#: furnitures/models.py:376
msgid "Operation types"
msgstr "Types d'opération"
-#: furnitures/models.py:366
+#: furnitures/models.py:398 templates/sheet_file.html:80
msgid "In charge"
msgstr "Responsable"
-#: furnitures/models.py:370 furnitures/models.py:422
+#: furnitures/models.py:402 furnitures/models.py:454
msgid "File"
msgstr "Dossier"
-#: furnitures/models.py:396
+#: furnitures/models.py:428
msgid "Operations"
msgstr "Opérations"
-#: furnitures/models.py:398
+#: furnitures/models.py:430
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: furnitures/models.py:399
+#: furnitures/models.py:431
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: furnitures/models.py:400
+#: furnitures/models.py:432
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: furnitures/models.py:401
+#: furnitures/models.py:433
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: furnitures/models.py:441 furnitures/models.py:577
+#: furnitures/models.py:473 furnitures/models.py:609
msgid "Order"
msgstr "Ordre"
-#: furnitures/models.py:443 furnitures/models.py:493 furnitures/models.py:609
-#: furnitures/models.py:769 furnitures/models.py:808
+#: furnitures/models.py:475 furnitures/models.py:525 furnitures/models.py:641
+#: furnitures/models.py:801 furnitures/models.py:840
+#: templates/sheet_file.html:82
msgid "End date"
msgstr "Date de fin"
-#: furnitures/models.py:444
+#: furnitures/models.py:476
msgid "Parent period"
msgstr "Période parente"
-#: furnitures/models.py:448
+#: furnitures/models.py:480
msgid "Type Period"
msgstr "Type de période"
-#: furnitures/models.py:449
+#: furnitures/models.py:481
msgid "Types Period"
msgstr "Types de période"
-#: furnitures/models.py:482 furnitures/models.py:494
+#: furnitures/models.py:514 furnitures/models.py:526
msgid "Dating type"
msgstr "Type de datation"
-#: furnitures/models.py:483
+#: furnitures/models.py:515
msgid "Dating types"
msgstr "Types de datation"
-#: furnitures/models.py:487
+#: furnitures/models.py:519
msgid "Dating quality"
msgstr "Qualité de datation"
-#: furnitures/models.py:488
+#: furnitures/models.py:520
msgid "Dating qualities"
msgstr "Qualités de datation"
-#: furnitures/models.py:495
+#: furnitures/models.py:527
msgid "Quality"
msgstr "Qualité"
-#: furnitures/models.py:498 furnitures/models.py:589
+#: furnitures/models.py:530 furnitures/models.py:621
msgid "Dating"
msgstr "Datation"
-#: furnitures/models.py:499
+#: furnitures/models.py:531
msgid "Datings"
msgstr "Datations"
-#: furnitures/models.py:504 furnitures/models.py:555 furnitures/models.py:579
+#: furnitures/models.py:536 furnitures/models.py:587 furnitures/models.py:611
msgid "Description"
msgstr "Description"
-#: furnitures/models.py:505 furnitures/models.py:694
+#: furnitures/models.py:537 furnitures/models.py:726
msgid "Lenght"
msgstr "Longueur"
-#: furnitures/models.py:506 furnitures/models.py:695
+#: furnitures/models.py:538 furnitures/models.py:727
msgid "Width"
msgstr "Largeur"
-#: furnitures/models.py:507
+#: furnitures/models.py:539
msgid "Thickness"
msgstr "Épaisseur"
-#: furnitures/models.py:508
+#: furnitures/models.py:540
msgid "Depth"
msgstr "Profondeur"
-#: furnitures/models.py:510
+#: furnitures/models.py:542
msgid "Interpretation"
msgstr "Interpretation"
-#: furnitures/models.py:511
+#: furnitures/models.py:543
msgid "Filling"
msgstr "Remplissage"
-#: furnitures/models.py:516 furnitures/models.py:557
+#: furnitures/models.py:548 furnitures/models.py:589
msgid "Registration Unit"
msgstr "Unité d'Enregistrement"
-#: furnitures/models.py:517
+#: furnitures/models.py:549
msgid "Registration Units"
msgstr "Unités d'Enregistrement"
-#: furnitures/models.py:519
+#: furnitures/models.py:551
msgid "Can view own Registration Unit"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: furnitures/models.py:520
+#: furnitures/models.py:552
msgid "Can add own Registration Unit"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: furnitures/models.py:521
+#: furnitures/models.py:553
msgid "Can change own Registration Unit"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: furnitures/models.py:522
+#: furnitures/models.py:554
msgid "Can delete own Registration Unit"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: furnitures/models.py:530
+#: furnitures/models.py:562
msgid "Source type"
msgstr "Type de source"
-#: furnitures/models.py:531
+#: furnitures/models.py:563
msgid "Source types"
msgstr "Types de source"
-#: furnitures/models.py:538 furnitures/models.py:792
+#: furnitures/models.py:570 furnitures/models.py:824
msgid "Source"
msgstr "Source"
-#: furnitures/models.py:539
+#: furnitures/models.py:571
msgid "Sources"
msgstr "Sources"
-#: furnitures/models.py:545
+#: furnitures/models.py:577
msgid "Recommendation"
msgstr "Recommendation"
-#: furnitures/models.py:547
+#: furnitures/models.py:579
msgid "Parent material"
msgstr "Matériau parent"
-#: furnitures/models.py:550 furnitures/models.py:581
+#: furnitures/models.py:582 furnitures/models.py:613
msgid "Material type"
msgstr "Type de matériaux"
-#: furnitures/models.py:551
+#: furnitures/models.py:583
msgid "Material types"
msgstr "Types de matériaux"
-#: furnitures/models.py:558
+#: furnitures/models.py:590
msgid "Is isolated?"
msgstr "Est isolé ?"
-#: furnitures/models.py:563 furnitures/models.py:576
+#: furnitures/models.py:595 furnitures/models.py:608
msgid "Base item"
msgstr "Élément de base"
-#: furnitures/models.py:564
+#: furnitures/models.py:596
msgid "Base items"
msgstr "Éléments de base"
-#: furnitures/models.py:566
+#: furnitures/models.py:598
msgid "Can view own Base item"
msgstr "Peut voir son propre Élément de base"
-#: furnitures/models.py:567
+#: furnitures/models.py:599
msgid "Can add own Base item"
msgstr "Peut ajouter son propre Élément de base"
-#: furnitures/models.py:568
+#: furnitures/models.py:600
msgid "Can change own Base item"
msgstr "Peut changer son propre Élément de base"
-#: furnitures/models.py:569
+#: furnitures/models.py:601
msgid "Can delete own Base item"
msgstr "Peut supprimer son propre Élément de base"
-#: furnitures/models.py:582 furnitures/models.py:697
+#: furnitures/models.py:614 furnitures/models.py:729
msgid "Volume"
msgstr "Volume"
-#: furnitures/models.py:583
+#: furnitures/models.py:615
msgid "Weight"
msgstr "Poids"
-#: furnitures/models.py:584
+#: furnitures/models.py:616
msgid "Item number"
msgstr "Nombre d'éléments"
-#: furnitures/models.py:586
+#: furnitures/models.py:618
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: furnitures/models.py:588
+#: furnitures/models.py:620
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: furnitures/models.py:593 furnitures/models.py:803
+#: furnitures/models.py:625 furnitures/models.py:835
msgid "Item"
msgstr "Élément"
-#: furnitures/models.py:594
+#: furnitures/models.py:626
msgid "Items"
msgstr "Éléments"
-#: furnitures/models.py:596
+#: furnitures/models.py:628
msgid "Can view own Item"
msgstr "Peut voir son propre Élément"
-#: furnitures/models.py:597
+#: furnitures/models.py:629
msgid "Can add own Item"
msgstr "Peut ajouter son propre Élément"
-#: furnitures/models.py:598
+#: furnitures/models.py:630
msgid "Can change own Item"
msgstr "Peut changer son propre Élément"
-#: furnitures/models.py:599
+#: furnitures/models.py:631
msgid "Can delete own Item"
msgstr "Peut supprimer son propre Élément"
-#: furnitures/models.py:606
+#: furnitures/models.py:638
msgid "Owner"
msgstr "Propriétaire"
-#: furnitures/models.py:612
+#: furnitures/models.py:644
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: furnitures/models.py:613
+#: furnitures/models.py:645
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: furnitures/models.py:620 furnitures/models.py:626
+#: furnitures/models.py:652 furnitures/models.py:658
msgid "Warehouse type"
msgstr "Type de dépôt"
-#: furnitures/models.py:621
+#: furnitures/models.py:653
msgid "Warehouse types"
msgstr "Types de dépôts"
-#: furnitures/models.py:632
+#: furnitures/models.py:664
msgid "Warehouse"
msgstr "Dépôt"
-#: furnitures/models.py:633
+#: furnitures/models.py:665
msgid "Warehouses"
msgstr "Dépôts"
-#: furnitures/models.py:635
+#: furnitures/models.py:667
msgid "Can view own Warehouse"
msgstr "Peut voir son propre Dépôt"
-#: furnitures/models.py:636
+#: furnitures/models.py:668
msgid "Can add own Warehouse"
msgstr "Peut ajouter son propre Dépôt"
-#: furnitures/models.py:637
+#: furnitures/models.py:669
msgid "Can change own Warehouse"
msgstr "Peut changer son propre Dépôt"
-#: furnitures/models.py:638
+#: furnitures/models.py:670
msgid "Can delete own Warehouse"
msgstr "Peut supprimer son propre Dépôt"
-#: furnitures/models.py:648
+#: furnitures/models.py:680
msgid "Intended to"
msgstr "Destiné à"
-#: furnitures/models.py:652
+#: furnitures/models.py:684
msgid "Act types"
msgstr "Types d'acte"
-#: furnitures/models.py:663
+#: furnitures/models.py:695
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: furnitures/models.py:665
+#: furnitures/models.py:697
msgid "Person in charge of the scientific part"
msgstr "Responsable scientifique"
-#: furnitures/models.py:680
+#: furnitures/models.py:712
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: furnitures/models.py:682
+#: furnitures/models.py:714
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: furnitures/models.py:683
+#: furnitures/models.py:715
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: furnitures/models.py:684
+#: furnitures/models.py:716
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: furnitures/models.py:685
+#: furnitures/models.py:717
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: furnitures/models.py:696
+#: furnitures/models.py:728
msgid "Height"
msgstr "Hauteur"
-#: furnitures/models.py:698 furnitures/models.py:705 furnitures/models.py:709
+#: furnitures/models.py:730 furnitures/models.py:737 furnitures/models.py:741
+#: templates/sheet_file.html:57 templates/sheet_file.html.py:77
+#: templates/sheet_file.html:105
msgid "Reference"
msgstr "Référence"
-#: furnitures/models.py:701 furnitures/models.py:708
+#: furnitures/models.py:733 furnitures/models.py:740
msgid "Container type"
msgstr "Type de contenant"
-#: furnitures/models.py:702
+#: furnitures/models.py:734
msgid "Container types"
msgstr "Types de contenant"
-#: furnitures/models.py:706 furnitures/models.py:766
+#: furnitures/models.py:738 furnitures/models.py:798
msgid "Location"
msgstr "Lieu"
-#: furnitures/models.py:713 furnitures/models.py:763
+#: furnitures/models.py:745 furnitures/models.py:795
msgid "Container"
msgstr "Contenant"
-#: furnitures/models.py:714
+#: furnitures/models.py:746
msgid "Containers"
msgstr "Contenants"
-#: furnitures/models.py:733 templates/wizard_file_sheet.html:41
+#: furnitures/models.py:765
msgid "Surface"
msgstr "Surface"
-#: furnitures/models.py:734
+#: furnitures/models.py:766 templates/sheet_file.html:31
msgid "Localisation"
msgstr "Localisation"
-#: furnitures/models.py:757
+#: furnitures/models.py:789
msgid "Virtual"
msgstr "Virtuel"
-#: furnitures/models.py:759 furnitures/models.py:765
+#: furnitures/models.py:791 furnitures/models.py:797
msgid "Treatment type"
msgstr "Type de traitement"
-#: furnitures/models.py:760
+#: furnitures/models.py:792
msgid "Treatment types"
msgstr "Types de traitements"
-#: furnitures/models.py:773
+#: furnitures/models.py:805
msgid "Treatment"
msgstr "Traitement"
-#: furnitures/models.py:774
+#: furnitures/models.py:806
msgid "Treatments"
msgstr "Traitements"
-#: furnitures/models.py:776
+#: furnitures/models.py:808
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: furnitures/models.py:777
+#: furnitures/models.py:809
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: furnitures/models.py:778
+#: furnitures/models.py:810
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: furnitures/models.py:779
+#: furnitures/models.py:811
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre traitement"
-#: furnitures/models.py:787 furnitures/models.py:793
+#: furnitures/models.py:819 furnitures/models.py:825
msgid "Author type"
msgstr "Type d'auteur"
-#: furnitures/models.py:788
+#: furnitures/models.py:820
msgid "Author types"
msgstr "Types d'auteur"
-#: furnitures/models.py:796
+#: furnitures/models.py:828
msgid "Author"
msgstr "Auteur"
-#: furnitures/models.py:797
+#: furnitures/models.py:829
msgid "Authors"
msgstr "Auteurs"
-#: furnitures/models.py:811
+#: furnitures/models.py:843
msgid "Property"
msgstr "Propriété"
-#: furnitures/models.py:812
+#: furnitures/models.py:844
msgid "Properties"
msgstr "Propriétés"
-#: furnitures/views.py:286
+#: furnitures/views.py:197 templates/sheet_file.html:94
+msgid "Details"
+msgstr "Détails"
+
+#: furnitures/views.py:374
msgid "Operation not permitted."
msgstr "Opération non permise"
@@ -1090,11 +1093,11 @@ msgstr "Rechercher puis sélectionner un élément"
msgid "Export as CSV"
msgstr "Export en CSV"
-#: furnitures/widgets.py:227
+#: furnitures/widgets.py:228
msgid "No results"
msgstr "Pas de résultats"
-#: furnitures/widgets.py:227
+#: furnitures/widgets.py:228
msgid "Loading..."
msgstr "Chargement..."
@@ -1116,7 +1119,7 @@ msgstr "Changement de mot de passe"
msgid "Log in"
msgstr "Connexion"
-#: templates/base.html:41
+#: templates/base.html:42
msgid "Default items"
msgstr "Éléments par défaut"
@@ -1136,96 +1139,171 @@ msgstr "Valider"
msgid "Add/Modify"
msgstr "Ajouter-Modifier"
-#: templates/wizard_done.html:4
-msgid "Item successfully saved"
-msgstr "Élément enregistré avec succès"
+#: templates/sheet.html:15
+msgid "Close"
+msgstr "Fermer"
-#: templates/wizard_done_summary_2.html:7
-#: templates/wizard_list_search_result.html:9
-msgid "You have saved the following informations:"
-msgstr "Vous avez enregistré les informations suivantes :"
+#: templates/sheet_file.html:4
+msgid "Export as:"
+msgstr "Export en :"
-#: templates/wizard_file_sheet.html:5
-msgid "File description sheet"
-msgstr "Description de dossier archéologique"
+#: templates/sheet_file.html:4
+msgid "OpenOffice.org file"
+msgstr "fichier OpenOffice.org"
-#: templates/wizard_file_sheet.html:7 templates/wizard_file_sheet.html:54
-msgid "Numerical reference"
-msgstr "Référence numérique"
+#: templates/sheet_file.html:4
+msgid "PDF file"
+msgstr "fichier PDF"
-#: templates/wizard_file_sheet.html:9
-msgid "File's name"
-msgstr "Nom du dossier archéologique"
+#: templates/sheet_file.html:6
+msgid "Year:"
+msgstr "Année :"
-#: templates/wizard_file_sheet.html:11
-msgid "Edition date"
-msgstr "Date d'édition"
+#: templates/sheet_file.html:7
+msgid "Numerical reference:"
+msgstr "Référence numérique :"
-#: templates/wizard_file_sheet.html:15
-msgid "Deadline"
-msgstr "Date d'échéance"
+#: templates/sheet_file.html:9
+msgid "File's name:"
+msgstr "Nom du dossier archéologique :"
-#: templates/wizard_file_sheet.html:18
-msgid "Responsible"
-msgstr "Responsable"
+#: templates/sheet_file.html:11
+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/wizard_file_sheet.html:21
+#: templates/sheet_file.html:16
+msgid "Deadline:"
+msgstr "Date d'échéance :"
+
+#: templates/sheet_file.html:20
+msgid "In charge:"
+msgstr "Responsable :"
+
+#: templates/sheet_file.html:21
+msgid "State:"
+msgstr "État :"
+
+#: templates/sheet_file.html:21
msgid "Active file"
msgstr "Dossier archéologique actif"
-#: templates/wizard_file_sheet.html:24
+#: templates/sheet_file.html:22
msgid "Closed file"
-msgstr "Dossier archéologique clôt"
+msgstr "Dossier archéologique clos"
-#: templates/wizard_file_sheet.html:25
-msgid "Closure date"
-msgstr "Date de clotûre"
+#: templates/sheet_file.html:23
+msgid "Closing date:"
+msgstr "Date de clotûre :"
-#: templates/wizard_file_sheet.html:25
+#: templates/sheet_file.html:23
msgid "by"
msgstr "par"
-#: templates/wizard_file_sheet.html:33
-msgid "Communes"
-msgstr "Communes"
+#: templates/sheet_file.html:26
+msgid "Type:"
+msgstr "Type :"
-#: templates/wizard_file_sheet.html:35
-msgid "Principal adress"
-msgstr "Adresse principale"
+#: templates/sheet_file.html:28
+msgid "Related file:"
+msgstr "Dossier en relation avec :"
-# overload of translation of registration module
-#: templates/wizard_file_sheet.html:36
-msgid "Complementary adress"
-msgstr "Complément d'adresse"
+#: templates/sheet_file.html:29
+msgid "Comment:"
+msgstr "Commentaire :"
-#: templates/wizard_file_sheet.html:47
-msgid "Planed surface"
-msgstr "Surface envisagé"
+#: templates/sheet_file.html:32
+msgid "Towns:"
+msgstr "Communes :"
-#: templates/wizard_file_sheet.html:49
-msgid "Service"
-msgstr "Service"
+#: templates/sheet_file.html:34
+msgid "Main address:"
+msgstr "Adresse principale :"
-#: templates/wizard_file_sheet.html:52
-msgid "Contractor organisation"
-msgstr "Organisation de l'aménageur"
+#: templates/sheet_file.html:35
+msgid "Complement:"
+msgstr "Complément :"
-#: templates/wizard_file_sheet.html:53
-msgid "Contractor"
-msgstr "Aménageur"
+#: templates/sheet_file.html:36
+msgid "Postal code:"
+msgstr "Code postal :"
+
+#: templates/sheet_file.html:38
+msgid "Surface:"
+msgstr "Surface :"
+
+#: templates/sheet_file.html:43
+msgid "Preventive archaelogical file"
+msgstr "Dossier d'archéologie préventive"
+
+#: templates/sheet_file.html:44
+msgid "Planed surface:"
+msgstr "Surface envisagé :"
+
+#: templates/sheet_file.html:45
+msgid "Saisine type:"
+msgstr "Type de saisine :"
+
+#: templates/sheet_file.html:46
+msgid "Town planning service:"
+msgstr "Service instructeur :"
-#: templates/wizard_file_sheet.html:57
-msgid "Comments"
-msgstr "Commentaires"
+#: templates/sheet_file.html:47
+msgid "Permit type:"
+msgstr "Type de permis :"
-#: templates/wizard_file_sheet.html:62
+#: templates/sheet_file.html:48
+msgid "Permit reference:"
+msgstr "Référence du permis :"
+
+#: templates/sheet_file.html:49
+msgid "General contractor organisation:"
+msgstr "Organisation de l'aménageur :"
+
+#: templates/sheet_file.html:50
+msgid "General contractor:"
+msgstr "Aménageur :"
+
+#: templates/sheet_file.html:54
msgid "Admninistrative acts"
msgstr "Actes administratifs"
-#: templates/wizard_file_sheet.html:104
+#: templates/sheet_file.html:59 templates/sheet_file.html.py:107
+msgid "Date"
+msgstr "Date"
+
+#: templates/sheet_file.html:69
+msgid "No administrative act associated to this archaelogical file"
+msgstr "Pas d'acte administratif associé à ce dosser"
+
+#: templates/sheet_file.html:97
+msgid "No operation associated to this archaelogical file"
+msgstr "Pas d'opération associée à ce dosser"
+
+#: templates/sheet_file.html:102
msgid "Admninistrative acts linked to associated operations"
msgstr "Actes administratifs associés aux opérations"
+#: templates/sheet_file.html:117
+msgid "No administrative act linked to operations"
+msgstr "Pas d'acte administratif associée aux opérations"
+
+#: templates/wizard_done.html:4
+msgid "Item successfully saved"
+msgstr "Élément enregistré avec succès"
+
+#: templates/wizard_done_summary_2.html:7
+#: templates/wizard_list_search_result.html:9
+msgid "You have saved the following informations:"
+msgstr "Vous avez enregistré les informations suivantes :"
+
#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7
msgid "Ishtar administration"
msgstr "Administration d'Ishtar"
@@ -1298,78 +1376,3 @@ msgid "You are now registered. Activation email sent."
msgstr ""
"Vous être maintenant enregistré. Un courriel d'activation de votre compte "
"vous a été envoyé."
-
-#~ msgid "Modify"
-#~ msgstr "Modifier"
-
-#~ msgid "Person creation"
-#~ msgstr "Création d'individus"
-
-#~ msgid "Person modification"
-#~ msgstr "Modification d'un individu"
-
-#~ msgid "File management"
-#~ msgstr "Gestion des dossiers"
-
-#~ msgid "File creation"
-#~ msgstr "Création de dossier"
-
-#~ msgid "File deletion"
-#~ msgstr "Suppression de dossier"
-
-#~ msgid "Add an administrative act"
-#~ msgstr "Ajouter un acte administratif"
-
-#~ msgid "Modify an administrative act"
-#~ msgstr "Modifier un acte administratif"
-
-#~ msgid "Delete an administrative act"
-#~ msgstr "Supprimer un acte administratif"
-
-#~ msgid "Operation creation"
-#~ msgstr "Création de l'opération"
-
-#~ msgid "Operation modification"
-#~ msgstr "Modification de l'opération"
-
-#~ msgid "Operation closing"
-#~ msgstr "Clotûre de l'opération"
-
-#~ msgid "Operation deletion"
-#~ msgstr "Suppression de l'opération"
-
-#~ msgid "There are identical parcels."
-#~ msgstr "Il y a des parcelles identiques."
-
-#~ msgid "There are identical remain types."
-#~ msgstr "Il y a des types de vestige identiques."
-
-#~ msgid "Code DRACAR"
-#~ msgstr "Code DRACAR"
-
-#~ msgid "Your account on %(app_name)s has been created or modified."
-#~ msgstr "Votre compte sur %(app_name)s a été créé ou modifié"
-
-#~ msgid "Login:"
-#~ msgstr "Identifiant : "
-
-#~ msgid "Password:"
-#~ msgstr "Mot de passe : "
-
-#~ msgid "You can log in here:"
-#~ msgstr "Vous pouvez vous identifier ici : "
-
-#~ msgid "Thank you for you interest in the project."
-#~ msgstr "Merci l'intérêt que vous portez au projet."
-
-#~ msgid "The %(app_name)s team"
-#~ msgstr "L'équipe %(app_name)s"
-
-#~ msgid "Activate account at"
-#~ msgstr "Activer le compte à"
-
-#~ msgid "Link is valid for %(expiration_days)s days."
-#~ msgstr "Le lien est valide pendant %(expiration_days)s jours."
-
-#~ msgid "Account activation on"
-#~ msgstr "Activation du compte sur"
diff --git a/ishtar/templates/sheet_file.html b/ishtar/templates/sheet_file.html
index 5ec77a28b..4f1ebbc3d 100644
--- a/ishtar/templates/sheet_file.html
+++ b/ishtar/templates/sheet_file.html
@@ -18,7 +18,7 @@
{% endcomment %}
<p><label>{%trans "In charge:"%}</label><span class='value'>{{ item.in_charge.full_label }}</span></p>
-<p><label>{%trans "State"%}</label><span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
+<p><label>{%trans "State:"%}</label><span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
{% else %}{%trans "Closed file"%}</span></p>
<p><label>{%trans "Closing date:"%}</label><span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></p>
{% endif %}
@@ -80,7 +80,7 @@
<th>{% trans "In charge" %}</th>
<th>{% trans "Start date" %}</th>
<th>{% trans "End date" %}</th>
- <th></th>
+ <th>&nbsp;</th>
</tr>
{% for operation in item.operations.all %}
<tr>
@@ -94,7 +94,7 @@
<td><a href="#{#{%url show-operation operation.pk%}#}">{% trans "Details" %}</a></td>
</tr>
{% empty %}
- <tr><td colspan="4" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr>
+ <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr>
{% endfor %}
</table>
diff --git a/static/media/style.css b/static/media/style.css
index 0c0ef338e..9f048d59a 100644
--- a/static/media/style.css
+++ b/static/media/style.css
@@ -322,6 +322,7 @@ font-style:italic;
overflow:auto;
top:18px;
bottom:10px;
+ width:740px;
}
#window label{