diff options
3 files changed, 319 insertions, 76 deletions
diff --git a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po index 41c1c870a..ae4353e6f 100644 --- a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_context_records/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-07-17 22:31+0200\n" +"POT-Creation-Date: 2013-08-25 21:36+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -184,7 +184,7 @@ msgstr "Recherche de document" msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: ishtar_menu.py:28 models.py:200 +#: ishtar_menu.py:28 models.py:220 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -316,11 +316,16 @@ msgstr "Peut changer sa propre Unité d'Enregistrement" msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:197 +#: models.py:145 templates/ishtar/sheet_contextrecord.html:105 +msgctxt "short" +msgid "Context record" +msgstr "UE" + +#: models.py:217 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:198 +#: models.py:218 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" @@ -535,22 +540,17 @@ msgid "Finds" msgstr "Mobilier" #: templates/ishtar/sheet_contextrecord.html:102 -msgid "Find Id" -msgstr "Id. mobilier" +msgid "Complete Id" +msgstr "Id. complet" #: templates/ishtar/sheet_contextrecord.html:103 -msgid "Id by material type" -msgstr "Id. par type matériau" +msgid "Short Id" +msgstr "Id. court" #: templates/ishtar/sheet_contextrecord.html:104 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_contextrecord.html:105 -msgctxt "short" -msgid "Context record" -msgstr "UE" - #: templates/ishtar/sheet_contextrecord.html:106 msgid "Periods" msgstr "Périodes" @@ -563,10 +563,24 @@ msgstr "Poids" msgid "Numbers" msgstr "Nombre" -#: templates/ishtar/sheet_contextrecord.html:128 +#: templates/ishtar/sheet_contextrecord.html:111 +msgid "Container ref." +msgstr "Ref. conteneur" + +#: templates/ishtar/sheet_contextrecord.html:112 +msgid "Warehouse" +msgstr "Dépôt" + +#: templates/ishtar/sheet_contextrecord.html:130 msgid "Details" msgstr "Détails" -#: templates/ishtar/sheet_contextrecord.html:132 +#: templates/ishtar/sheet_contextrecord.html:134 msgid "No find associated to this context record" msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" + +#~ msgid "Find Id" +#~ msgstr "Id. mobilier" + +#~ msgid "Id by material type" +#~ msgstr "Id. par type matériau" diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po index 0aa38a549..f828e046a 100644 --- a/archaeological_files/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_files/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: 2012-10-22 00:16+0200\n" +"POT-Creation-Date: 2013-08-25 21:38+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -18,115 +18,125 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: forms.py:47 forms.py:79 models.py:67 +#: forms.py:48 forms.py:89 models.py:72 msgid "Person in charge" msgstr "Responsable" -#: forms.py:49 forms.py:95 models.py:65 +#: forms.py:50 forms.py:106 models.py:70 msgid "File type" msgstr "Type de dossier" -#: forms.py:51 forms.py:154 +#: forms.py:51 forms.py:169 msgid "Saisine type" msgstr "Type de saisine" -#: forms.py:52 forms.py:84 forms.py:105 models.py:60 +#: forms.py:52 forms.py:94 forms.py:120 models.py:63 +#: templates/ishtar/sheet_file.html:69 templates/ishtar/sheet_file.html:90 +#: templates/ishtar/sheet_file.html:110 templates/ishtar/sheet_file.html:138 msgid "Year" msgstr "Année" -#: forms.py:60 +#: forms.py:53 +msgid "Parcel (section/number)" +msgstr "Parcelle (section/numéro)" + +#: forms.py:70 msgid "Archaeological file search" msgstr "Recherche de dossiers archéologiques" -#: forms.py:71 +#: forms.py:81 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: forms.py:75 +#: forms.py:85 templates/ishtar/sheet_file.html:17 msgid "General" msgstr "Général" -#: forms.py:88 forms.py:107 models.py:62 +#: forms.py:98 forms.py:122 models.py:65 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:90 forms.py:109 models.py:63 +#: forms.py:100 forms.py:124 models.py:67 msgid "Internal reference" msgstr "Référence interne" -#: forms.py:93 models.py:79 +#: forms.py:103 models.py:69 +msgid "Name" +msgstr "Nom" + +#: forms.py:104 models.py:85 msgid "Creation date" msgstr "Date de création" -#: forms.py:97 models.py:83 +#: forms.py:107 models.py:89 msgid "Related file" msgstr "Dossier en relation avec" -#: forms.py:101 models.py:99 +#: forms.py:111 models.py:105 msgid "Comment" msgstr "Commentaire" -#: forms.py:113 +#: forms.py:128 msgid "Address" msgstr "Adresse" -#: forms.py:117 models.py:90 +#: forms.py:132 models.py:96 msgid "Total surface (m²)" msgstr "Surface totale des terrains (m²)" -#: forms.py:120 models.py:94 +#: forms.py:135 models.py:100 msgid "Main address" msgstr "Adresse des terrains" -#: forms.py:121 models.py:95 +#: forms.py:136 models.py:101 msgid "Main address - complement" msgstr "Adresse des terrains - complément" -#: forms.py:123 models.py:97 +#: forms.py:138 models.py:103 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: forms.py:127 +#: forms.py:142 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: forms.py:132 models.py:69 +#: forms.py:147 models.py:75 msgid "General contractor" msgstr "Aménageur" -#: forms.py:139 models.py:71 +#: forms.py:154 models.py:77 msgid "Town planning service" msgstr "Service instructeur" -#: forms.py:145 models.py:47 models.py:72 +#: forms.py:160 models.py:50 models.py:78 msgid "Permit type" msgstr "Type de permis" -#: forms.py:147 models.py:74 +#: forms.py:162 models.py:80 msgid "Permit reference" msgstr "Référence du permis" -#: forms.py:150 models.py:93 +#: forms.py:165 models.py:99 msgid "Total developed surface (m²)" msgstr "Surface totale aménagée (m²)" -#: forms.py:156 models.py:81 +#: forms.py:171 models.py:87 msgid "Reception date" msgstr "Date de réception" -#: forms.py:166 +#: forms.py:183 msgid "Would you like to close this archaeological file?" msgstr "Voulez vous clore ce dossier archéologique ?" -#: forms.py:171 +#: forms.py:188 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: forms.py:175 forms.py:192 +#: forms.py:192 forms.py:209 msgid "Act type" msgstr "Type d'acte" -#: ishtar_menu.py:30 models.py:103 +#: ishtar_menu.py:30 models.py:111 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -166,103 +176,321 @@ msgstr "Tableau de bord" msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:70 models.py:104 +#: ishtar_menu.py:70 models.py:112 #: templates/ishtar/dashboards/dashboard_file.html:9 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: models.py:33 +#: models.py:36 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: models.py:34 +#: models.py:37 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: models.py:48 +#: models.py:51 msgid "Permit types" msgstr "Types de permis" -#: models.py:52 +#: models.py:55 msgid "Delay (in days)" msgstr "Delai (en jours)" -#: models.py:76 +#: models.py:82 msgid "Closing date" msgstr "Date de clotûre" -#: models.py:77 +#: models.py:83 msgid "Towns" msgstr "Communes" -#: models.py:88 -msgid "Reference number" -msgstr "Référence" +#: models.py:94 +msgid "Ref. number" +msgstr "Réf. numérique" #: models.py:106 +msgid "Cached name" +msgstr "Nom en cache" + +#: models.py:114 +msgid "Can view all Archaelogical file" +msgstr "Peut voir tous les dossier archéologique" + +#: models.py:115 msgid "Can view own Archaelogical file" msgstr "Peut voir son propre Dossier archéologique" -#: models.py:107 +#: models.py:116 msgid "Can add own Archaelogical file" msgstr "Peut ajouter son propre Dossier archéologique" -#: models.py:108 +#: models.py:117 msgid "Can change own Archaelogical file" msgstr "Peut changer son propre Dossier archéologique" -#: models.py:109 +#: models.py:118 msgid "Can delete own Archaelogical file" msgstr "Peut supprimer son propre Dossier archéologique" -#: models.py:127 +#: models.py:124 +msgid "FILE" +msgstr "DOSSIER" + +#: models.py:161 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:174 +#: models.py:213 msgid "File" msgstr "Dossier" -#: models.py:175 +#: models.py:214 msgid "Department" msgstr "Département" -#: views.py:83 +#: views.py:88 msgid "File search" msgstr "Recherche de dossier archéologique" -#: views.py:92 +#: views.py:97 msgid "New file" msgstr "Nouveau dossier archéologique" -#: views.py:107 +#: views.py:112 msgid "File modification" msgstr "Modification de dossier archéologique" -#: views.py:118 +#: views.py:123 msgid "File closing" msgstr "Clotûre de dossier" -#: views.py:125 +#: views.py:130 msgid "File deletion" msgstr "Suppression de dossier archéologique" -#: views.py:133 +#: views.py:138 msgid "File: new administrative act" msgstr "Dossier archéologique : nouvel acte administratif" -#: views.py:143 +#: views.py:148 msgid "File: administrative act modification" msgstr "Dossier archéologique : modification d'acte administratif" -#: views.py:152 +#: views.py:157 msgid "File: administrative act deletion" msgstr "Dossier archéologique : suppression acte administratif" -#: wizards.py:135 +#: wizards.py:137 templates/ishtar/sheet_file.html:108 msgid "Associated operations" msgstr "Opérations associées" +#: templates/ishtar/sheet_file.html:7 +msgid "Previous version" +msgstr "Version précédente" + +#: templates/ishtar/sheet_file.html:11 +msgid "Are you sure to rollback to this version?" +msgstr "Êtes vous sûr de vouloir revenir à cette version ?" + +#: templates/ishtar/sheet_file.html:12 +msgid "Next version" +msgstr "Version suivante" + +#: templates/ishtar/sheet_file.html:16 +msgid "Export as:" +msgstr "Exporter en :" + +#: templates/ishtar/sheet_file.html:16 +msgid "OpenOffice.org file" +msgstr "Fichier OpenOffice.org" + +#: templates/ishtar/sheet_file.html:16 +msgid "PDF file" +msgstr "Fichier PDF" + +#: templates/ishtar/sheet_file.html:18 +msgid "Year:" +msgstr "Année :" + +#: templates/ishtar/sheet_file.html:19 +msgid "Numerical reference:" +msgstr "Référence numérique :" + +#: templates/ishtar/sheet_file.html:21 +msgid "File's name:" +msgstr "Nom du dossier :" + +#: templates/ishtar/sheet_file.html:23 +msgid "Edition date:" +msgstr "Date d'édition :" + +#: templates/ishtar/sheet_file.html:24 +msgid "Reception date:" +msgstr "Date de réception :" + +#: templates/ishtar/sheet_file.html:25 +msgid "Creation date:" +msgstr "Date de création :" + +#: templates/ishtar/sheet_file.html:32 +msgid "In charge:" +msgstr "Responsable :" + +#: templates/ishtar/sheet_file.html:33 +msgid "State:" +msgstr "État :" + +#: templates/ishtar/sheet_file.html:33 +msgid "Active file" +msgstr "Dossier actif" + +#: templates/ishtar/sheet_file.html:34 +msgid "Closed file" +msgstr "Dossier fermé" + +#: templates/ishtar/sheet_file.html:35 +msgid "Closing date:" +msgstr "Date de clotûre :" + +#: templates/ishtar/sheet_file.html:35 +msgid "by" +msgstr "par" + +#: templates/ishtar/sheet_file.html:38 +msgid "Type:" +msgstr "Type :" + +#: templates/ishtar/sheet_file.html:40 +msgid "Related file:" +msgstr "Dossier en relation avec :" + +#: templates/ishtar/sheet_file.html:41 +msgid "Comment:" +msgstr "Commentaire :" + +#: templates/ishtar/sheet_file.html:43 +msgid "Localisation" +msgstr "Localisation" + +#: templates/ishtar/sheet_file.html:44 +msgid "Towns:" +msgstr "Communes :" + +#: templates/ishtar/sheet_file.html:46 +msgid "Main address:" +msgstr "Adresse principale :" + +#: templates/ishtar/sheet_file.html:47 +msgid "Complement:" +msgstr "Complément :" + +#: templates/ishtar/sheet_file.html:48 +msgid "Postal code:" +msgstr "Code postal :" + +#: templates/ishtar/sheet_file.html:50 +msgid "Surface:" +msgstr "Surface :" + +#: templates/ishtar/sheet_file.html:55 +msgid "Preventive archaelogical file" +msgstr "Dossier d'archéologie préventive" + +#: templates/ishtar/sheet_file.html:56 +msgid "Developed surface:" +msgstr "Surface aménagée :" + +#: templates/ishtar/sheet_file.html:57 +msgid "Saisine type:" +msgstr "Type de saisine :" + +#: templates/ishtar/sheet_file.html:58 +msgid "Town planning service:" +msgstr "Service instructeur :" + +#: templates/ishtar/sheet_file.html:59 +msgid "Permit type:" +msgstr "Type de permis :" + +#: templates/ishtar/sheet_file.html:60 +msgid "Permit reference:" +msgstr "Référence du permis :" + +#: templates/ishtar/sheet_file.html:61 +msgid "General contractor organisation:" +msgstr "Aménageur (organiation) :" + +#: templates/ishtar/sheet_file.html:62 +msgid "General contractor:" +msgstr "Aménageur :" + +#: templates/ishtar/sheet_file.html:66 +msgid "Associated parcels" +msgstr "Opérations associées" + +#: templates/ishtar/sheet_file.html:70 +msgid "Section" +msgstr "Section" + +#: templates/ishtar/sheet_file.html:71 +msgid "Parcels" +msgstr "Parcelles" + +#: templates/ishtar/sheet_file.html:83 +msgid "No parcel associated to this operation" +msgstr "Pas de parcelle associée à cette opération" + +#: templates/ishtar/sheet_file.html:88 +msgid "Admninistrative acts" +msgstr "Actes administratif" + +#: templates/ishtar/sheet_file.html:91 templates/ishtar/sheet_file.html:111 +#: templates/ishtar/sheet_file.html:139 +msgid "Ref." +msgstr "Ref." + +#: templates/ishtar/sheet_file.html:92 templates/ishtar/sheet_file.html:113 +#: templates/ishtar/sheet_file.html:140 +msgid "Type" +msgstr "Type" + +#: templates/ishtar/sheet_file.html:93 templates/ishtar/sheet_file.html:141 +msgid "Date" +msgstr "Date" + +#: templates/ishtar/sheet_file.html:103 +msgid "No administrative act associated to this archaelogical file" +msgstr "Pas d'acte administratif associé à ce dossier archéologique" + +#: templates/ishtar/sheet_file.html:114 +msgid "In charge" +msgstr "Responsable" + +#: templates/ishtar/sheet_file.html:115 +msgid "Start date" +msgstr "Date de début" + +#: templates/ishtar/sheet_file.html:116 +msgid "Excavation end date" +msgstr "Date de fin de chantier" + +#: templates/ishtar/sheet_file.html:128 +msgid "Details" +msgstr "Détails" + +#: templates/ishtar/sheet_file.html:131 +msgid "No operation associated to this archaelogical file" +msgstr "Pas d'opération associée à ce dossier archéologique" + +#: templates/ishtar/sheet_file.html:136 +msgid "Admninistrative acts linked to associated operations" +msgstr "Actes administratifs associé à ces opérations" + +#: templates/ishtar/sheet_file.html:151 +msgid "No administrative act linked to operations" +msgstr "Pas d'acte administratif associé à ces opérations" + #: templates/ishtar/dashboards/dashboard_file.html:11 msgid "Global informations" msgstr "Informations générales" @@ -319,12 +547,14 @@ msgid "Archaeological files linked to at least one operation:" msgstr "Dossier archéologique associé au moins à une opération :" #: templates/ishtar/dashboards/dashboard_file.html:151 -msgid "Archaeological files linked to at least one operation (%):" -msgstr "Dossier archéologique associé au moins à une opération (%) :" +#, python-format +msgid "Archaeological files linked to at least one operation (%%):" +msgstr "Dossier archéologique associé au moins à une opération (%%) :" #: templates/ishtar/dashboards/dashboard_file.html:155 -msgid "Archaeological files linked to at least one operation (%)" -msgstr "Dossier archéologique associé au moins à une opération (%)" +#, python-format +msgid "Archaeological files linked to at least one operation (%%)" +msgstr "Dossier archéologique associé au moins à une opération (%%)" #: templates/ishtar/dashboards/dashboard_file.html:179 msgid "Surface by department (m²)" @@ -337,4 +567,3 @@ msgstr "Principales communes en nombre" #: templates/ishtar/dashboards/dashboard_file.html:203 msgid "Main towns by surface (m²)" msgstr "Principales communes en surface (m²)" - diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 2f5644ca0..ff0acb1a7 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -53,7 +53,7 @@ {% if item.is_preventive %} <h3>{% trans "Preventive archaelogical file"%}</h3> -<p><label>{%trans "Planed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></p> +<p><label>{%trans "Developed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></p> <p><label>{%trans "Saisine type:"%}</label> <span class='value'>{{ item.saisine_type }}</span></p> {% if item.town_planning_service %}<p><label>{%trans "Town planning service:"%}</label> <span class='value'>{{ item.town_planning_service }}</span></p>{% endif %} {% if item.permit_type %}<p><label>{%trans "Permit type:"%}</label> <span class='value'>{{ item.permit_type }}</span></p>{% endif %} @@ -65,7 +65,7 @@ <table> <caption>{%trans "Associated parcels"%}</caption> <tr> - <th>{% trans "Commune" %}</th> + <th>{% trans "Town" %}</th> <th>{% trans "Year" %}</th> <th>{% trans "Section" %}</th> <th>{% trans "Parcels" %}</th> |