diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
commit | f8a59f8ee688220661890bb71733476eaa7f8a53 (patch) | |
tree | 0254b160ab0b9f0987c0fa0cf07380f76d43b48c | |
parent | a854fb0090f0deb674e83011c45a2e6c4ff0caee (diff) | |
parent | 2e76aa8d77164a80f28edf4cfe8fee2c1e267c86 (diff) | |
download | Ishtar-f8a59f8ee688220661890bb71733476eaa7f8a53.tar.bz2 Ishtar-f8a59f8ee688220661890bb71733476eaa7f8a53.zip |
Merge branch 'master' into v1.0v1.0
-rw-r--r-- | CHANGES.md | 8 | ||||
-rw-r--r-- | archaeological_finds/locale/django.pot | 332 | ||||
-rw-r--r-- | archaeological_warehouse/locale/django.pot | 16 | ||||
-rw-r--r-- | ishtar_common/locale/django.pot | 23 | ||||
-rw-r--r-- | ishtar_common/views.py | 2 | ||||
-rw-r--r-- | translations/fr/archaeological_context_records.po | 8 | ||||
-rw-r--r-- | translations/fr/archaeological_files.po | 8 | ||||
-rw-r--r-- | translations/fr/archaeological_files_pdl.po | 8 | ||||
-rw-r--r-- | translations/fr/archaeological_finds.po | 346 | ||||
-rw-r--r-- | translations/fr/archaeological_operations.po | 11 | ||||
-rw-r--r-- | translations/fr/archaeological_warehouse.po | 24 | ||||
-rw-r--r-- | translations/fr/ishtar_common.po | 38 | ||||
-rw-r--r-- | version.py | 2 |
13 files changed, 419 insertions, 407 deletions
diff --git a/CHANGES.md b/CHANGES.md index 992cf824c..fa27c4150 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,14 @@ Ishtar changelog ================ +v1.0 (2017-09-21) +----------------- + +First release! + +### Bug fixes ### +- Fix pined search + v0.99.27 (2017-09-09) --------------------- ### Features ### diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 1a09f38df..2103bb11b 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -9,350 +9,354 @@ msgid "" msgstr "" -#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:538 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:367 models_finds.py:539 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1166 -#: models_finds.py:1187 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:706 models_finds.py:1188 +#: models_finds.py:1209 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:151 -#: models_finds.py:635 templates/ishtar/sheet_find.html:17 +#: forms.py:142 forms.py:349 forms.py:631 models_finds.py:152 +#: models_finds.py:636 templates/ishtar/sheet_find.html:17 msgid "Free ID" msgstr "" -#: forms.py:144 models_finds.py:688 +#: forms.py:144 models_finds.py:689 msgid "Previous ID" msgstr "" -#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:636 models_treatments.py:128 +#: forms.py:145 forms.py:389 forms_treatments.py:134 models_finds.py:156 +#: models_finds.py:637 models_treatments.py:128 msgid "Description" msgstr "" -#: forms.py:148 forms.py:389 models_finds.py:164 +#: forms.py:148 models_finds.py:163 +msgid "Discovery date" +msgstr "" + +#: forms.py:150 forms.py:391 models_finds.py:165 msgid "Batch/object" msgstr "" -#: forms.py:150 models_finds.py:665 +#: forms.py:152 models_finds.py:666 msgid "Is complete?" msgstr "" -#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:51 +#: forms.py:155 forms.py:379 forms.py:635 models_finds.py:52 msgid "Material type" msgstr "" -#: forms.py:155 forms.py:381 models_finds.py:63 models_finds.py:640 +#: forms.py:157 forms.py:383 models_finds.py:64 models_finds.py:641 msgid "Conservatory state" msgstr "" -#: forms.py:158 models_finds.py:642 +#: forms.py:160 models_finds.py:643 msgid "Conservatory comment" msgstr "" -#: forms.py:161 models_finds.py:113 models_finds.py:668 +#: forms.py:163 models_finds.py:114 models_finds.py:669 msgid "Object types" msgstr "" -#: forms.py:164 forms.py:380 models_finds.py:72 +#: forms.py:166 forms.py:382 models_finds.py:73 msgid "Preservation type" msgstr "" -#: forms.py:167 forms.py:383 models_finds.py:670 +#: forms.py:169 forms.py:385 models_finds.py:671 msgid "Integrity / interest" msgstr "" -#: forms.py:170 forms.py:385 models_finds.py:673 +#: forms.py:172 forms.py:387 models_finds.py:674 msgid "Remarkability" msgstr "" -#: forms.py:173 models_finds.py:169 +#: forms.py:175 models_finds.py:170 msgid "Point of topographic reference" msgstr "" -#: forms.py:176 models_finds.py:171 templates/ishtar/sheet_find.html:208 +#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:208 msgid "X" msgstr "" -#: forms.py:177 models_finds.py:172 templates/ishtar/sheet_find.html:209 +#: forms.py:179 models_finds.py:173 templates/ishtar/sheet_find.html:209 msgid "Y" msgstr "" -#: forms.py:178 models_finds.py:173 templates/ishtar/sheet_find.html:210 +#: forms.py:180 models_finds.py:174 templates/ishtar/sheet_find.html:210 msgid "Z" msgstr "" -#: forms.py:180 models_finds.py:181 +#: forms.py:182 models_finds.py:182 msgid "Spatial Reference System" msgstr "" -#: forms.py:183 models_finds.py:174 +#: forms.py:185 models_finds.py:175 msgid "Estimated error for X" msgstr "" -#: forms.py:185 models_finds.py:176 +#: forms.py:187 models_finds.py:177 msgid "Estimated error for Y" msgstr "" -#: forms.py:187 models_finds.py:178 +#: forms.py:189 models_finds.py:179 msgid "Estimated error for Z" msgstr "" -#: forms.py:188 models_finds.py:677 +#: forms.py:190 models_finds.py:678 msgid "Length (cm)" msgstr "" -#: forms.py:189 models_finds.py:678 +#: forms.py:191 models_finds.py:679 msgid "Width (cm)" msgstr "" -#: forms.py:190 models_finds.py:679 +#: forms.py:192 models_finds.py:680 msgid "Height (cm)" msgstr "" -#: forms.py:191 models_finds.py:680 +#: forms.py:193 models_finds.py:681 msgid "Diameter (cm)" msgstr "" -#: forms.py:192 models_finds.py:681 +#: forms.py:194 models_finds.py:682 msgid "Thickness (cm)" msgstr "" -#: forms.py:193 forms.py:634 models_finds.py:647 +#: forms.py:195 forms.py:636 models_finds.py:648 msgid "Volume (l)" msgstr "" -#: forms.py:194 forms.py:635 models_finds.py:648 +#: forms.py:196 forms.py:637 models_finds.py:649 msgid "Weight (g)" msgstr "" -#: forms.py:196 models_finds.py:682 +#: forms.py:198 models_finds.py:683 msgid "Dimensions comment" msgstr "" -#: forms.py:197 forms.py:636 models_finds.py:651 +#: forms.py:199 forms.py:638 models_finds.py:652 msgid "Find number" msgstr "" -#: forms.py:199 models_finds.py:676 +#: forms.py:201 models_finds.py:677 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:200 models_finds.py:684 +#: forms.py:202 models_finds.py:685 msgid "Mark" msgstr "" -#: forms.py:201 forms.py:390 models_finds.py:690 +#: forms.py:203 forms.py:392 models_finds.py:691 msgid "Check" msgstr "" -#: forms.py:203 models_finds.py:692 +#: forms.py:205 models_finds.py:693 msgid "Check date" msgstr "" -#: forms.py:204 forms_treatments.py:136 forms_treatments.py:479 -#: models_finds.py:156 models_finds.py:685 models_treatments.py:127 +#: forms.py:206 forms_treatments.py:136 forms_treatments.py:479 +#: models_finds.py:157 models_finds.py:686 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "" -#: forms.py:207 models_finds.py:686 +#: forms.py:209 models_finds.py:687 msgid "Comment on dating" msgstr "" -#: forms.py:208 models_finds.py:694 +#: forms.py:210 models_finds.py:695 msgid "Estimated value" msgstr "" -#: forms.py:210 forms_treatments.py:151 +#: forms.py:212 forms_treatments.py:151 msgid "Image" msgstr "" -#: forms.py:211 forms_treatments.py:152 +#: forms.py:213 forms_treatments.py:152 #, python-format msgid "" "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</" "p>" msgstr "" -#: forms.py:295 +#: forms.py:297 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: forms.py:304 +#: forms.py:306 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:310 forms.py:341 models_finds.py:659 +#: forms.py:312 forms.py:343 models_finds.py:660 msgid "Dating" msgstr "" -#: forms.py:315 forms.py:376 +#: forms.py:317 forms.py:378 msgid "Period" msgstr "" -#: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 -#: forms_treatments.py:481 models_finds.py:1192 models_treatments.py:130 +#: forms.py:318 forms_treatments.py:138 forms_treatments.py:283 +#: forms_treatments.py:481 models_finds.py:1214 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Start date" msgstr "" -#: forms.py:318 models_finds.py:1193 models_treatments.py:310 +#: forms.py:320 models_finds.py:1215 models_treatments.py:310 #: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137 msgid "End date" msgstr "" -#: forms.py:319 +#: forms.py:321 msgid "Quality" msgstr "" -#: forms.py:321 +#: forms.py:323 msgid "Dating type" msgstr "" -#: forms.py:323 +#: forms.py:325 msgid "Precise dating" msgstr "" -#: forms.py:345 models_finds.py:188 +#: forms.py:347 models_finds.py:189 msgid "Short ID" msgstr "" -#: forms.py:346 models_finds.py:191 +#: forms.py:348 models_finds.py:192 msgid "Complete ID" msgstr "" -#: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:352 forms_treatments.py:54 forms_treatments.py:96 #: forms_treatments.py:329 forms_treatments.py:401 forms_treatments.py:451 #: forms_treatments.py:579 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "" -#: forms.py:352 +#: forms.py:354 msgid "Operation's number (index by year)" msgstr "" -#: forms.py:355 +#: forms.py:357 msgid "Code PATRIARCHE" msgstr "" -#: forms.py:359 +#: forms.py:361 msgid "Archaeological site" msgstr "" -#: forms.py:371 +#: forms.py:373 msgid "Search within related operations" msgstr "" -#: forms.py:374 +#: forms.py:376 msgid "Search within related context records" msgstr "" -#: forms.py:378 models_finds.py:112 +#: forms.py:380 models_finds.py:113 msgid "Object type" msgstr "" -#: forms.py:391 forms_treatments.py:57 +#: forms.py:393 forms_treatments.py:57 msgid "Has an image?" msgstr "" -#: forms.py:445 +#: forms.py:447 msgid "Warehouse (location)" msgstr "" -#: forms.py:451 +#: forms.py:453 msgid "Warehouse (responsible)" msgstr "" -#: forms.py:456 +#: forms.py:458 msgid "Container ID" msgstr "" -#: forms.py:457 +#: forms.py:459 msgid "Container ref." msgstr "" -#: forms.py:461 forms.py:484 views.py:149 +#: forms.py:463 forms.py:486 views.py:149 msgid "Find search" msgstr "" -#: forms.py:509 templates/ishtar/sheet_treatment.html:46 +#: forms.py:511 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "" -#: forms.py:511 models_finds.py:706 +#: forms.py:513 models_finds.py:707 msgid "Finds" msgstr "" -#: forms.py:523 +#: forms.py:525 msgid "You should at least select one archaeological find." msgstr "" -#: forms.py:626 +#: forms.py:628 msgid "Resulting find" msgstr "" -#: forms.py:631 +#: forms.py:633 msgid "Precise description" msgstr "" -#: forms.py:646 +#: forms.py:648 msgid "Resulting finds" msgstr "" -#: forms.py:651 +#: forms.py:653 msgid "Would you like to delete this find?" msgstr "" -#: forms.py:655 models_treatments.py:91 +#: forms.py:657 models_treatments.py:91 msgid "Upstream find" msgstr "" -#: forms.py:668 +#: forms.py:670 msgid "Archaeological find search" msgstr "" -#: forms.py:670 +#: forms.py:672 msgid "You should select an archaeological find." msgstr "" -#: forms.py:675 +#: forms.py:677 msgid "Year of the operation" msgstr "" -#: forms.py:677 +#: forms.py:679 msgid "Numeric reference" msgstr "" -#: forms.py:684 +#: forms.py:686 msgid "Period of the archaeological find" msgstr "" -#: forms.py:686 +#: forms.py:688 msgid "Material type of the archaeological find" msgstr "" -#: forms.py:688 +#: forms.py:690 msgid "Description of the archaeological find" msgstr "" -#: forms.py:700 forms_treatments.py:680 forms_treatments.py:706 +#: forms.py:702 forms_treatments.py:680 forms_treatments.py:706 msgid "Documentation search" msgstr "" -#: forms.py:702 forms_treatments.py:682 forms_treatments.py:708 +#: forms.py:704 forms_treatments.py:682 forms_treatments.py:708 msgid "You should select a document." msgstr "" -#: forms.py:719 +#: forms.py:721 msgid "Another basket already exists with this name." msgstr "" -#: forms.py:729 forms.py:733 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:731 forms.py:735 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "" @@ -662,7 +666,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1189 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1211 msgid "Administrative act" msgstr "" @@ -685,303 +689,299 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: models_finds.py:44 +#: models_finds.py:45 msgid "Code" msgstr "" -#: models_finds.py:45 +#: models_finds.py:46 msgid "Recommendation" msgstr "" -#: models_finds.py:48 +#: models_finds.py:49 msgid "Parent material" msgstr "" -#: models_finds.py:52 models_finds.py:558 models_finds.py:638 +#: models_finds.py:53 models_finds.py:559 models_finds.py:639 msgid "Material types" msgstr "" -#: models_finds.py:60 +#: models_finds.py:61 msgid "Parent conservatory state" msgstr "" -#: models_finds.py:64 +#: models_finds.py:65 msgid "Conservatory states" msgstr "" -#: models_finds.py:73 +#: models_finds.py:74 msgid "Preservation types" msgstr "" -#: models_finds.py:81 +#: models_finds.py:82 msgid "Integrity / interest type" msgstr "" -#: models_finds.py:82 +#: models_finds.py:83 msgid "Integrity / interest types" msgstr "" -#: models_finds.py:90 +#: models_finds.py:91 msgid "Remarkability type" msgstr "" -#: models_finds.py:91 +#: models_finds.py:92 msgid "Remarkability types" msgstr "" -#: models_finds.py:98 models_finds.py:634 models_treatments.py:40 +#: models_finds.py:99 models_finds.py:635 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "" -#: models_finds.py:100 +#: models_finds.py:101 msgid "Batch type" msgstr "" -#: models_finds.py:101 +#: models_finds.py:102 msgid "Batch types" msgstr "" -#: models_finds.py:109 +#: models_finds.py:110 msgid "Parent" msgstr "" -#: models_finds.py:152 models_finds.py:631 models_treatments.py:125 +#: models_finds.py:153 models_finds.py:632 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "" -#: models_finds.py:154 models_finds.py:633 +#: models_finds.py:155 models_finds.py:634 msgid "External ID is set automatically" msgstr "" -#: models_finds.py:157 +#: models_finds.py:158 msgid "Special interest" msgstr "" -#: models_finds.py:161 -msgid "Context Record" -msgstr "" - #: models_finds.py:162 -msgid "Discovery date" +msgid "Context Record" msgstr "" -#: models_finds.py:167 +#: models_finds.py:168 msgid "Material index" msgstr "" -#: models_finds.py:183 +#: models_finds.py:184 msgid "Point (2D)" msgstr "" -#: models_finds.py:184 +#: models_finds.py:185 msgid "Point" msgstr "" -#: models_finds.py:185 +#: models_finds.py:186 msgid "Line" msgstr "" -#: models_finds.py:186 +#: models_finds.py:187 msgid "Polygon" msgstr "" -#: models_finds.py:189 models_finds.py:192 +#: models_finds.py:190 models_finds.py:193 msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:198 models_finds.py:629 +#: models_finds.py:199 models_finds.py:630 msgid "Base find" msgstr "" -#: models_finds.py:199 +#: models_finds.py:200 msgid "Base finds" msgstr "" -#: models_finds.py:201 +#: models_finds.py:202 msgid "Can view all Base finds" msgstr "" -#: models_finds.py:202 +#: models_finds.py:203 msgid "Can view own Base find" msgstr "" -#: models_finds.py:203 +#: models_finds.py:204 msgid "Can add own Base find" msgstr "" -#: models_finds.py:204 +#: models_finds.py:205 msgid "Can change own Base find" msgstr "" -#: models_finds.py:205 +#: models_finds.py:206 msgid "Can delete own Base find" msgstr "" -#: models_finds.py:462 +#: models_finds.py:463 msgid "g" msgstr "" -#: models_finds.py:463 +#: models_finds.py:464 msgid "kg" msgstr "" -#: models_finds.py:465 +#: models_finds.py:466 msgid "Not checked" msgstr "" -#: models_finds.py:466 +#: models_finds.py:467 msgid "Checked but incorrect" msgstr "" -#: models_finds.py:467 +#: models_finds.py:468 msgid "Checked and correct" msgstr "" -#: models_finds.py:539 templates/ishtar/sheet_find.html:19 +#: models_finds.py:540 templates/ishtar/sheet_find.html:19 msgid "Base find - Short ID" msgstr "" -#: models_finds.py:540 templates/ishtar/sheet_find.html:18 +#: models_finds.py:541 templates/ishtar/sheet_find.html:18 msgid "Base find - Complete ID" msgstr "" -#: models_finds.py:542 +#: models_finds.py:543 msgid "Operation (code)" msgstr "" -#: models_finds.py:544 +#: models_finds.py:545 msgid "Town" msgstr "" -#: models_finds.py:546 +#: models_finds.py:547 msgid "Operation (name)" msgstr "" -#: models_finds.py:548 +#: models_finds.py:549 msgid "Parcel" msgstr "" -#: models_finds.py:549 +#: models_finds.py:550 msgid "Batch" msgstr "" -#: models_finds.py:550 +#: models_finds.py:551 msgid "Base find - Comment" msgstr "" -#: models_finds.py:551 +#: models_finds.py:552 msgid "Base find - Description" msgstr "" -#: models_finds.py:552 +#: models_finds.py:553 msgid "Base find - Topographic localisation" msgstr "" -#: models_finds.py:554 +#: models_finds.py:555 msgid "Base find - Special interest" msgstr "" -#: models_finds.py:555 +#: models_finds.py:556 msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:556 models_finds.py:662 models_treatments.py:132 +#: models_finds.py:557 models_finds.py:663 models_treatments.py:132 #: models_treatments.py:312 templates/ishtar/sheet_find.html:93 #: templates/ishtar/sheet_find.html:135 msgid "Container" msgstr "" -#: models_finds.py:557 +#: models_finds.py:558 msgid "Periods" msgstr "" -#: models_finds.py:645 +#: models_finds.py:646 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:649 +#: models_finds.py:650 msgid "Weight unit" msgstr "" -#: models_finds.py:655 templates/ishtar/sheet_find.html:81 +#: models_finds.py:656 templates/ishtar/sheet_find.html:81 msgid "Upstream treatment" msgstr "" -#: models_finds.py:658 templates/ishtar/sheet_find.html:123 +#: models_finds.py:659 templates/ishtar/sheet_find.html:123 msgid "Downstream treatment" msgstr "" -#: models_finds.py:697 +#: models_finds.py:698 msgid "Collection" msgstr "" -#: models_finds.py:699 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:700 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "" -#: models_finds.py:708 +#: models_finds.py:709 msgid "Can view all Finds" msgstr "" -#: models_finds.py:709 +#: models_finds.py:710 msgid "Can view own Find" msgstr "" -#: models_finds.py:710 +#: models_finds.py:711 msgid "Can add own Find" msgstr "" -#: models_finds.py:711 +#: models_finds.py:712 msgid "Can change own Find" msgstr "" -#: models_finds.py:712 +#: models_finds.py:713 msgid "Can delete own Find" msgstr "" -#: models_finds.py:718 +#: models_finds.py:719 msgid "FIND" msgstr "" -#: models_finds.py:1152 +#: models_finds.py:1174 msgid "Find documentation" msgstr "" -#: models_finds.py:1153 +#: models_finds.py:1175 msgid "Find documentations" msgstr "" -#: models_finds.py:1156 +#: models_finds.py:1178 msgid "Can view all Find sources" msgstr "" -#: models_finds.py:1158 +#: models_finds.py:1180 msgid "Can view own Find source" msgstr "" -#: models_finds.py:1160 +#: models_finds.py:1182 msgid "Can add own Find source" msgstr "" -#: models_finds.py:1162 +#: models_finds.py:1184 msgid "Can change own Find source" msgstr "" -#: models_finds.py:1164 +#: models_finds.py:1186 msgid "Can delete own Find source" msgstr "" -#: models_finds.py:1190 +#: models_finds.py:1212 msgid "Person" msgstr "" -#: models_finds.py:1196 +#: models_finds.py:1218 msgid "Property" msgstr "" -#: models_finds.py:1197 +#: models_finds.py:1219 msgid "Properties" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index b616720a2..bd67ec168 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -177,8 +177,8 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:57 models.py:294 templates/ishtar/sheet_warehouse.html:20 -#: templates/ishtar/sheet_warehouse.html:53 +#: ishtar_menu.py:57 models.py:294 templates/ishtar/sheet_warehouse.html:21 +#: templates/ishtar/sheet_warehouse.html:54 msgid "Containers" msgstr "" @@ -318,27 +318,27 @@ msgstr "" msgid "Content" msgstr "" -#: templates/ishtar/sheet_warehouse.html:25 +#: templates/ishtar/sheet_warehouse.html:26 msgid "Attached containers" msgstr "" -#: templates/ishtar/sheet_warehouse.html:29 +#: templates/ishtar/sheet_warehouse.html:30 msgid "Statistics" msgstr "" -#: templates/ishtar/sheet_warehouse.html:30 +#: templates/ishtar/sheet_warehouse.html:31 msgid "These numbers are updated hourly" msgstr "" -#: templates/ishtar/sheet_warehouse.html:32 +#: templates/ishtar/sheet_warehouse.html:33 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_warehouse.html:39 +#: templates/ishtar/sheet_warehouse.html:40 msgid "Finds by location in the warehouse" msgstr "" -#: templates/ishtar/sheet_warehouse.html:59 +#: templates/ishtar/sheet_warehouse.html:60 msgid "Containers by location in the warehouse" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index c43a1e9ae..252f5ea64 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -184,7 +184,6 @@ msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 #: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 -#: templates/ishtar/sheet_organization.html:13 msgid "Town" msgstr "" @@ -221,7 +220,7 @@ msgstr "" #: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 -#: templates/ishtar/sheet_organization.html:21 +#: templates/ishtar/sheet_organization.html:18 msgid "Name" msgstr "" @@ -230,17 +229,15 @@ msgid "Organization type" msgstr "" #: forms_common.py:178 forms_common.py:402 models.py:1619 -#: templates/ishtar/sheet_organization.html:10 +#: templates/ishtar/blocks/sheet_address_section.html:3 msgid "Address" msgstr "" #: forms_common.py:180 forms_common.py:405 models.py:1620 -#: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" #: forms_common.py:182 forms_common.py:406 models.py:1622 -#: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" @@ -254,14 +251,14 @@ msgid "Email" msgstr "" #: forms_common.py:188 forms_common.py:385 models.py:1637 -#: templates/ishtar/sheet_organization.html:14 +#: templates/ishtar/sheet_organization.html:11 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" #: forms_common.py:189 forms_common.py:394 models.py:1649 -#: templates/ishtar/sheet_organization.html:15 +#: templates/ishtar/sheet_organization.html:12 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" @@ -271,7 +268,7 @@ msgstr "" #: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 -#: templates/ishtar/sheet_organization.html:23 +#: templates/ishtar/sheet_organization.html:20 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" msgstr "" @@ -293,7 +290,7 @@ msgid "Organization to merge" msgstr "" #: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 -#: templates/ishtar/sheet_organization.html:22 +#: templates/ishtar/sheet_organization.html:19 msgid "Surname" msgstr "" @@ -2307,19 +2304,19 @@ msgstr "" msgid "Created by:" msgstr "" -#: templates/ishtar/sheet_organization.html:19 +#: templates/ishtar/sheet_organization.html:16 msgid "Person in the organization" msgstr "" -#: templates/ishtar/sheet_organization.html:34 +#: templates/ishtar/sheet_organization.html:31 msgid "No person in this organization" msgstr "" -#: templates/ishtar/sheet_organization.html:38 +#: templates/ishtar/sheet_organization.html:35 msgid "General contractor organization of archaeological files" msgstr "" -#: templates/ishtar/sheet_organization.html:43 +#: templates/ishtar/sheet_organization.html:40 msgid "Planning service of archaeological files" msgstr "" diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 86c87d049..234dcd826 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -734,7 +734,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], model.objects.get(pk=dct["pk"])) except model.DoesNotExist: pass - elif dct == (base_request or {}): + elif dct == (my_base_request or {}): # a parent item may be selected in the default menu for name, key in my_relative_session_names: if name in request.session and request.session[name] \ diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 9e8696e18..d2aea31eb 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -7,13 +7,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-07-31 06:00-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 69e9d8473..35d68edb9 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -9,13 +9,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-04-07 06:32-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..c2cbc4204 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 6dcaa258f..e5cbc2995 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -8,179 +8,185 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-06-27 11:32-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:95 forms.py:99 forms.py:365 models_finds.py:538 wizards.py:64 +#: forms.py:95 forms.py:99 forms.py:367 models_finds.py:539 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:128 ishtar_menu.py:32 models_finds.py:705 models_finds.py:1166 -#: models_finds.py:1187 models_treatments.py:298 +#: forms.py:128 ishtar_menu.py:32 models_finds.py:706 models_finds.py:1188 +#: models_finds.py:1209 models_treatments.py:298 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:142 forms.py:347 forms.py:629 models_finds.py:151 -#: models_finds.py:635 templates/ishtar/sheet_find.html:17 +#: forms.py:142 forms.py:349 forms.py:631 models_finds.py:152 +#: models_finds.py:636 templates/ishtar/sheet_find.html:17 msgid "Free ID" msgstr "ID libre" -#: forms.py:144 models_finds.py:688 +#: forms.py:144 models_finds.py:689 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:145 forms.py:387 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:636 models_treatments.py:128 +#: forms.py:145 forms.py:389 forms_treatments.py:134 models_finds.py:156 +#: models_finds.py:637 models_treatments.py:128 msgid "Description" msgstr "Description" -#: forms.py:148 forms.py:389 models_finds.py:164 +#: forms.py:148 models_finds.py:163 +msgid "Discovery date" +msgstr "Date de découverte" + +#: forms.py:150 forms.py:391 models_finds.py:165 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:150 models_finds.py:665 +#: forms.py:152 models_finds.py:666 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:153 forms.py:377 forms.py:633 models_finds.py:51 +#: forms.py:155 forms.py:379 forms.py:635 models_finds.py:52 msgid "Material type" msgstr "Type de matériau" -#: forms.py:155 forms.py:381 models_finds.py:63 models_finds.py:640 +#: forms.py:157 forms.py:383 models_finds.py:64 models_finds.py:641 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:158 models_finds.py:642 +#: forms.py:160 models_finds.py:643 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:161 models_finds.py:113 models_finds.py:668 +#: forms.py:163 models_finds.py:114 models_finds.py:669 msgid "Object types" msgstr "Types d'objet" -#: forms.py:164 forms.py:380 models_finds.py:72 +#: forms.py:166 forms.py:382 models_finds.py:73 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:167 forms.py:383 models_finds.py:670 +#: forms.py:169 forms.py:385 models_finds.py:671 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:170 forms.py:385 models_finds.py:673 +#: forms.py:172 forms.py:387 models_finds.py:674 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:173 models_finds.py:169 +#: forms.py:175 models_finds.py:170 msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:176 models_finds.py:171 templates/ishtar/sheet_find.html:208 +#: forms.py:178 models_finds.py:172 templates/ishtar/sheet_find.html:208 msgid "X" msgstr "X" -#: forms.py:177 models_finds.py:172 templates/ishtar/sheet_find.html:209 +#: forms.py:179 models_finds.py:173 templates/ishtar/sheet_find.html:209 msgid "Y" msgstr "Y" -#: forms.py:178 models_finds.py:173 templates/ishtar/sheet_find.html:210 +#: forms.py:180 models_finds.py:174 templates/ishtar/sheet_find.html:210 msgid "Z" msgstr "Z" -#: forms.py:180 models_finds.py:181 +#: forms.py:182 models_finds.py:182 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: forms.py:183 models_finds.py:174 +#: forms.py:185 models_finds.py:175 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: forms.py:185 models_finds.py:176 +#: forms.py:187 models_finds.py:177 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: forms.py:187 models_finds.py:178 +#: forms.py:189 models_finds.py:179 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:188 models_finds.py:677 +#: forms.py:190 models_finds.py:678 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:189 models_finds.py:678 +#: forms.py:191 models_finds.py:679 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:190 models_finds.py:679 +#: forms.py:192 models_finds.py:680 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:191 models_finds.py:680 +#: forms.py:193 models_finds.py:681 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:192 models_finds.py:681 +#: forms.py:194 models_finds.py:682 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:193 forms.py:634 models_finds.py:647 +#: forms.py:195 forms.py:636 models_finds.py:648 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:194 forms.py:635 models_finds.py:648 +#: forms.py:196 forms.py:637 models_finds.py:649 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:196 models_finds.py:682 +#: forms.py:198 models_finds.py:683 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:197 forms.py:636 models_finds.py:651 +#: forms.py:199 forms.py:638 models_finds.py:652 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:199 models_finds.py:676 +#: forms.py:201 models_finds.py:677 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:200 models_finds.py:684 +#: forms.py:202 models_finds.py:685 msgid "Mark" msgstr "Marque" -#: forms.py:201 forms.py:390 models_finds.py:690 +#: forms.py:203 forms.py:392 models_finds.py:691 msgid "Check" msgstr "Vérification" -#: forms.py:203 models_finds.py:692 +#: forms.py:205 models_finds.py:693 msgid "Check date" msgstr "Date de vérification" -#: forms.py:204 forms_treatments.py:136 forms_treatments.py:479 -#: models_finds.py:156 models_finds.py:685 models_treatments.py:127 +#: forms.py:206 forms_treatments.py:136 forms_treatments.py:479 +#: models_finds.py:157 models_finds.py:686 models_treatments.py:127 #: models_treatments.py:511 msgid "Comment" msgstr "Commentaires" -#: forms.py:207 models_finds.py:686 +#: forms.py:209 models_finds.py:687 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:208 models_finds.py:694 +#: forms.py:210 models_finds.py:695 msgid "Estimated value" msgstr "Valeur estimée" -#: forms.py:210 forms_treatments.py:151 +#: forms.py:212 forms_treatments.py:151 msgid "Image" msgstr "Image" -#: forms.py:211 forms_treatments.py:152 +#: forms.py:213 forms_treatments.py:152 #, python-format msgid "" "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</" @@ -189,187 +195,185 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms.py:295 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +#: forms.py:297 +msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." -#: forms.py:304 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +#: forms.py:306 +msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." -#: forms.py:310 forms.py:341 models_finds.py:659 +#: forms.py:312 forms.py:343 models_finds.py:660 msgid "Dating" msgstr "Datation" -#: forms.py:315 forms.py:376 +#: forms.py:317 forms.py:378 msgid "Period" msgstr "Période" -#: forms.py:316 forms_treatments.py:138 forms_treatments.py:283 -#: forms_treatments.py:481 models_finds.py:1192 models_treatments.py:130 +#: forms.py:318 forms_treatments.py:138 forms_treatments.py:283 +#: forms_treatments.py:481 models_finds.py:1214 models_treatments.py:130 #: models_treatments.py:309 templates/ishtar/sheet_find.html:94 #: templates/ishtar/sheet_find.html:136 msgid "Start date" msgstr "Date de début" -#: forms.py:318 models_finds.py:1193 models_treatments.py:310 +#: forms.py:320 models_finds.py:1215 models_treatments.py:310 #: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:137 msgid "End date" msgstr "Date de fin" -#: forms.py:319 +#: forms.py:321 msgid "Quality" msgstr "Qualité" -#: forms.py:321 +#: forms.py:323 msgid "Dating type" msgstr "Type de datation" -#: forms.py:323 +#: forms.py:325 msgid "Precise dating" msgstr "Datation précise" -#: forms.py:345 models_finds.py:188 +#: forms.py:347 models_finds.py:189 msgid "Short ID" msgstr "ID court" -#: forms.py:346 models_finds.py:191 +#: forms.py:348 models_finds.py:192 msgid "Complete ID" msgstr "ID complet" -#: forms.py:350 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:352 forms_treatments.py:54 forms_treatments.py:96 #: forms_treatments.py:329 forms_treatments.py:401 forms_treatments.py:451 #: forms_treatments.py:579 models_treatments.py:103 models_treatments.py:483 msgid "Year" msgstr "Année" -#: forms.py:352 +#: forms.py:354 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: forms.py:355 +#: forms.py:357 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: forms.py:359 +#: forms.py:361 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:371 +#: forms.py:373 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:374 +#: forms.py:376 msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: forms.py:378 models_finds.py:112 +#: forms.py:380 models_finds.py:113 msgid "Object type" msgstr "Type d'objet" -#: forms.py:391 forms_treatments.py:57 +#: forms.py:393 forms_treatments.py:57 msgid "Has an image?" msgstr "Dispose d'une image ?" -#: forms.py:445 +#: forms.py:447 msgid "Warehouse (location)" msgstr "Dépôt (lieu)" -#: forms.py:451 +#: forms.py:453 msgid "Warehouse (responsible)" msgstr "Dépôt (responsable)" -#: forms.py:456 +#: forms.py:458 msgid "Container ID" msgstr "Identifiant du contenant" -#: forms.py:457 +#: forms.py:459 msgid "Container ref." msgstr "Réf. contenant" -#: forms.py:461 forms.py:484 views.py:149 +#: forms.py:463 forms.py:486 views.py:149 msgid "Find search" msgstr "Rechercher un mobilier" -#: forms.py:509 templates/ishtar/sheet_treatment.html:46 +#: forms.py:511 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:511 models_finds.py:706 +#: forms.py:513 models_finds.py:707 msgid "Finds" msgstr "Mobilier" -#: forms.py:523 +#: forms.py:525 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: forms.py:626 +#: forms.py:628 msgid "Resulting find" msgstr "Mobilier résultant" -#: forms.py:631 +#: forms.py:633 msgid "Precise description" msgstr "Description précise" -#: forms.py:646 +#: forms.py:648 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: forms.py:651 +#: forms.py:653 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: forms.py:655 models_treatments.py:91 +#: forms.py:657 models_treatments.py:91 msgid "Upstream find" msgstr "Mobilier amont" -#: forms.py:668 +#: forms.py:670 msgid "Archaeological find search" msgstr "Rechercher un mobilier" -#: forms.py:670 +#: forms.py:672 msgid "You should select an archaeological find." msgstr "Vous devez sélectionner du mobilier." -#: forms.py:675 +#: forms.py:677 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:677 +#: forms.py:679 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:684 +#: forms.py:686 msgid "Period of the archaeological find" msgstr "Période du mobilier" -#: forms.py:686 +#: forms.py:688 msgid "Material type of the archaeological find" msgstr "Type de matériau du mobilier" -#: forms.py:688 +#: forms.py:690 msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:700 forms_treatments.py:680 forms_treatments.py:706 +#: forms.py:702 forms_treatments.py:680 forms_treatments.py:706 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:702 forms_treatments.py:682 forms_treatments.py:708 +#: forms.py:704 forms_treatments.py:682 forms_treatments.py:708 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:719 +#: forms.py:721 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." -#: forms.py:729 forms.py:733 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:731 forms.py:735 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "Panier" @@ -685,7 +689,7 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1189 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1211 msgid "Administrative act" msgstr "Acte administratif" @@ -708,303 +712,299 @@ msgstr "Traitement" msgid "Simple treatments" msgstr "Traitements simples" -#: models_finds.py:44 +#: models_finds.py:45 msgid "Code" msgstr "Code" -#: models_finds.py:45 +#: models_finds.py:46 msgid "Recommendation" msgstr "Recommandation" -#: models_finds.py:48 +#: models_finds.py:49 msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:52 models_finds.py:558 models_finds.py:638 +#: models_finds.py:53 models_finds.py:559 models_finds.py:639 msgid "Material types" msgstr "Types de matériau" -#: models_finds.py:60 +#: models_finds.py:61 msgid "Parent conservatory state" msgstr "État sanitaire - parent" -#: models_finds.py:64 +#: models_finds.py:65 msgid "Conservatory states" msgstr "États sanitaires" -#: models_finds.py:73 +#: models_finds.py:74 msgid "Preservation types" msgstr "Types de conservation" -#: models_finds.py:81 +#: models_finds.py:82 msgid "Integrity / interest type" msgstr "Type d'intégrité / intérêt" -#: models_finds.py:82 +#: models_finds.py:83 msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: models_finds.py:90 +#: models_finds.py:91 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models_finds.py:91 +#: models_finds.py:92 msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:98 models_finds.py:634 models_treatments.py:40 +#: models_finds.py:99 models_finds.py:635 models_treatments.py:40 #: models_treatments.py:304 msgid "Order" msgstr "Ordre" -#: models_finds.py:100 +#: models_finds.py:101 msgid "Batch type" msgstr "Type de lot" -#: models_finds.py:101 +#: models_finds.py:102 msgid "Batch types" msgstr "Types de lot" -#: models_finds.py:109 +#: models_finds.py:110 msgid "Parent" msgstr "Parent" -#: models_finds.py:152 models_finds.py:631 models_treatments.py:125 +#: models_finds.py:153 models_finds.py:632 models_treatments.py:125 #: models_treatments.py:488 msgid "External ID" msgstr "ID externe" -#: models_finds.py:154 models_finds.py:633 +#: models_finds.py:155 models_finds.py:634 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models_finds.py:157 +#: models_finds.py:158 msgid "Special interest" msgstr "Intérêt spécifique" -#: models_finds.py:161 +#: models_finds.py:162 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models_finds.py:162 -msgid "Discovery date" -msgstr "Date de découverte" - -#: models_finds.py:167 +#: models_finds.py:168 msgid "Material index" msgstr "Index matériel" -#: models_finds.py:183 +#: models_finds.py:184 msgid "Point (2D)" msgstr "Point (2D)" -#: models_finds.py:184 +#: models_finds.py:185 msgid "Point" msgstr "Point" -#: models_finds.py:185 +#: models_finds.py:186 msgid "Line" msgstr "Ligne" -#: models_finds.py:186 +#: models_finds.py:187 msgid "Polygon" msgstr "Polygon" -#: models_finds.py:189 models_finds.py:192 +#: models_finds.py:190 models_finds.py:193 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:198 models_finds.py:629 +#: models_finds.py:199 models_finds.py:630 msgid "Base find" msgstr "Mobilier de base" -#: models_finds.py:199 +#: models_finds.py:200 msgid "Base finds" msgstr "Mobilier de base" -#: models_finds.py:201 +#: models_finds.py:202 msgid "Can view all Base finds" msgstr "Peut voir tout le Mobilier de base" -#: models_finds.py:202 +#: models_finds.py:203 msgid "Can view own Base find" msgstr "Peut voir son propre Mobilier de base" -#: models_finds.py:203 +#: models_finds.py:204 msgid "Can add own Base find" msgstr "Peut ajouter son propre Mobilier de base" -#: models_finds.py:204 +#: models_finds.py:205 msgid "Can change own Base find" msgstr "Peut modifier son propre Mobilier de base" -#: models_finds.py:205 +#: models_finds.py:206 msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models_finds.py:462 +#: models_finds.py:463 msgid "g" msgstr "g" -#: models_finds.py:463 +#: models_finds.py:464 msgid "kg" msgstr "kg" -#: models_finds.py:465 +#: models_finds.py:466 msgid "Not checked" msgstr "Non vérifié" -#: models_finds.py:466 +#: models_finds.py:467 msgid "Checked but incorrect" msgstr "Vérifié mais incorrect" -#: models_finds.py:467 +#: models_finds.py:468 msgid "Checked and correct" msgstr "Vérifié et correct" -#: models_finds.py:539 templates/ishtar/sheet_find.html:19 +#: models_finds.py:540 templates/ishtar/sheet_find.html:19 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models_finds.py:540 templates/ishtar/sheet_find.html:18 +#: models_finds.py:541 templates/ishtar/sheet_find.html:18 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models_finds.py:542 +#: models_finds.py:543 msgid "Operation (code)" msgstr "Opération (code)" -#: models_finds.py:544 +#: models_finds.py:545 msgid "Town" msgstr "Ville" -#: models_finds.py:546 +#: models_finds.py:547 msgid "Operation (name)" msgstr "Opération (nom)" -#: models_finds.py:548 +#: models_finds.py:549 msgid "Parcel" msgstr "Parcelle" -#: models_finds.py:549 +#: models_finds.py:550 msgid "Batch" msgstr "Lot" -#: models_finds.py:550 +#: models_finds.py:551 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models_finds.py:551 +#: models_finds.py:552 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models_finds.py:552 +#: models_finds.py:553 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models_finds.py:554 +#: models_finds.py:555 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models_finds.py:555 +#: models_finds.py:556 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:556 models_finds.py:662 models_treatments.py:132 +#: models_finds.py:557 models_finds.py:663 models_treatments.py:132 #: models_treatments.py:312 templates/ishtar/sheet_find.html:93 #: templates/ishtar/sheet_find.html:135 msgid "Container" msgstr "Contenant" -#: models_finds.py:557 +#: models_finds.py:558 msgid "Periods" msgstr "Périodes" -#: models_finds.py:645 +#: models_finds.py:646 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:649 +#: models_finds.py:650 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:655 templates/ishtar/sheet_find.html:81 +#: models_finds.py:656 templates/ishtar/sheet_find.html:81 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:658 templates/ishtar/sheet_find.html:123 +#: models_finds.py:659 templates/ishtar/sheet_find.html:123 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:697 +#: models_finds.py:698 msgid "Collection" msgstr "Collection" -#: models_finds.py:699 models_treatments.py:144 models_treatments.py:512 +#: models_finds.py:700 models_treatments.py:144 models_treatments.py:512 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:708 +#: models_finds.py:709 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:709 +#: models_finds.py:710 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:710 +#: models_finds.py:711 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:711 +#: models_finds.py:712 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:712 +#: models_finds.py:713 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:718 +#: models_finds.py:719 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1152 +#: models_finds.py:1174 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1153 +#: models_finds.py:1175 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1156 +#: models_finds.py:1178 msgid "Can view all Find sources" msgstr "Peut voir toutes les Documentations de mobilier" -#: models_finds.py:1158 +#: models_finds.py:1180 msgid "Can view own Find source" msgstr "Peut voir sa propre Documentation de mobilier" -#: models_finds.py:1160 +#: models_finds.py:1182 msgid "Can add own Find source" msgstr "Peut ajouter sa propre Documentation de mobilier" -#: models_finds.py:1162 +#: models_finds.py:1184 msgid "Can change own Find source" msgstr "Peut modifier sa propre Documentation de mobilier" -#: models_finds.py:1164 +#: models_finds.py:1186 msgid "Can delete own Find source" msgstr "Peut suprimer sa propre Documentation de mobilier" -#: models_finds.py:1190 +#: models_finds.py:1212 msgid "Person" msgstr "Individu" -#: models_finds.py:1196 +#: models_finds.py:1218 msgid "Property" msgstr "Propriété" -#: models_finds.py:1197 +#: models_finds.py:1219 msgid "Properties" msgstr "Propriétés" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 610a12fe0..b238ac575 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -9,13 +9,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-04-07 06:34-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -400,8 +402,7 @@ msgstr "" #: forms.py:929 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." +msgstr "La date de fin de chantier ne peut être antérieure à la date de début." #: forms.py:957 #, python-format diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 61fe82a60..65b40bc95 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -7,13 +7,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-04-07 06:34-0400\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -188,8 +190,8 @@ msgstr "Modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:57 models.py:294 templates/ishtar/sheet_warehouse.html:20 -#: templates/ishtar/sheet_warehouse.html:53 +#: ishtar_menu.py:57 models.py:294 templates/ishtar/sheet_warehouse.html:21 +#: templates/ishtar/sheet_warehouse.html:54 msgid "Containers" msgstr "Contenants" @@ -329,27 +331,27 @@ msgstr "Supprimer un contenant" msgid "Content" msgstr "Contenu" -#: templates/ishtar/sheet_warehouse.html:25 +#: templates/ishtar/sheet_warehouse.html:26 msgid "Attached containers" msgstr "Contenants associés" -#: templates/ishtar/sheet_warehouse.html:29 +#: templates/ishtar/sheet_warehouse.html:30 msgid "Statistics" msgstr "Statistiques" -#: templates/ishtar/sheet_warehouse.html:30 +#: templates/ishtar/sheet_warehouse.html:31 msgid "These numbers are updated hourly" msgstr "Ces chiffres sont mis à jour toutes les heures" -#: templates/ishtar/sheet_warehouse.html:32 +#: templates/ishtar/sheet_warehouse.html:33 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_warehouse.html:39 +#: templates/ishtar/sheet_warehouse.html:40 msgid "Finds by location in the warehouse" msgstr "Mobilier par lieu dans le dépôt" -#: templates/ishtar/sheet_warehouse.html:59 +#: templates/ishtar/sheet_warehouse.html:60 msgid "Containers by location in the warehouse" msgstr "Contenants par lieu dans le dépôt" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 3b8e41e07..60bfdb5ae 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -9,13 +9,15 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-21 22:25+0200\n" "PO-Revision-Date: 2017-07-31 06:01-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -204,7 +206,6 @@ msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 #: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 -#: templates/ishtar/sheet_organization.html:13 msgid "Town" msgstr "Commune" @@ -250,7 +251,7 @@ msgstr "Organisation" #: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 -#: templates/ishtar/sheet_organization.html:21 +#: templates/ishtar/sheet_organization.html:18 msgid "Name" msgstr "Nom" @@ -259,17 +260,15 @@ msgid "Organization type" msgstr "Type d'organisation" #: forms_common.py:178 forms_common.py:402 models.py:1619 -#: templates/ishtar/sheet_organization.html:10 +#: templates/ishtar/blocks/sheet_address_section.html:3 msgid "Address" msgstr "Adresse" #: forms_common.py:180 forms_common.py:405 models.py:1620 -#: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" #: forms_common.py:182 forms_common.py:406 models.py:1622 -#: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" @@ -283,14 +282,14 @@ msgid "Email" msgstr "Courriel" #: forms_common.py:188 forms_common.py:385 models.py:1637 -#: templates/ishtar/sheet_organization.html:14 +#: templates/ishtar/sheet_organization.html:11 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" #: forms_common.py:189 forms_common.py:394 models.py:1649 -#: templates/ishtar/sheet_organization.html:15 +#: templates/ishtar/sheet_organization.html:12 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" @@ -300,7 +299,7 @@ msgstr "Téléphone portable" #: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 -#: templates/ishtar/sheet_organization.html:23 +#: templates/ishtar/sheet_organization.html:20 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" msgstr "Type" @@ -322,7 +321,7 @@ msgid "Organization to merge" msgstr "Organisation à fusionner" #: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 -#: templates/ishtar/sheet_organization.html:22 +#: templates/ishtar/sheet_organization.html:19 msgid "Surname" msgstr "Prénom" @@ -1847,8 +1846,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "" -"Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2392,19 +2390,19 @@ msgstr "Fermer toutes les fenêtres" msgid "Created by:" msgstr "Créé par :" -#: templates/ishtar/sheet_organization.html:19 +#: templates/ishtar/sheet_organization.html:16 msgid "Person in the organization" msgstr "Personnes au sein de l'organisation" -#: templates/ishtar/sheet_organization.html:34 +#: templates/ishtar/sheet_organization.html:31 msgid "No person in this organization" msgstr "Pas de personne au sein de cette organisation" -#: templates/ishtar/sheet_organization.html:38 +#: templates/ishtar/sheet_organization.html:35 msgid "General contractor organization of archaeological files" msgstr "Organisation de l'aménageur des dossiers" -#: templates/ishtar/sheet_organization.html:43 +#: templates/ishtar/sheet_organization.html:40 msgid "Planning service of archaeological files" msgstr "Service instructeur des dossiers" @@ -2524,8 +2522,8 @@ msgid "" "Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s -" -" logiciel libre sous licence AGPL v3." +"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s " +"- logiciel libre sous licence AGPL v3." #: templates/ishtar/blocks/sheet_creation_section.html:3 msgctxt "Sheet" diff --git a/version.py b/version.py index 82e78a8ca..0b6f6f21b 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 27) +VERSION = (1, 0) def get_version(): |