diff options
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 4 | ||||
| -rw-r--r-- | archaeological_finds/locale/django.pot | 1 | ||||
| -rw-r--r-- | archaeological_operations/locale/django.pot | 181 | ||||
| -rw-r--r-- | archaeological_warehouse/locale/django.pot | 6 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 36 | ||||
| -rw-r--r-- | translations/fr/archaeological_context_records.po | 4 | ||||
| -rw-r--r-- | translations/fr/archaeological_operations.po | 182 | ||||
| -rw-r--r-- | translations/fr/archaeological_warehouse.po | 6 | ||||
| -rw-r--r-- | translations/fr/ishtar_common.po | 40 | 
9 files changed, 239 insertions, 221 deletions
| diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 8a74c7110..e01054c0d 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -590,11 +590,11 @@ msgstr ""  msgid "Document from this context record"  msgstr "" -#: templates/ishtar/sheet_contextrecord.html:129 +#: templates/ishtar/sheet_contextrecord.html:131  msgid "Finds"  msgstr "" -#: templates/ishtar/sheet_contextrecord.html:134 +#: templates/ishtar/sheet_contextrecord.html:136  msgid "Documents from associated finds"  msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 64cfa69b5..5705ef914 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -4,6 +4,7 @@  # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.  # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata  msgid ""  msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 4e15894e7..969d77335 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -4,15 +4,16 @@  # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.  # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata  msgid ""  msgstr ""  #: forms.py:66 forms.py:333 forms.py:903 forms.py:925 forms.py:929 -#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8 +#: models.py:782 templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Parcels"  msgstr "" -#: forms.py:69 forms.py:185 forms.py:879 models.py:770 +#: forms.py:69 forms.py:185 forms.py:879 models.py:772  #: templates/ishtar/blocks/window_tables/parcels.html:5  #: templates/ishtar/dashboards/dashboard_operation.html:302  #: templates/ishtar/dashboards/dashboard_operation.html:315 @@ -22,17 +23,17 @@ msgid "Town"  msgstr ""  #: forms.py:71 forms.py:422 forms.py:693 forms.py:1111 models.py:158 -#: models.py:587 models.py:768 +#: models.py:589 models.py:770  #: templates/ishtar/blocks/window_tables/parcels.html:6  msgid "Year"  msgstr "" -#: forms.py:74 models.py:771 +#: forms.py:74 models.py:773  #: templates/ishtar/blocks/window_tables/parcels.html:7  msgid "Section"  msgstr "" -#: forms.py:77 models.py:772 +#: forms.py:77 models.py:774  msgid "Parcel number"  msgstr "" @@ -64,8 +65,8 @@ msgstr ""  msgid "Relation type"  msgstr "" -#: forms.py:345 ishtar_menu.py:30 models.py:237 models.py:488 models.py:513 -#: models.py:528 models.py:579 models.py:767 wizards.py:338 wizards.py:349 +#: forms.py:345 ishtar_menu.py:30 models.py:237 models.py:490 models.py:515 +#: models.py:530 models.py:581 models.py:769 wizards.py:338 wizards.py:349  #: templates/ishtar/sheet_operation.html:6  msgid "Operation"  msgstr "" @@ -102,7 +103,7 @@ msgstr ""  msgid "Parcel (section/number)"  msgstr "" -#: forms.py:431 forms.py:1124 models.py:489 +#: forms.py:431 forms.py:1124 models.py:491  #: templates/ishtar/dashboards/dashboard_operation.html:273  #: templates/ishtar/dashboards/dashboard_operation.html:286  #: templates/ishtar/dashboards/dashboard_operation.html:453 @@ -123,15 +124,15 @@ msgstr ""  msgid "Is open?"  msgstr "" -#: forms.py:445 forms.py:721 models.py:155 +#: forms.py:445 forms.py:717 models.py:155  msgid "In charge"  msgstr "" -#: forms.py:452 models.py:573 +#: forms.py:452 models.py:575  msgid "Scientist in charge"  msgstr "" -#: forms.py:454 forms.py:617 forms.py:712 models.py:153 +#: forms.py:454 forms.py:617 forms.py:708 models.py:153  msgid "Operator"  msgstr "" @@ -165,7 +166,7 @@ msgstr ""  msgid "Search within relations"  msgstr "" -#: forms.py:474 forms.py:763 models.py:219 +#: forms.py:474 forms.py:759 models.py:219  msgid "Comment"  msgstr "" @@ -173,15 +174,15 @@ msgstr ""  msgid "Abstract (full text search)"  msgstr "" -#: forms.py:476 forms.py:765 models.py:231 +#: forms.py:476 forms.py:761 models.py:231  msgid "Record quality"  msgstr "" -#: forms.py:477 forms.py:744 models.py:185 +#: forms.py:477 forms.py:740 models.py:185  msgid "Report processing"  msgstr "" -#: forms.py:479 forms.py:768 models.py:226 +#: forms.py:479 forms.py:764 models.py:226  msgid "Virtual operation"  msgstr "" @@ -205,7 +206,7 @@ msgstr ""  msgid "Associated file"  msgstr "" -#: forms.py:583 forms.py:827 models.py:584 wizards.py:76 +#: forms.py:583 forms.py:827 models.py:586 wizards.py:76  msgid "Archaelogical file"  msgstr "" @@ -282,40 +283,36 @@ msgstr ""  msgid "Generic name"  msgstr "" -#: forms.py:698 forms.py:823 models.py:159 models.py:368 -msgid "Operation code" -msgstr "" - -#: forms.py:702 +#: forms.py:698  msgid "Head scientist"  msgstr "" -#: forms.py:718 models.py:217 +#: forms.py:714 models.py:217  msgid "Operator reference"  msgstr "" -#: forms.py:730 +#: forms.py:726  msgid "Total surface (m2)"  msgstr "" -#: forms.py:737 models.py:49 models.py:142 models.py:938 +#: forms.py:733 models.py:49 models.py:142 models.py:940  msgid "Start date"  msgstr "" -#: forms.py:739 models.py:144 +#: forms.py:735 models.py:144  msgid "Excavation end date"  msgstr "" -#: forms.py:742 models.py:145 +#: forms.py:738 models.py:145  msgid "Report delivery date"  msgstr "" -#: forms.py:793 +#: forms.py:791  msgid ""  "If you want to set an excavation end date you have to provide a start date."  msgstr "" -#: forms.py:798 +#: forms.py:796  msgid "The excavation end date cannot be before the start date."  msgstr "" @@ -330,6 +327,10 @@ msgstr ""  msgid "Bad operation code"  msgstr "" +#: forms.py:823 models.py:159 models.py:368 +msgid "Operation code" +msgstr "" +  #: forms.py:849  msgid "Preventive informations - excavation"  msgstr "" @@ -367,11 +368,11 @@ msgstr ""  msgid "Prescription on geoarchaeological context"  msgstr "" -#: forms.py:877 forms.py:899 models.py:170 models.py:597 +#: forms.py:877 forms.py:899 models.py:170 models.py:599  msgid "Towns"  msgstr "" -#: forms.py:906 models.py:779 models.py:936 +#: forms.py:906 models.py:781 models.py:938  msgid "Parcel"  msgstr "" @@ -420,7 +421,7 @@ msgstr ""  msgid "Would you like to delete this operation?"  msgstr "" -#: forms.py:1049 forms.py:1112 models.py:515 models.py:564 +#: forms.py:1049 forms.py:1112 models.py:517 models.py:566  msgid "Index"  msgstr "" @@ -447,7 +448,7 @@ msgstr ""  msgid "You should select a document."  msgstr "" -#: forms.py:1118 forms.py:1184 models.py:539 models.py:558 +#: forms.py:1118 forms.py:1184 models.py:541 models.py:560  msgid "Act type"  msgstr "" @@ -455,7 +456,7 @@ msgstr ""  msgid "Indexed?"  msgstr "" -#: forms.py:1125 forms.py:1189 models.py:588 +#: forms.py:1125 forms.py:1189 models.py:590  #: templates/ishtar/blocks/window_tables/administrativacts.html:8  msgid "Object"  msgstr "" @@ -468,7 +469,7 @@ msgstr ""  msgid "You should select an administrative act."  msgstr "" -#: forms.py:1192 models.py:585 +#: forms.py:1192 models.py:587  msgid "Signature date"  msgstr "" @@ -513,7 +514,7 @@ msgstr ""  msgid "Deletion"  msgstr "" -#: ishtar_menu.py:58 models.py:604 +#: ishtar_menu.py:58 models.py:606  #: templates/ishtar/sheet_administrativeact.html:6  msgid "Administrative act"  msgstr "" @@ -547,11 +548,11 @@ msgstr ""  msgid "Operations"  msgstr "" -#: models.py:48 models.py:64 models.py:1400 +#: models.py:48 models.py:64 models.py:1402  msgid "Order"  msgstr "" -#: models.py:50 models.py:939 +#: models.py:50 models.py:941  msgid "End date"  msgstr "" @@ -615,7 +616,7 @@ msgstr ""  msgid "In charge scientist"  msgstr "" -#: models.py:163 models.py:763 +#: models.py:163 models.py:765  msgid "File"  msgstr "" @@ -664,7 +665,7 @@ msgstr ""  msgid "Intercommunal"  msgstr "" -#: models.py:351 models.py:527 +#: models.py:351 models.py:529  msgid "Archaeological file"  msgstr "" @@ -676,189 +677,189 @@ msgstr ""  msgid "This operation code already exists for this year"  msgstr "" -#: models.py:459 +#: models.py:461  msgid "Inverse relation"  msgstr "" -#: models.py:463 +#: models.py:465  msgid "Operation relation type"  msgstr "" -#: models.py:464 +#: models.py:466  msgid "Operation relation types"  msgstr "" -#: models.py:477 +#: models.py:479  msgid "Operation record relation"  msgstr "" -#: models.py:478 +#: models.py:480  msgid "Operation record relations"  msgstr "" -#: models.py:499 +#: models.py:501  msgid "Operation documentation"  msgstr "" -#: models.py:500 +#: models.py:502  msgid "Operation documentations"  msgstr "" -#: models.py:503 +#: models.py:505  msgid "Can view all Operation sources"  msgstr "" -#: models.py:505 +#: models.py:507  msgid "Can view own Operation source"  msgstr "" -#: models.py:507 +#: models.py:509  msgid "Can add own Operation source"  msgstr "" -#: models.py:509 +#: models.py:511  msgid "Can change own Operation source"  msgstr "" -#: models.py:511 +#: models.py:513  msgid "Can delete own Operation source"  msgstr "" -#: models.py:530 +#: models.py:532  msgid "Intended to"  msgstr "" -#: models.py:532 +#: models.py:534  msgid "Code"  msgstr "" -#: models.py:535 +#: models.py:537  msgid "Associated template"  msgstr "" -#: models.py:536 +#: models.py:538  msgid "Indexed"  msgstr "" -#: models.py:540 +#: models.py:542  msgid "Act types"  msgstr "" -#: models.py:562 +#: models.py:564  msgid "Person in charge of the operation"  msgstr "" -#: models.py:568 +#: models.py:570  msgid "Archaeological preventive operator"  msgstr "" -#: models.py:576 +#: models.py:578  msgid "Signatory"  msgstr "" -#: models.py:594 +#: models.py:596  msgid "Departments"  msgstr "" -#: models.py:595 +#: models.py:597  msgid "Cached values get from associated departments"  msgstr "" -#: models.py:598 +#: models.py:600  msgid "Cached values get from associated towns"  msgstr "" -#: models.py:605 templates/ishtar/sheet_operation.html:134 +#: models.py:607 templates/ishtar/sheet_operation.html:134  msgid "Administrative acts"  msgstr "" -#: models.py:608 +#: models.py:610  msgid "Can view all Administrative acts"  msgstr "" -#: models.py:610 +#: models.py:612  msgid "Can view own Administrative act"  msgstr "" -#: models.py:612 +#: models.py:614  msgid "Can add own Administrative act"  msgstr "" -#: models.py:614 +#: models.py:616  msgid "Can change own Administrative act"  msgstr "" -#: models.py:616 +#: models.py:618  msgid "Can delete own Administrative act"  msgstr "" -#: models.py:625 +#: models.py:627  #: templates/ishtar/blocks/window_tables/administrativacts.html:5  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5  msgid "Ref."  msgstr "" -#: models.py:708 +#: models.py:710  msgid "This index already exists for this year"  msgstr "" -#: models.py:774 +#: models.py:776  msgid "External ID"  msgstr "" -#: models.py:776 +#: models.py:778  msgid "Address - Locality"  msgstr "" -#: models.py:934 +#: models.py:936  msgid "Owner"  msgstr "" -#: models.py:942 +#: models.py:944  msgid "Parcel owner"  msgstr "" -#: models.py:943 +#: models.py:945  msgid "Parcel owners"  msgstr "" -#: models.py:969 +#: models.py:971  msgid "Recorded"  msgstr "" -#: models.py:970 +#: models.py:972  msgid "Effective"  msgstr "" -#: models.py:971 +#: models.py:973  msgid "Active"  msgstr "" -#: models.py:972 +#: models.py:974  msgid "Field completed"  msgstr "" -#: models.py:973 +#: models.py:975  msgid "Associated report"  msgstr "" -#: models.py:974 +#: models.py:976  msgid "Closed"  msgstr "" -#: models.py:975 +#: models.py:977  msgid "Documented and closed"  msgstr "" -#: models.py:1401 +#: models.py:1403  msgid "Is preventive"  msgstr "" -#: models.py:1404 +#: models.py:1406  msgid "Operation type old"  msgstr "" -#: models.py:1405 +#: models.py:1407  msgid "Operation types old"  msgstr "" @@ -1110,10 +1111,18 @@ msgstr ""  msgid "Context records"  msgstr "" -#: templates/ishtar/sheet_operation.html:155 +#: templates/ishtar/sheet_operation.html:148 +msgid "Documents from associated context records" +msgstr "" + +#: templates/ishtar/sheet_operation.html:153  msgid "Finds"  msgstr "" +#: templates/ishtar/sheet_operation.html:158 +msgid "Documents from associated finds" +msgstr "" +  #: templates/ishtar/sheet_operationsource.html:6  msgid "Operation source"  msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 99f03fed7..cb0992a12 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -74,7 +74,7 @@ msgstr ""  msgid "Add a new container"  msgstr "" -#: forms.py:132 ishtar_menu.py:33 views.py:94 +#: forms.py:132 views.py:94  msgid "Packaging"  msgstr "" @@ -90,10 +90,6 @@ msgstr ""  msgid "Packaged finds"  msgstr "" -#: ishtar_menu.py:30 -msgid "Find" -msgstr "" -  #: models.py:31  msgid "Warehouse types"  msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 6f2d58879..0610c5e95 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -422,7 +422,7 @@ msgstr ""  msgid "Account management"  msgstr "" -#: ishtar_menu.py:34 models.py:853 views.py:1115 +#: ishtar_menu.py:34 models.py:853 views.py:1120  msgid "Global variables"  msgstr "" @@ -454,11 +454,11 @@ msgstr ""  msgid "Imports"  msgstr "" -#: ishtar_menu.py:99 views.py:1123 +#: ishtar_menu.py:99 views.py:1128  msgid "New import"  msgstr "" -#: ishtar_menu.py:103 views.py:1137 +#: ishtar_menu.py:103 views.py:1142  msgid "Current imports"  msgstr "" @@ -644,15 +644,15 @@ msgstr ""  msgid "Operation source"  msgstr "" -#: models.py:1259 views.py:940 views.py:991 +#: models.py:1259 views.py:945 views.py:996  msgid "Archaeological files"  msgstr "" -#: models.py:1261 views.py:943 views.py:999 +#: models.py:1261 views.py:948 views.py:1004  msgid "Context records"  msgstr "" -#: models.py:1263 views.py:945 views.py:1002 +#: models.py:1263 views.py:950 views.py:1007  msgid "Finds"  msgstr "" @@ -1163,34 +1163,34 @@ msgstr ""  msgid "Organization deletion"  msgstr "" -#: views.py:637 templates/base.html:80 +#: views.py:642 templates/base.html:80  #: templates/ishtar/sheet_organization.html:35  #: templatetags/link_to_window.py:16  msgid "Details"  msgstr "" -#: views.py:868 views.py:922 +#: views.py:873 views.py:927  msgid "Operation not permitted."  msgstr "" -#: views.py:870 +#: views.py:875  #, python-format  msgid "New %s"  msgstr "" -#: views.py:941 views.py:995 +#: views.py:946 views.py:1000  msgid "Operations"  msgstr "" -#: views.py:1184 templates/ishtar/import_list.html:43 +#: views.py:1189 templates/ishtar/import_list.html:43  msgid "Link unmatched items"  msgstr "" -#: views.py:1199 +#: views.py:1204  msgid "Delete import"  msgstr "" -#: views.py:1258 views.py:1274 +#: views.py:1263 views.py:1279  msgid "Corporation manager"  msgstr "" @@ -1198,11 +1198,11 @@ msgstr ""  msgid "Search..."  msgstr "" -#: widgets.py:602 templatetags/window_tables.py:80 +#: widgets.py:602 templatetags/window_tables.py:68  msgid "No results"  msgstr "" -#: widgets.py:603 templatetags/window_tables.py:81 +#: widgets.py:603 templatetags/window_tables.py:69  msgid "Loading..."  msgstr "" @@ -1571,7 +1571,11 @@ msgstr ""  msgid "."  msgstr "" -#: templates/blocks/form_flex_snippet.html:10 +#: templates/blocks/form_flex_snippet.html:12 +msgid "Show / hide advanced search" +msgstr "" + +#: templates/blocks/form_flex_snippet.html:18  #: templates/blocks/form_snippet.html:9  msgid "Help"  msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index d86fd954a..7d679c1f8 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -603,11 +603,11 @@ msgstr "Pas d'opération rattachée à cette UE !"  msgid "Document from this context record"  msgstr "Document associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:129 +#: templates/ishtar/sheet_contextrecord.html:131  msgid "Finds"  msgstr "Mobilier" -#: templates/ishtar/sheet_contextrecord.html:134 +#: templates/ishtar/sheet_contextrecord.html:136  msgid "Documents from associated finds"  msgstr "Documents du mobilier associé" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index affedb29b..eb5ab5738 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -10,7 +10,7 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-03-07 12:01-0500\n" +"PO-Revision-Date: 2016-03-16 03:20-0400\n"  "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n" @@ -18,11 +18,11 @@ msgstr ""  "X-Generator: Zanata 3.8.2\n"  #: forms.py:66 forms.py:333 forms.py:903 forms.py:925 forms.py:929 -#: models.py:780 templates/ishtar/blocks/window_tables/parcels.html:8 +#: models.py:782 templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Parcels"  msgstr "Parcelles" -#: forms.py:69 forms.py:185 forms.py:879 models.py:770 +#: forms.py:69 forms.py:185 forms.py:879 models.py:772  #: templates/ishtar/blocks/window_tables/parcels.html:5  #: templates/ishtar/dashboards/dashboard_operation.html:302  #: templates/ishtar/dashboards/dashboard_operation.html:315 @@ -32,17 +32,17 @@ msgid "Town"  msgstr "Commune"  #: forms.py:71 forms.py:422 forms.py:693 forms.py:1111 models.py:158 -#: models.py:587 models.py:768 +#: models.py:589 models.py:770  #: templates/ishtar/blocks/window_tables/parcels.html:6  msgid "Year"  msgstr "Année" -#: forms.py:74 models.py:771 +#: forms.py:74 models.py:773  #: templates/ishtar/blocks/window_tables/parcels.html:7  msgid "Section"  msgstr "Section" -#: forms.py:77 models.py:772 +#: forms.py:77 models.py:774  msgid "Parcel number"  msgstr "Numéro de parcelle" @@ -74,8 +74,8 @@ msgstr "Il y a des parcelles identiques."  msgid "Relation type"  msgstr "Type de relation" -#: forms.py:345 ishtar_menu.py:30 models.py:237 models.py:488 models.py:513 -#: models.py:528 models.py:579 models.py:767 wizards.py:338 wizards.py:349 +#: forms.py:345 ishtar_menu.py:30 models.py:237 models.py:490 models.py:515 +#: models.py:530 models.py:581 models.py:769 wizards.py:338 wizards.py:349  #: templates/ishtar/sheet_operation.html:6  msgid "Operation"  msgstr "Opération" @@ -112,7 +112,7 @@ msgstr "Identifiant numérique"  msgid "Parcel (section/number)"  msgstr "Parcelle (section/numéro)" -#: forms.py:431 forms.py:1124 models.py:489 +#: forms.py:431 forms.py:1124 models.py:491  #: templates/ishtar/dashboards/dashboard_operation.html:273  #: templates/ishtar/dashboards/dashboard_operation.html:286  #: templates/ishtar/dashboards/dashboard_operation.html:453 @@ -133,15 +133,15 @@ msgstr "Type d'opération"  msgid "Is open?"  msgstr "Est ouvert ?" -#: forms.py:445 forms.py:721 models.py:155 +#: forms.py:445 forms.py:717 models.py:155  msgid "In charge"  msgstr "Responsable" -#: forms.py:452 models.py:573 +#: forms.py:452 models.py:575  msgid "Scientist in charge"  msgstr "Responsable scientifique" -#: forms.py:454 forms.py:617 forms.py:712 models.py:153 +#: forms.py:454 forms.py:617 forms.py:708 models.py:153  msgid "Operator"  msgstr "Opérateur" @@ -175,7 +175,7 @@ msgstr "Terminé après"  msgid "Search within relations"  msgstr "Recherche parmi les relations" -#: forms.py:474 forms.py:763 models.py:219 +#: forms.py:474 forms.py:759 models.py:219  msgid "Comment"  msgstr "Commentaire" @@ -183,15 +183,15 @@ msgstr "Commentaire"  msgid "Abstract (full text search)"  msgstr "Résumé (recherche texte intégral)" -#: forms.py:476 forms.py:765 models.py:231 +#: forms.py:476 forms.py:761 models.py:231  msgid "Record quality"  msgstr "Qualité d'enregistrement" -#: forms.py:477 forms.py:744 models.py:185 +#: forms.py:477 forms.py:740 models.py:185  msgid "Report processing"  msgstr "Traitement du rapport" -#: forms.py:479 forms.py:768 models.py:226 +#: forms.py:479 forms.py:764 models.py:226  msgid "Virtual operation"  msgstr "Opération virtuelle" @@ -215,7 +215,7 @@ msgstr "Recherche d'opérations"  msgid "Associated file"  msgstr "Dossier associé" -#: forms.py:583 forms.py:827 models.py:584 wizards.py:76 +#: forms.py:583 forms.py:827 models.py:586 wizards.py:76  msgid "Archaelogical file"  msgstr "Dossier" @@ -292,42 +292,38 @@ msgstr "Général"  msgid "Generic name"  msgstr "Nom générique" -#: forms.py:698 forms.py:823 models.py:159 models.py:368 -msgid "Operation code" -msgstr "Code de l'opération" - -#: forms.py:702 +#: forms.py:698  msgid "Head scientist"  msgstr "Responsable scientifique" -#: forms.py:718 models.py:217 +#: forms.py:714 models.py:217  msgid "Operator reference"  msgstr "Référence de l'opérateur" -#: forms.py:730 +#: forms.py:726  msgid "Total surface (m2)"  msgstr "Surface totale (m2)" -#: forms.py:737 models.py:49 models.py:142 models.py:938 +#: forms.py:733 models.py:49 models.py:142 models.py:940  msgid "Start date"  msgstr "Date de début" -#: forms.py:739 models.py:144 +#: forms.py:735 models.py:144  msgid "Excavation end date"  msgstr "Date de fin de chantier" -#: forms.py:742 models.py:145 +#: forms.py:738 models.py:145  msgid "Report delivery date"  msgstr "Date de livraison du rapport" -#: forms.py:793 +#: forms.py:791  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:798 +#: forms.py:796  msgid "The excavation end date cannot be before the start date."  msgstr ""  "La date de fin de chantier ne peut être antérieure à la date de début." @@ -345,6 +341,10 @@ msgstr ""  msgid "Bad operation code"  msgstr "Mauvais code d'opération" +#: forms.py:823 models.py:159 models.py:368 +msgid "Operation code" +msgstr "Code de l'opération" +  #: forms.py:849  msgid "Preventive informations - excavation"  msgstr "Information archéologie préventive - fouille" @@ -382,11 +382,11 @@ msgstr "Prescription sur une vaste surface"  msgid "Prescription on geoarchaeological context"  msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:877 forms.py:899 models.py:170 models.py:597 +#: forms.py:877 forms.py:899 models.py:170 models.py:599  msgid "Towns"  msgstr "Communes" -#: forms.py:906 models.py:779 models.py:936 +#: forms.py:906 models.py:781 models.py:938  msgid "Parcel"  msgstr "Parcelle" @@ -435,7 +435,7 @@ msgstr "Voulez-vous clore cette opération ?"  msgid "Would you like to delete this operation?"  msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1049 forms.py:1112 models.py:515 models.py:564 +#: forms.py:1049 forms.py:1112 models.py:517 models.py:566  msgid "Index"  msgstr "Index" @@ -464,7 +464,7 @@ msgstr "Recherche de document"  msgid "You should select a document."  msgstr "Vous devez sélectionner un document." -#: forms.py:1118 forms.py:1184 models.py:539 models.py:558 +#: forms.py:1118 forms.py:1184 models.py:541 models.py:560  msgid "Act type"  msgstr "Type d'acte" @@ -472,7 +472,7 @@ msgstr "Type d'acte"  msgid "Indexed?"  msgstr "Indexé ?" -#: forms.py:1125 forms.py:1189 models.py:588 +#: forms.py:1125 forms.py:1189 models.py:590  #: templates/ishtar/blocks/window_tables/administrativacts.html:8  msgid "Object"  msgstr "Objet" @@ -485,7 +485,7 @@ msgstr "Recherche d'actes administratifs"  msgid "You should select an administrative act."  msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1192 models.py:585 +#: forms.py:1192 models.py:587  msgid "Signature date"  msgstr "Date de signature" @@ -530,7 +530,7 @@ msgstr "Clôture"  msgid "Deletion"  msgstr "Suppression" -#: ishtar_menu.py:58 models.py:604 +#: ishtar_menu.py:58 models.py:606  #: templates/ishtar/sheet_administrativeact.html:6  msgid "Administrative act"  msgstr "Acte administratif" @@ -564,11 +564,11 @@ msgstr "Informations générales"  msgid "Operations"  msgstr "Opérations" -#: models.py:48 models.py:64 models.py:1400 +#: models.py:48 models.py:64 models.py:1402  msgid "Order"  msgstr "Ordre" -#: models.py:50 models.py:939 +#: models.py:50 models.py:941  msgid "End date"  msgstr "Date de fin" @@ -632,7 +632,7 @@ msgstr "Date de clôture"  msgid "In charge scientist"  msgstr "Responsable scientifique" -#: models.py:163 models.py:763 +#: models.py:163 models.py:765  msgid "File"  msgstr "Dossier" @@ -683,7 +683,7 @@ msgstr "OPE"  msgid "Intercommunal"  msgstr "Intercommunal" -#: models.py:351 models.py:527 +#: models.py:351 models.py:529  msgid "Archaeological file"  msgstr "Dossier archéologique" @@ -695,189 +695,189 @@ msgstr "Code patriarche"  msgid "This operation code already exists for this year"  msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:459 +#: models.py:461  msgid "Inverse relation"  msgstr "Relation inverse" -#: models.py:463 +#: models.py:465  msgid "Operation relation type"  msgstr "Type de relation entre opérations" -#: models.py:464 +#: models.py:466  msgid "Operation relation types"  msgstr "Types de relation entre opérations" -#: models.py:477 +#: models.py:479  msgid "Operation record relation"  msgstr "Relation entre opérations" -#: models.py:478 +#: models.py:480  msgid "Operation record relations"  msgstr "Relations entre opérations" -#: models.py:499 +#: models.py:501  msgid "Operation documentation"  msgstr "Documentation d'une opération" -#: models.py:500 +#: models.py:502  msgid "Operation documentations"  msgstr "Documentations des opérations" -#: models.py:503 +#: models.py:505  msgid "Can view all Operation sources"  msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:505 +#: models.py:507  msgid "Can view own Operation source"  msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:507 +#: models.py:509  msgid "Can add own Operation source"  msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:509 +#: models.py:511  msgid "Can change own Operation source"  msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:511 +#: models.py:513  msgid "Can delete own Operation source"  msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:530 +#: models.py:532  msgid "Intended to"  msgstr "Destiné à" -#: models.py:532 +#: models.py:534  msgid "Code"  msgstr "Code" -#: models.py:535 +#: models.py:537  msgid "Associated template"  msgstr "Patron associé" -#: models.py:536 +#: models.py:538  msgid "Indexed"  msgstr "Indexé" -#: models.py:540 +#: models.py:542  msgid "Act types"  msgstr "Types d'acte" -#: models.py:562 +#: models.py:564  msgid "Person in charge of the operation"  msgstr "Responsable d'opération" -#: models.py:568 +#: models.py:570  msgid "Archaeological preventive operator"  msgstr "Opérateur d'archéologie préventive" -#: models.py:576 +#: models.py:578  msgid "Signatory"  msgstr "Signataire" -#: models.py:594 +#: models.py:596  msgid "Departments"  msgstr "Départements" -#: models.py:595 +#: models.py:597  msgid "Cached values get from associated departments"  msgstr "Valeur en cache des départements associés" -#: models.py:598 +#: models.py:600  msgid "Cached values get from associated towns"  msgstr "Valeur en cache des communes associées" -#: models.py:605 templates/ishtar/sheet_operation.html:134 +#: models.py:607 templates/ishtar/sheet_operation.html:134  msgid "Administrative acts"  msgstr "Actes administratifs" -#: models.py:608 +#: models.py:610  msgid "Can view all Administrative acts"  msgstr "Peut voir tous les Actes administratifs" -#: models.py:610 +#: models.py:612  msgid "Can view own Administrative act"  msgstr "Peut voir son propre Acte administratif" -#: models.py:612 +#: models.py:614  msgid "Can add own Administrative act"  msgstr "Peut ajouter son propre Acte administratif" -#: models.py:614 +#: models.py:616  msgid "Can change own Administrative act"  msgstr "Peut modifier son propre Acte administratif" -#: models.py:616 +#: models.py:618  msgid "Can delete own Administrative act"  msgstr "Peut supprimer son propre Acte administratif" -#: models.py:625 +#: models.py:627  #: templates/ishtar/blocks/window_tables/administrativacts.html:5  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5  msgid "Ref."  msgstr "Réf." -#: models.py:708 +#: models.py:710  msgid "This index already exists for this year"  msgstr "Cet index existe déjà pour cette année." -#: models.py:774 +#: models.py:776  msgid "External ID"  msgstr "ID externe" -#: models.py:776 +#: models.py:778  msgid "Address - Locality"  msgstr "Adresse - Lieu-dit" -#: models.py:934 +#: models.py:936  msgid "Owner"  msgstr "Propriétaire" -#: models.py:942 +#: models.py:944  msgid "Parcel owner"  msgstr "Propriétaire de parcelle" -#: models.py:943 +#: models.py:945  msgid "Parcel owners"  msgstr "Propriétaires de parcelle" -#: models.py:969 +#: models.py:971  msgid "Recorded"  msgstr "Enregistré" -#: models.py:970 +#: models.py:972  msgid "Effective"  msgstr "Effectif" -#: models.py:971 +#: models.py:973  msgid "Active"  msgstr "Actif" -#: models.py:972 +#: models.py:974  msgid "Field completed"  msgstr "Terrain achevé" -#: models.py:973 +#: models.py:975  msgid "Associated report"  msgstr "Rapport associé" -#: models.py:974 +#: models.py:976  msgid "Closed"  msgstr "Clos" -#: models.py:975 +#: models.py:977  msgid "Documented and closed"  msgstr "Documenté et clos" -#: models.py:1401 +#: models.py:1403  msgid "Is preventive"  msgstr "Préventif" -#: models.py:1404 +#: models.py:1406  msgid "Operation type old"  msgstr "Type d'opération - ancien" -#: models.py:1405 +#: models.py:1407  msgid "Operation types old"  msgstr "Types d'opération - ancien" @@ -1131,10 +1131,18 @@ msgstr "Documents de cette opération"  msgid "Context records"  msgstr "Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:155 +#: templates/ishtar/sheet_operation.html:148 +msgid "Documents from associated context records" +msgstr "Documents des Unités d'Enregistrement associées" + +#: templates/ishtar/sheet_operation.html:153  msgid "Finds"  msgstr "Mobilier" +#: templates/ishtar/sheet_operation.html:158 +msgid "Documents from associated finds" +msgstr "Documents du mobilier associé" +  #: templates/ishtar/sheet_operationsource.html:6  msgid "Operation source"  msgstr "Documentation associée à l'opération" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 331e2a61e..94ae37c05 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -83,7 +83,7 @@ msgstr "Vous devez sélectionner un contenant."  msgid "Add a new container"  msgstr "Ajouter un nouveau contenant." -#: forms.py:132 ishtar_menu.py:33 views.py:94 +#: forms.py:132 views.py:94  msgid "Packaging"  msgstr "Conditionnement" @@ -99,10 +99,6 @@ msgstr "Date"  msgid "Packaged finds"  msgstr "Mobilier conditionné" -#: ishtar_menu.py:30 -msgid "Find" -msgstr "Mobilier" -  #: models.py:31  msgid "Warehouse types"  msgstr "Types de dépôts" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 34aa3ca58..4177bafdd 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -10,8 +10,8 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-02-26 10:49-0500\n" -"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"PO-Revision-Date: 2016-03-16 03:21-0400\n" +"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n"  "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -444,7 +444,7 @@ msgstr "Administration"  msgid "Account management"  msgstr "Gestion des comptes" -#: ishtar_menu.py:34 models.py:853 views.py:1115 +#: ishtar_menu.py:34 models.py:853 views.py:1120  msgid "Global variables"  msgstr "Variables globales" @@ -476,11 +476,11 @@ msgstr "Suppression"  msgid "Imports"  msgstr "Imports" -#: ishtar_menu.py:99 views.py:1123 +#: ishtar_menu.py:99 views.py:1128  msgid "New import"  msgstr "Nouvel import" -#: ishtar_menu.py:103 views.py:1137 +#: ishtar_menu.py:103 views.py:1142  msgid "Current imports"  msgstr "Imports en cours" @@ -666,15 +666,15 @@ msgstr "Parcelles"  msgid "Operation source"  msgstr "Documentation de l'opération" -#: models.py:1259 views.py:940 views.py:991 +#: models.py:1259 views.py:945 views.py:996  msgid "Archaeological files"  msgstr "Dossiers archéologiques" -#: models.py:1261 views.py:943 views.py:999 +#: models.py:1261 views.py:948 views.py:1004  msgid "Context records"  msgstr "Unités d'Enregistrement" -#: models.py:1263 views.py:945 views.py:1002 +#: models.py:1263 views.py:950 views.py:1007  msgid "Finds"  msgstr "Mobilier" @@ -1185,34 +1185,34 @@ msgstr "Modification d'une organisation"  msgid "Organization deletion"  msgstr "Suppression d'une organisation" -#: views.py:637 templates/base.html:80 +#: views.py:642 templates/base.html:80  #: templates/ishtar/sheet_organization.html:35  #: templatetags/link_to_window.py:16  msgid "Details"  msgstr "Détails" -#: views.py:868 views.py:922 +#: views.py:873 views.py:927  msgid "Operation not permitted."  msgstr "Opération non permise." -#: views.py:870 +#: views.py:875  #, python-format  msgid "New %s"  msgstr "Nouveau %s" -#: views.py:941 views.py:995 +#: views.py:946 views.py:1000  msgid "Operations"  msgstr "Opérations" -#: views.py:1184 templates/ishtar/import_list.html:43 +#: views.py:1189 templates/ishtar/import_list.html:43  msgid "Link unmatched items"  msgstr "Associer les éléments non rapprochés" -#: views.py:1199 +#: views.py:1204  msgid "Delete import"  msgstr "Suppression de l'import" -#: views.py:1258 views.py:1274 +#: views.py:1263 views.py:1279  msgid "Corporation manager"  msgstr "Représentant de la personne morale" @@ -1220,11 +1220,11 @@ msgstr "Représentant de la personne morale"  msgid "Search..."  msgstr "Recherche..." -#: widgets.py:602 templatetags/window_tables.py:80 +#: widgets.py:602 templatetags/window_tables.py:68  msgid "No results"  msgstr "Pas de résultats" -#: widgets.py:603 templatetags/window_tables.py:81 +#: widgets.py:603 templatetags/window_tables.py:69  msgid "Loading..."  msgstr "Chargement..." @@ -1595,7 +1595,11 @@ msgstr ", "  msgid "."  msgstr "." -#: templates/blocks/form_flex_snippet.html:10 +#: templates/blocks/form_flex_snippet.html:12 +msgid "Show / hide advanced search" +msgstr "Afficher/cacher la recherche avancée" + +#: templates/blocks/form_flex_snippet.html:18  #: templates/blocks/form_snippet.html:9  msgid "Help"  msgstr "Aide" | 
