diff options
| -rw-r--r-- | archaeological_files/locale/django.pot | 178 | ||||
| -rw-r--r-- | archaeological_operations/locale/django.pot | 278 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 55 | ||||
| -rw-r--r-- | translations/fr/archaeological_files.po | 186 | ||||
| -rw-r--r-- | translations/fr/archaeological_operations.po | 308 | ||||
| -rw-r--r-- | translations/fr/ishtar_common.po | 55 | 
6 files changed, 559 insertions, 501 deletions
| diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index ee94947e0..b1732ae06 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -7,214 +7,246 @@  msgid ""  msgstr "" -#: forms.py:51 forms.py:198 forms.py:242 forms.py:383 forms.py:437 +#: forms.py:51 forms.py:209 forms.py:253 forms.py:394 forms.py:421  #: models.py:75 templates/ishtar/sheet_file.html:150  msgid "Year"  msgstr "" -#: forms.py:52 forms.py:203 forms.py:244 forms.py:436 models.py:78 +#: forms.py:52 forms.py:214 forms.py:255 models.py:78  msgid "Numeric reference"  msgstr "" -#: forms.py:54 forms.py:205 forms.py:439 +#: forms.py:54 forms.py:216  msgid "Other reference"  msgstr "" -#: forms.py:59 forms.py:417 +#: forms.py:56 forms.py:429 +msgid "Parcel (section/number)" +msgstr "" + +#: forms.py:60 forms.py:441  msgid "File name"  msgstr "" -#: forms.py:60 forms.py:144 forms.py:209 models.py:84 +#: forms.py:61 forms.py:155 forms.py:220 models.py:84  msgid "File type"  msgstr "" -#: forms.py:61 forms.py:146 forms.py:306 -msgid "Saisine type" +#: forms.py:62 +msgid "Is active?"  msgstr "" -#: forms.py:62 -msgid "Parcel (section/number)" +#: forms.py:63 forms.py:157 forms.py:317 +msgid "Saisine type"  msgstr "" -#: forms.py:63 -msgid "Is active?" +#: forms.py:64 forms.py:307 models.py:57 models.py:115 +msgid "Permit type"  msgstr "" -#: forms.py:65 forms.py:274 forms.py:419 models.py:91 -msgid "General contractor" +#: forms.py:66 forms.py:310 models.py:116 +msgid "Permit reference"  msgstr "" -#: forms.py:72 forms.py:428 -msgid "Organization of general contractor" +#: forms.py:67 forms.py:226 forms.py:364 models.py:145 +#: templates/ishtar/sheet_file.html:111 +msgid "Comment"  msgstr "" -#: forms.py:79 forms.py:441 templates/ishtar/sheet_file.html:127 +#: forms.py:69 templates/ishtar/sheet_file.html:127  msgid "In charge"  msgstr "" -#: forms.py:86 forms.py:456 +#: forms.py:76 forms.py:285 forms.py:443 models.py:91 +msgid "General contractor" +msgstr "" + +#: forms.py:83 forms.py:452 +msgid "Organization of general contractor" +msgstr "" + +#: forms.py:90 forms.py:475  msgid "Created by"  msgstr "" -#: forms.py:93 forms.py:299 forms.py:449 models.py:116 -msgid "Permit reference" +#: forms.py:97 forms.py:483 +msgid "Modified by"  msgstr "" -#: forms.py:115 +#: forms.py:126  msgid "Archaeological file search"  msgstr "" -#: forms.py:129 +#: forms.py:140  msgid "You should select a file."  msgstr "" -#: forms.py:132 forms.py:207 models.py:124 +#: forms.py:143 forms.py:218 models.py:124  msgid "Creation date"  msgstr "" -#: forms.py:133 forms.py:309 models.py:126 +#: forms.py:144 forms.py:320 models.py:126  msgid "Reception date"  msgstr "" -#: forms.py:138 +#: forms.py:149  msgid "Slicing"  msgstr "" -#: forms.py:140 +#: forms.py:151  msgid "Department detail"  msgstr "" -#: forms.py:142 +#: forms.py:153  msgid "Date get from"  msgstr "" -#: forms.py:148 +#: forms.py:159  msgid "Date after"  msgstr "" -#: forms.py:150 +#: forms.py:161  msgid "Date before"  msgstr "" -#: forms.py:187 templates/ishtar/sheet_file.html:31 +#: forms.py:198 templates/ishtar/sheet_file.html:31  msgid "General"  msgstr "" -#: forms.py:192 models.py:86 +#: forms.py:203 models.py:86  msgid "Person in charge"  msgstr "" -#: forms.py:206 models.py:83 +#: forms.py:217 models.py:83  msgid "Name"  msgstr "" -#: forms.py:211 models.py:128 +#: forms.py:222 models.py:128  msgid "Related file"  msgstr "" -#: forms.py:215 forms.py:353 models.py:145 -#: templates/ishtar/sheet_file.html:111 -msgid "Comment" -msgstr "" - -#: forms.py:219 models.py:136 +#: forms.py:230 models.py:136  msgid "Total surface (m2)"  msgstr "" -#: forms.py:222 models.py:142 +#: forms.py:233 models.py:142  msgid "Main address"  msgstr "" -#: forms.py:223 +#: forms.py:234  msgid "Main address - complement"  msgstr "" -#: forms.py:235 +#: forms.py:246  #, python-format  msgid "<br/>(last recorded: %s)"  msgstr "" -#: forms.py:257 +#: forms.py:268  msgid "Another file with this numeric id exists."  msgstr "" -#: forms.py:268 +#: forms.py:279  msgid "Preventive informations"  msgstr "" -#: forms.py:286 models.py:103 +#: forms.py:297 models.py:103  msgid "Responsible for town planning service"  msgstr "" -#: forms.py:296 models.py:57 models.py:115 -msgid "Permit type" -msgstr "" - -#: forms.py:302 models.py:139 +#: forms.py:313 models.py:139  msgid "Total developed surface (m2)"  msgstr "" -#: forms.py:321 templates/ishtar/sheet_file.html:101 +#: forms.py:332 templates/ishtar/sheet_file.html:101  #: templates/ishtar/dashboards/dashboard_file.html:42  msgid "Research archaeology"  msgstr "" -#: forms.py:329 models.py:148 templates/ishtar/sheet_file.html:102 +#: forms.py:340 models.py:148 templates/ishtar/sheet_file.html:102  msgid "Departments"  msgstr "" -#: forms.py:340 models.py:157 +#: forms.py:351 models.py:157  msgid "Scientist in charge"  msgstr "" -#: forms.py:342 models.py:151 templates/ishtar/sheet_file.html:104 +#: forms.py:353 models.py:151 templates/ishtar/sheet_file.html:104  msgid "Requested operation type"  msgstr "" -#: forms.py:344 +#: forms.py:355  msgid "Lead organization"  msgstr "" -#: forms.py:360 models.py:161 templates/ishtar/sheet_file.html:109 +#: forms.py:371 models.py:161 templates/ishtar/sheet_file.html:109  msgid "Classified area"  msgstr "" -#: forms.py:362 models.py:163 templates/ishtar/sheet_file.html:110 +#: forms.py:373 models.py:163 templates/ishtar/sheet_file.html:110  msgid "Protected area"  msgstr "" -#: forms.py:374 +#: forms.py:385  msgid "Would you like to close this archaeological file?"  msgstr "" -#: forms.py:379 +#: forms.py:390  msgid "Would you like to delete this archaelogical file ?"  msgstr "" -#: forms.py:384 +#: forms.py:395 forms.py:422  msgid "Index"  msgstr "" -#: forms.py:388 forms.py:411 forms.py:498 +#: forms.py:399 forms.py:426 forms.py:531  msgid "Act type"  msgstr "" -#: forms.py:389 forms.py:453 +#: forms.py:400  msgid "Object (full text search)"  msgstr "" -#: forms.py:394 forms.py:452 models.py:518 +#: forms.py:405 forms.py:432 models.py:518  msgid "Department"  msgstr "" -#: forms.py:413 +#: forms.py:427 +msgid "Indexed?" +msgstr "" + +#: forms.py:433 +msgid "Object" +msgstr "" + +#: forms.py:437  msgid "Signature date after"  msgstr "" -#: forms.py:415 +#: forms.py:439  msgid "Signature date before"  msgstr "" +#: forms.py:460 +msgid "File numeric reference" +msgstr "" + +#: forms.py:461 +msgid "File year" +msgstr "" + +#: forms.py:463 +msgid "File other reference" +msgstr "" + +#: forms.py:465 +msgid "File in charge" +msgstr "" + +#: forms.py:473 +msgid "File permit reference" +msgstr "" +  #: ishtar_menu.py:33 models.py:185 templates/ishtar/sheet_file.html:6  msgid "Archaeological file"  msgstr "" @@ -384,39 +416,39 @@ msgstr ""  msgid "File"  msgstr "" -#: views.py:144 +#: views.py:155  msgid "File search"  msgstr "" -#: views.py:153 +#: views.py:164  msgid "New file"  msgstr "" -#: views.py:172 +#: views.py:183  msgid "File modification"  msgstr "" -#: views.py:195 +#: views.py:206  msgid "File closing"  msgstr "" -#: views.py:200 +#: views.py:211  msgid "File deletion"  msgstr "" -#: views.py:207 +#: views.py:218  msgid "File: search administrative act"  msgstr "" -#: views.py:216 +#: views.py:227  msgid "File: new administrative act"  msgstr "" -#: views.py:226 +#: views.py:237  msgid "File: administrative act modification"  msgstr "" -#: views.py:235 +#: views.py:246  msgid "File: administrative act deletion"  msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index f27f74e8b..a112d4d16 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -7,12 +7,12 @@  msgid ""  msgstr "" -#: forms.py:69 forms.py:336 forms.py:883 forms.py:905 forms.py:909 +#: forms.py:69 forms.py:336 forms.py:895 forms.py:917 forms.py:921  #: models.py:791 templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Parcels"  msgstr "" -#: forms.py:72 forms.py:188 forms.py:859 models.py:781 +#: forms.py:72 forms.py:188 forms.py:871 models.py:781  #: templates/ishtar/blocks/window_tables/parcels.html:5  #: templates/ishtar/dashboards/dashboard_operation.html:302  #: templates/ishtar/dashboards/dashboard_operation.html:315 @@ -21,7 +21,7 @@ msgstr ""  msgid "Town"  msgstr "" -#: forms.py:74 forms.py:414 forms.py:709 forms.py:1072 models.py:161 +#: forms.py:74 forms.py:417 forms.py:685 forms.py:1084 models.py:161  #: models.py:597 models.py:779  #: templates/ishtar/blocks/window_tables/parcels.html:6  msgid "Year" @@ -86,352 +86,356 @@ msgstr ""  msgid "Relations"  msgstr "" -#: forms.py:415 +#: forms.py:418  msgid "Numeric reference"  msgstr "" -#: forms.py:416 -msgid "Name (full text search)" +#: forms.py:420 forms.py:1094 +msgid "Parcel (section/number)"  msgstr "" -#: forms.py:421 -msgid "Archaelogical site" +#: forms.py:424 forms.py:956 models.py:79 +msgid "Name"  msgstr "" -#: forms.py:430 forms.py:596 forms.py:692 forms.py:1049 models.py:170 +#: forms.py:426 forms.py:607 forms.py:683 forms.py:1061 models.py:170  msgid "Operation type"  msgstr "" -#: forms.py:438 models.py:582 -msgid "Scientist in charge" +#: forms.py:428 +msgid "Is open?"  msgstr "" -#: forms.py:447 forms.py:685 models.py:158 +#: forms.py:437 forms.py:713 models.py:158  msgid "In charge"  msgstr "" -#: forms.py:449 forms.py:598 forms.py:678 models.py:156 +#: forms.py:444 models.py:582 +msgid "Scientist in charge" +msgstr "" + +#: forms.py:446 forms.py:609 forms.py:704 models.py:156  msgid "Operator"  msgstr "" -#: forms.py:454 forms.py:949 models.py:83 models.py:172 +#: forms.py:453 forms.py:961 models.py:83 models.py:172  msgid "Remains"  msgstr "" -#: forms.py:455 forms.py:928 forms.py:946 models.py:81 models.py:177 +#: forms.py:454 forms.py:940 forms.py:958 models.py:81 models.py:177  msgid "Periods"  msgstr "" -#: forms.py:456 +#: forms.py:455  msgid "Started before"  msgstr "" -#: forms.py:458 +#: forms.py:457  msgid "Started after"  msgstr "" -#: forms.py:460 +#: forms.py:459  msgid "Ended before"  msgstr "" -#: forms.py:462 +#: forms.py:461  msgid "Ended after"  msgstr ""  #: forms.py:464 -msgid "Parcel (section/number)" -msgstr "" - -#: forms.py:465 -msgid "Is open?" +msgid "Search within relations"  msgstr "" -#: forms.py:467 forms.py:1085 -msgid "Created by" +#: forms.py:466 forms.py:755 models.py:223 +msgid "Comment"  msgstr "" -#: forms.py:472 +#: forms.py:467  msgid "Abstract (full text search)"  msgstr "" -#: forms.py:473 forms.py:745 models.py:235 +#: forms.py:468 forms.py:757 models.py:235  msgid "Record quality"  msgstr "" -#: forms.py:474 forms.py:702 models.py:189 +#: forms.py:469 forms.py:736 models.py:189  msgid "Report processing"  msgstr "" -#: forms.py:476 forms.py:748 models.py:230 +#: forms.py:471 forms.py:760 models.py:230  msgid "Virtual operation"  msgstr "" -#: forms.py:478 -msgid "Search within relations" +#: forms.py:473 +msgid "Archaelogical site" +msgstr "" + +#: forms.py:479 forms.py:1101 +msgid "Created by"  msgstr "" -#: forms.py:516 forms.py:1042 views.py:214 +#: forms.py:485 forms.py:1107 +msgid "Modified by" +msgstr "" + +#: forms.py:527 forms.py:1054 views.py:230  msgid "Operation search"  msgstr "" -#: forms.py:529 forms.py:1044 +#: forms.py:540 forms.py:1056  msgid "You should select an operation."  msgstr "" -#: forms.py:560 +#: forms.py:571  msgid "Associated file"  msgstr "" -#: forms.py:564 forms.py:808 models.py:594 wizards.py:78 +#: forms.py:575 forms.py:820 models.py:594 wizards.py:78  msgid "Archaelogical file"  msgstr "" -#: forms.py:571 forms.py:573 models.py:237 +#: forms.py:582 forms.py:584 models.py:237  msgid "Abstract"  msgstr "" -#: forms.py:576 +#: forms.py:587  msgid "months"  msgstr "" -#: forms.py:576 +#: forms.py:587  msgid "years"  msgstr "" -#: forms.py:578 models.py:142 +#: forms.py:589 models.py:142  msgid "Creation date"  msgstr "" -#: forms.py:579 +#: forms.py:590  msgid "Start of field work"  msgstr "" -#: forms.py:581 +#: forms.py:592  msgid "All"  msgstr "" -#: forms.py:582 +#: forms.py:593  msgid "Preventive"  msgstr "" -#: forms.py:583 +#: forms.py:594  msgid "Research"  msgstr "" -#: forms.py:587 +#: forms.py:598  msgid "Slicing"  msgstr "" -#: forms.py:590 +#: forms.py:601  msgid "Department detail"  msgstr "" -#: forms.py:592 +#: forms.py:603  msgid "Date get from"  msgstr "" -#: forms.py:594 +#: forms.py:605  msgid "Preventive/Research"  msgstr "" -#: forms.py:600 +#: forms.py:611  msgid "Date after"  msgstr "" -#: forms.py:602 +#: forms.py:613  msgid "Date before"  msgstr "" -#: forms.py:604 +#: forms.py:615  msgid "With reports"  msgstr "" -#: forms.py:605 +#: forms.py:616  msgid "With finds"  msgstr "" -#: forms.py:657 forms.py:1124 templates/ishtar/sheet_administrativeact.html:11 +#: forms.py:668 forms.py:1154 templates/ishtar/sheet_administrativeact.html:11  #: templates/ishtar/sheet_operation.html:32  msgid "General"  msgstr "" -#: forms.py:668 -msgid "Head scientist" +#: forms.py:681 models.py:222 +msgid "Generic name"  msgstr "" -#: forms.py:695 models.py:51 models.py:145 models.py:951 -msgid "Start date" +#: forms.py:690 forms.py:815 models.py:162 models.py:375 +msgid "Operation code"  msgstr "" -#: forms.py:697 models.py:147 -msgid "Excavation end date" +#: forms.py:694 +msgid "Head scientist"  msgstr "" -#: forms.py:700 models.py:148 -msgid "Report delivery date" +#: forms.py:710 models.py:221 +msgid "Operator reference"  msgstr "" -#: forms.py:706 +#: forms.py:722  msgid "Total surface (m2)"  msgstr "" -#: forms.py:714 forms.py:803 models.py:162 models.py:375 -msgid "Operation code" -msgstr "" - -#: forms.py:717 models.py:222 -msgid "Generic name" +#: forms.py:727 +msgid "Associated archaeological sites"  msgstr "" -#: forms.py:719 models.py:221 -msgid "Operator reference" +#: forms.py:729 models.py:51 models.py:145 models.py:951 +msgid "Start date"  msgstr "" -#: forms.py:723 -msgid "Associated archaeological sites" +#: forms.py:731 models.py:147 +msgid "Excavation end date"  msgstr "" -#: forms.py:743 models.py:223 -msgid "Comment" +#: forms.py:734 models.py:148 +msgid "Report delivery date"  msgstr "" -#: forms.py:773 +#: forms.py:785  msgid ""  "If you want to set an excavation end date you have to provide a start date."  msgstr "" -#: forms.py:778 +#: forms.py:790  msgid "The excavation end date cannot be before the start date."  msgstr "" -#: forms.py:793 +#: forms.py:805  #, python-format  msgid ""  "Operation code already exist for year: %(year)d - use a value bigger than "  "%(last_val)d"  msgstr "" -#: forms.py:797 +#: forms.py:809  msgid "Bad operation code"  msgstr "" -#: forms.py:829 +#: forms.py:841  msgid "Preventive informations - excavation"  msgstr "" -#: forms.py:830 models.py:175 +#: forms.py:842 models.py:175  #: templates/ishtar/dashboards/dashboard_operation.html:495  msgid "Cost (euros)"  msgstr "" -#: forms.py:831 models.py:180 +#: forms.py:843 models.py:180  msgid "Scheduled man-days"  msgstr "" -#: forms.py:833 models.py:183 +#: forms.py:845 models.py:183  msgid "Optional man-days"  msgstr "" -#: forms.py:835 models.py:186 +#: forms.py:847 models.py:186  msgid "Effective man-days"  msgstr "" -#: forms.py:845 +#: forms.py:857  msgid "Preventive informations - diagnostic"  msgstr "" -#: forms.py:848 models.py:205 +#: forms.py:860 models.py:205  msgid "Prescription on zoning"  msgstr "" -#: forms.py:850 models.py:208 +#: forms.py:862 models.py:208  msgid "Prescription on large area"  msgstr "" -#: forms.py:853 models.py:210 +#: forms.py:865 models.py:210  msgid "Prescription on geoarchaeological context"  msgstr "" -#: forms.py:857 forms.py:879 models.py:174 models.py:607 +#: forms.py:869 forms.py:891 models.py:174 models.py:607  msgid "Towns"  msgstr "" -#: forms.py:886 models.py:790 models.py:949 +#: forms.py:898 models.py:790 models.py:949  msgid "Parcel"  msgstr "" -#: forms.py:913 models.py:45 +#: forms.py:925 models.py:45  msgid "Remain types"  msgstr "" -#: forms.py:917 models.py:44 +#: forms.py:929 models.py:44  msgid "Remain type"  msgstr "" -#: forms.py:932 +#: forms.py:944  msgid "Period"  msgstr "" -#: forms.py:943 models.py:78 +#: forms.py:955 models.py:78  msgid "Reference"  msgstr "" -#: forms.py:944 models.py:79 -msgid "Name" -msgstr "" - -#: forms.py:968 +#: forms.py:980  msgid "This reference already exists."  msgstr "" -#: forms.py:985 +#: forms.py:997  msgid "Associated archaelogical sites"  msgstr "" -#: forms.py:991 ishtar_menu.py:36 ishtar_menu.py:63 ishtar_menu.py:125 +#: forms.py:1003 ishtar_menu.py:36 ishtar_menu.py:63 ishtar_menu.py:125  msgid "Search"  msgstr "" -#: forms.py:996 +#: forms.py:1008  msgid "Would you like to close this operation?"  msgstr "" -#: forms.py:1001 +#: forms.py:1013  msgid "Would you like to delete this operation?"  msgstr "" -#: forms.py:1010 forms.py:1073 models.py:523 models.py:573 +#: forms.py:1022 forms.py:1085 models.py:523 models.py:573  msgid "Index"  msgstr "" -#: forms.py:1036 +#: forms.py:1048  #, python-format  msgid ""  "Index already exists for operation: %(operation)s - use a value bigger than "  "%(last_val)d"  msgstr "" -#: forms.py:1048 +#: forms.py:1060  msgid "Operation's town"  msgstr "" -#: forms.py:1051 +#: forms.py:1063  msgid "Operation's year"  msgstr "" -#: forms.py:1062 +#: forms.py:1074  msgid "Documentation search"  msgstr "" -#: forms.py:1064 +#: forms.py:1076  msgid "You should select a document."  msgstr "" -#: forms.py:1077 forms.py:1127 models.py:547 models.py:567 +#: forms.py:1091 forms.py:1157 models.py:547 models.py:567  msgid "Act type"  msgstr "" -#: forms.py:1081 models.py:497 +#: forms.py:1092 forms.py:1245 +msgid "Indexed?" +msgstr "" + +#: forms.py:1097 models.py:497  #: templates/ishtar/dashboards/dashboard_operation.html:273  #: templates/ishtar/dashboards/dashboard_operation.html:286  #: templates/ishtar/dashboards/dashboard_operation.html:453 @@ -439,52 +443,44 @@ msgstr ""  msgid "Department"  msgstr "" -#: forms.py:1082 -msgid "Object (full text search)" +#: forms.py:1098 forms.py:1162 models.py:598 +#: templates/ishtar/blocks/window_tables/administrativacts.html:8 +msgid "Object"  msgstr "" -#: forms.py:1104 views.py:350 +#: forms.py:1134 views.py:366  msgid "Administrative act search"  msgstr "" -#: forms.py:1119 forms.py:1173 forms.py:1240 +#: forms.py:1149 forms.py:1203 forms.py:1270  msgid "You should select an administrative act."  msgstr "" -#: forms.py:1132 models.py:598 -#: templates/ishtar/blocks/window_tables/administrativacts.html:8 -msgid "Object" -msgstr "" - -#: forms.py:1135 models.py:595 +#: forms.py:1165 models.py:595  msgid "Signature date"  msgstr "" -#: forms.py:1150 +#: forms.py:1180  msgid "Would you like to delete this administrative act?"  msgstr "" -#: forms.py:1155 +#: forms.py:1185  msgid "Template"  msgstr "" -#: forms.py:1179 forms.py:1183 +#: forms.py:1209 forms.py:1213  msgid "This document is not intended for this type of act."  msgstr "" -#: forms.py:1201 +#: forms.py:1231  msgid "Doc generation"  msgstr "" -#: forms.py:1203 +#: forms.py:1233  msgid "Generate the associated doc?"  msgstr "" -#: forms.py:1215 -msgid "Indexed?" -msgstr "" - -#: forms.py:1224 ishtar_menu.py:110 views.py:384 +#: forms.py:1254 ishtar_menu.py:110 views.py:400  msgctxt "admin act register"  msgid "Register"  msgstr "" @@ -861,47 +857,47 @@ msgstr ""  msgid "Operation types old"  msgstr "" -#: views.py:236 +#: views.py:252  msgid "New operation"  msgstr "" -#: views.py:271 +#: views.py:287  msgid "Operation modification"  msgstr "" -#: views.py:311 +#: views.py:327  msgid "Operation closing"  msgstr "" -#: views.py:317 +#: views.py:333  msgid "Operation deletion"  msgstr "" -#: views.py:322 +#: views.py:338  msgid "Operation: source search"  msgstr "" -#: views.py:330 +#: views.py:346  msgid "Operation: source creation"  msgstr "" -#: views.py:338 +#: views.py:354  msgid "Operation: source modification"  msgstr "" -#: views.py:344 +#: views.py:360  msgid "Operation: source deletion"  msgstr "" -#: views.py:359 +#: views.py:375  msgid "Operation: new administrative act"  msgstr "" -#: views.py:369 +#: views.py:385  msgid "Operation: administrative act modification"  msgstr "" -#: views.py:378 +#: views.py:394  msgid "Operation: administrative act deletion"  msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 5a49d053f..bb230179f 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -296,7 +296,7 @@ msgstr ""  msgid "Account"  msgstr "" -#: forms_common.py:379 wizards.py:1141 +#: forms_common.py:379 wizards.py:1146  msgid "New password"  msgstr "" @@ -421,7 +421,7 @@ msgstr ""  msgid "Account management"  msgstr "" -#: ishtar_menu.py:34 models.py:776 views.py:1117 +#: ishtar_menu.py:34 models.py:776 views.py:1116  msgid "Global variables"  msgstr "" @@ -429,7 +429,7 @@ msgstr ""  msgid "Directory"  msgstr "" -#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:4 +#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:3  msgid "Search"  msgstr "" @@ -453,11 +453,11 @@ msgstr ""  msgid "Imports"  msgstr "" -#: ishtar_menu.py:99 views.py:1125 +#: ishtar_menu.py:99 views.py:1124  msgid "New import"  msgstr "" -#: ishtar_menu.py:103 views.py:1139 +#: ishtar_menu.py:103 views.py:1138  msgid "Current imports"  msgstr "" @@ -603,15 +603,15 @@ msgstr ""  msgid "Operation source"  msgstr "" -#: models.py:1189 views.py:932 views.py:989 +#: models.py:1189 views.py:931 views.py:988  msgid "Archaeological files"  msgstr "" -#: models.py:1196 views.py:935 views.py:999 +#: models.py:1196 views.py:934 views.py:998  msgid "Context records"  msgstr "" -#: models.py:1199 views.py:937 views.py:1004 +#: models.py:1199 views.py:936 views.py:1003  msgid "Finds"  msgstr "" @@ -1126,34 +1126,34 @@ msgstr ""  msgid "Organization deletion"  msgstr "" -#: views.py:633 templates/base.html:80 +#: views.py:632 templates/base.html:80  #: templates/ishtar/sheet_organization.html:35  #: templatetags/link_to_window.py:16  msgid "Details"  msgstr "" -#: views.py:861 views.py:915 +#: views.py:860 views.py:914  msgid "Operation not permitted."  msgstr "" -#: views.py:863 +#: views.py:862  #, python-format  msgid "New %s"  msgstr "" -#: views.py:933 views.py:993 +#: views.py:932 views.py:992  msgid "Operations"  msgstr "" -#: views.py:1186 templates/ishtar/import_list.html:43 +#: views.py:1185 templates/ishtar/import_list.html:43  msgid "Link unmatched items"  msgstr "" -#: views.py:1201 +#: views.py:1200  msgid "Delete import"  msgstr "" -#: views.py:1260 views.py:1276 +#: views.py:1259 views.py:1275  msgid "Corporation manager"  msgstr "" @@ -1161,27 +1161,27 @@ msgstr ""  msgid "Search..."  msgstr "" -#: widgets.py:595 templatetags/window_tables.py:72 +#: widgets.py:596 templatetags/window_tables.py:72  msgid "No results"  msgstr "" -#: widgets.py:596 templatetags/window_tables.py:73 +#: widgets.py:597 templatetags/window_tables.py:73  msgid "Loading..."  msgstr "" -#: widgets.py:597 +#: widgets.py:598  msgid "Remove"  msgstr "" -#: wizards.py:313 templates/ishtar/import_delete.html:20 +#: wizards.py:317 templates/ishtar/import_delete.html:20  msgid "Yes"  msgstr "" -#: wizards.py:315 +#: wizards.py:319  msgid "No"  msgstr "" -#: wizards.py:1198 +#: wizards.py:1203  #, python-format  msgid "[%(app_name)s] Account creation/modification"  msgstr "" @@ -1480,7 +1480,7 @@ msgstr ""  msgid "No recording unit associated to this operation"  msgstr "" -#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:26 +#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:25  msgid "Add"  msgstr "" @@ -1497,31 +1497,32 @@ msgstr ""  msgid "Choose a state first"  msgstr "" -#: templates/blocks/JQueryJqGrid.html:10 +#: templates/blocks/JQueryJqGrid.html:9  msgid "Search and select an item"  msgstr "" -#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:21 +#: templates/blocks/JQueryJqGrid.html:16 templates/blocks/JQueryJqGrid.html:20  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:9  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:13  msgid "Export as CSV"  msgstr "" -#: templates/blocks/JQueryJqGrid.html:18 +#: templates/blocks/JQueryJqGrid.html:17  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:10  msgid "simple"  msgstr "" -#: templates/blocks/JQueryJqGrid.html:19 +#: templates/blocks/JQueryJqGrid.html:18  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:11  msgid "full"  msgstr "" -#: templates/blocks/JQueryJqGrid.html:96 +#: templates/blocks/JQueryJqGrid.html:95  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:42  msgid "An error as occured during search. Check your query fields."  msgstr "" +#: templates/blocks/form_flex_snippet.html:10  #: templates/blocks/form_snippet.html:9  msgid "Help"  msgstr "" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 797112282..e20e6fd08 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -9,221 +9,253 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-01-20 06:45-0500\n" +"PO-Revision-Date: 2016-02-03 06:49-0500\n"  "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n"  "Plural-Forms: nplurals=2; plural=n>1;\n"  "X-Generator: Zanata 3.8.2\n" -#: forms.py:51 forms.py:198 forms.py:242 forms.py:383 forms.py:437 +#: forms.py:51 forms.py:209 forms.py:253 forms.py:394 forms.py:421  #: models.py:75 templates/ishtar/sheet_file.html:150  msgid "Year"  msgstr "Année" -#: forms.py:52 forms.py:203 forms.py:244 forms.py:436 models.py:78 +#: forms.py:52 forms.py:214 forms.py:255 models.py:78  msgid "Numeric reference"  msgstr "Référence numérique" -#: forms.py:54 forms.py:205 forms.py:439 +#: forms.py:54 forms.py:216  msgid "Other reference"  msgstr "Autre référence" -#: forms.py:59 forms.py:417 +#: forms.py:56 forms.py:429 +msgid "Parcel (section/number)" +msgstr "Parcelle (section/numéro)" + +#: forms.py:60 forms.py:441  msgid "File name"  msgstr "Nom du dossier" -#: forms.py:60 forms.py:144 forms.py:209 models.py:84 +#: forms.py:61 forms.py:155 forms.py:220 models.py:84  msgid "File type"  msgstr "Type de dossier" -#: forms.py:61 forms.py:146 forms.py:306 +#: forms.py:62 +msgid "Is active?" +msgstr "Est actif ?" + +#: forms.py:63 forms.py:157 forms.py:317  msgid "Saisine type"  msgstr "Type de saisine" -#: forms.py:62 -msgid "Parcel (section/number)" -msgstr "Parcelle (section/numéro)" +#: forms.py:64 forms.py:307 models.py:57 models.py:115 +msgid "Permit type" +msgstr "Type de permis" -#: forms.py:63 -msgid "Is active?" -msgstr "Est actif ?" +#: forms.py:66 forms.py:310 models.py:116 +msgid "Permit reference" +msgstr "Référence du permis" + +#: forms.py:67 forms.py:226 forms.py:364 models.py:145 +#: templates/ishtar/sheet_file.html:111 +msgid "Comment" +msgstr "Commentaire" + +#: forms.py:69 templates/ishtar/sheet_file.html:127 +msgid "In charge" +msgstr "Responsable" -#: forms.py:65 forms.py:274 forms.py:419 models.py:91 +#: forms.py:76 forms.py:285 forms.py:443 models.py:91  msgid "General contractor"  msgstr "Aménageur" -#: forms.py:72 forms.py:428 +#: forms.py:83 forms.py:452  msgid "Organization of general contractor"  msgstr "Organisation de l'aménageur" -#: forms.py:79 forms.py:441 templates/ishtar/sheet_file.html:127 -msgid "In charge" -msgstr "Responsable" - -#: forms.py:86 forms.py:456 +#: forms.py:90 forms.py:475  msgid "Created by"  msgstr "Créé par" -#: forms.py:93 forms.py:299 forms.py:449 models.py:116 -msgid "Permit reference" -msgstr "Référence du permis" +#: forms.py:97 forms.py:483 +msgid "Modified by" +msgstr "Modifié par" -#: forms.py:115 +#: forms.py:126  msgid "Archaeological file search"  msgstr "Recherche de dossiers archéologiques" -#: forms.py:129 +#: forms.py:140  msgid "You should select a file."  msgstr "Vous devez sélectionner un dossier archéologique." -#: forms.py:132 forms.py:207 models.py:124 +#: forms.py:143 forms.py:218 models.py:124  msgid "Creation date"  msgstr "Date de création" -#: forms.py:133 forms.py:309 models.py:126 +#: forms.py:144 forms.py:320 models.py:126  msgid "Reception date"  msgstr "Date de réception" -#: forms.py:138 +#: forms.py:149  msgid "Slicing"  msgstr "Découpage" -#: forms.py:140 +#: forms.py:151  msgid "Department detail"  msgstr "Détail par département" -#: forms.py:142 +#: forms.py:153  msgid "Date get from"  msgstr "Date utilisée" -#: forms.py:148 +#: forms.py:159  msgid "Date after"  msgstr "Date après" -#: forms.py:150 +#: forms.py:161  msgid "Date before"  msgstr "Date avant" -#: forms.py:187 templates/ishtar/sheet_file.html:31 +#: forms.py:198 templates/ishtar/sheet_file.html:31  msgid "General"  msgstr "Général" -#: forms.py:192 models.py:86 +#: forms.py:203 models.py:86  msgid "Person in charge"  msgstr "Responsable" -#: forms.py:206 models.py:83 +#: forms.py:217 models.py:83  msgid "Name"  msgstr "Nom" -#: forms.py:211 models.py:128 +#: forms.py:222 models.py:128  msgid "Related file"  msgstr "Dossier en relation avec" -#: forms.py:215 forms.py:353 models.py:145 -#: templates/ishtar/sheet_file.html:111 -msgid "Comment" -msgstr "Commentaire" - -#: forms.py:219 models.py:136 +#: forms.py:230 models.py:136  msgid "Total surface (m2)"  msgstr "Surface totale (m2)" -#: forms.py:222 models.py:142 +#: forms.py:233 models.py:142  msgid "Main address"  msgstr "Adresse des terrains" -#: forms.py:223 +#: forms.py:234  msgid "Main address - complement"  msgstr "Adresse des terrains - complément" -#: forms.py:235 +#: forms.py:246  #, python-format  msgid "<br/>(last recorded: %s)"  msgstr "<br/>(dernier enregistrement : %s)" -#: forms.py:257 +#: forms.py:268  msgid "Another file with this numeric id exists."  msgstr "Un autre dossier avec cet identifiant numérique existe." -#: forms.py:268 +#: forms.py:279  msgid "Preventive informations"  msgstr "Information archéologie préventive" -#: forms.py:286 models.py:103 +#: forms.py:297 models.py:103  msgid "Responsible for town planning service"  msgstr "Responsable au service instructeur" -#: forms.py:296 models.py:57 models.py:115 -msgid "Permit type" -msgstr "Type de permis" - -#: forms.py:302 models.py:139 +#: forms.py:313 models.py:139  msgid "Total developed surface (m2)"  msgstr "Surface totale aménagée (m2)" -#: forms.py:321 templates/ishtar/sheet_file.html:101 +#: forms.py:332 templates/ishtar/sheet_file.html:101  #: templates/ishtar/dashboards/dashboard_file.html:42  msgid "Research archaeology"  msgstr "Archéologie programmée" -#: forms.py:329 models.py:148 templates/ishtar/sheet_file.html:102 +#: forms.py:340 models.py:148 templates/ishtar/sheet_file.html:102  msgid "Departments"  msgstr "Départements" -#: forms.py:340 models.py:157 +#: forms.py:351 models.py:157  msgid "Scientist in charge"  msgstr "Responsable scientifique" -#: forms.py:342 models.py:151 templates/ishtar/sheet_file.html:104 +#: forms.py:353 models.py:151 templates/ishtar/sheet_file.html:104  msgid "Requested operation type"  msgstr "Type d'opération demandée" -#: forms.py:344 +#: forms.py:355  msgid "Lead organization"  msgstr "Organisation porteuse du projet" -#: forms.py:360 models.py:161 templates/ishtar/sheet_file.html:109 +#: forms.py:371 models.py:161 templates/ishtar/sheet_file.html:109  msgid "Classified area"  msgstr "Au sein d'un site classé" -#: forms.py:362 models.py:163 templates/ishtar/sheet_file.html:110 +#: forms.py:373 models.py:163 templates/ishtar/sheet_file.html:110  msgid "Protected area"  msgstr "Au sein d'un secteur sauvegardé" -#: forms.py:374 +#: forms.py:385  msgid "Would you like to close this archaeological file?"  msgstr "Voulez vous clore ce dossier archéologique ?" -#: forms.py:379 +#: forms.py:390  msgid "Would you like to delete this archaelogical file ?"  msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: forms.py:384 +#: forms.py:395 forms.py:422  msgid "Index"  msgstr "Index" -#: forms.py:388 forms.py:411 forms.py:498 +#: forms.py:399 forms.py:426 forms.py:531  msgid "Act type"  msgstr "Type d'acte" -#: forms.py:389 forms.py:453 +#: forms.py:400  msgid "Object (full text search)"  msgstr "Objet (recherche texte intégral)" -#: forms.py:394 forms.py:452 models.py:518 +#: forms.py:405 forms.py:432 models.py:518  msgid "Department"  msgstr "Département" -#: forms.py:413 +#: forms.py:427 +msgid "Indexed?" +msgstr "Indexé ?" + +#: forms.py:433 +msgid "Object" +msgstr "Objet" + +#: forms.py:437  msgid "Signature date after"  msgstr "Date de signature après" -#: forms.py:415 +#: forms.py:439  msgid "Signature date before"  msgstr "Date de signature avant" +#: forms.py:460 +msgid "File numeric reference" +msgstr "Dossier : ref. numérique" + +#: forms.py:461 +msgid "File year" +msgstr "Dossier : année" + +#: forms.py:463 +msgid "File other reference" +msgstr "Dossier : autre référence" + +#: forms.py:465 +msgid "File in charge" +msgstr "Dossier : responsable" + +#: forms.py:473 +msgid "File permit reference" +msgstr "Dossier : réf. du permis" +  #: ishtar_menu.py:33 models.py:185 templates/ishtar/sheet_file.html:6  msgid "Archaeological file"  msgstr "Dossier" @@ -393,39 +425,39 @@ msgstr "Pas de commune"  msgid "File"  msgstr "Dossier" -#: views.py:144 +#: views.py:155  msgid "File search"  msgstr "Recherche de dossier archéologique" -#: views.py:153 +#: views.py:164  msgid "New file"  msgstr "Nouveau dossier archéologique" -#: views.py:172 +#: views.py:183  msgid "File modification"  msgstr "Modification de dossier archéologique" -#: views.py:195 +#: views.py:206  msgid "File closing"  msgstr "Clotûre de dossier" -#: views.py:200 +#: views.py:211  msgid "File deletion"  msgstr "Suppression de dossier archéologique" -#: views.py:207 +#: views.py:218  msgid "File: search administrative act"  msgstr "Dossier : rechercher un acte administratif" -#: views.py:216 +#: views.py:227  msgid "File: new administrative act"  msgstr "Dossier : nouvel acte administratif" -#: views.py:226 +#: views.py:237  msgid "File: administrative act modification"  msgstr "Dossier : modification d'acte administratif" -#: views.py:235 +#: views.py:246  msgid "File: administrative act deletion"  msgstr "Dossier : suppression acte administratif" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 5b13c7d5a..4844ebacf 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -9,19 +9,19 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-01-28 03:56-0500\n" +"PO-Revision-Date: 2016-02-03 06:50-0500\n"  "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n"  "Plural-Forms: nplurals=2; plural=n>1;\n"  "X-Generator: Zanata 3.8.2\n" -#: forms.py:69 forms.py:336 forms.py:883 forms.py:905 forms.py:909 +#: forms.py:69 forms.py:336 forms.py:895 forms.py:917 forms.py:921  #: models.py:791 templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Parcels"  msgstr "Parcelles" -#: forms.py:72 forms.py:188 forms.py:859 models.py:781 +#: forms.py:72 forms.py:188 forms.py:871 models.py:781  #: templates/ishtar/blocks/window_tables/parcels.html:5  #: templates/ishtar/dashboards/dashboard_operation.html:302  #: templates/ishtar/dashboards/dashboard_operation.html:315 @@ -30,7 +30,7 @@ msgstr "Parcelles"  msgid "Town"  msgstr "Commune" -#: forms.py:74 forms.py:414 forms.py:709 forms.py:1072 models.py:161 +#: forms.py:74 forms.py:417 forms.py:685 forms.py:1084 models.py:161  #: models.py:597 models.py:779  #: templates/ishtar/blocks/window_tables/parcels.html:6  msgid "Year" @@ -95,228 +95,232 @@ msgstr "Relations supprimées"  msgid "Relations"  msgstr "Relations" -#: forms.py:415 +#: forms.py:418  msgid "Numeric reference"  msgstr "Identifiant numérique" -#: forms.py:416 -msgid "Name (full text search)" -msgstr "Nom (recherche texte intégral)" +#: forms.py:420 forms.py:1094 +msgid "Parcel (section/number)" +msgstr "Parcelle (section/numéro)" -#: forms.py:421 -msgid "Archaelogical site" -msgstr "Entité Archéologique" +#: forms.py:424 forms.py:956 models.py:79 +msgid "Name" +msgstr "Nom" -#: forms.py:430 forms.py:596 forms.py:692 forms.py:1049 models.py:170 +#: forms.py:426 forms.py:607 forms.py:683 forms.py:1061 models.py:170  msgid "Operation type"  msgstr "Type d'opération" -#: forms.py:438 models.py:582 -msgid "Scientist in charge" -msgstr "Responsable scientifique" +#: forms.py:428 +msgid "Is open?" +msgstr "Est ouvert ?" -#: forms.py:447 forms.py:685 models.py:158 +#: forms.py:437 forms.py:713 models.py:158  msgid "In charge"  msgstr "Responsable" -#: forms.py:449 forms.py:598 forms.py:678 models.py:156 +#: forms.py:444 models.py:582 +msgid "Scientist in charge" +msgstr "Responsable scientifique" + +#: forms.py:446 forms.py:609 forms.py:704 models.py:156  msgid "Operator"  msgstr "Opérateur" -#: forms.py:454 forms.py:949 models.py:83 models.py:172 +#: forms.py:453 forms.py:961 models.py:83 models.py:172  msgid "Remains"  msgstr "Vestiges" -#: forms.py:455 forms.py:928 forms.py:946 models.py:81 models.py:177 +#: forms.py:454 forms.py:940 forms.py:958 models.py:81 models.py:177  msgid "Periods"  msgstr "Périodes" -#: forms.py:456 +#: forms.py:455  msgid "Started before"  msgstr "Commencé avant" -#: forms.py:458 +#: forms.py:457  msgid "Started after"  msgstr "Commencé après" -#: forms.py:460 +#: forms.py:459  msgid "Ended before"  msgstr "Terminé avant" -#: forms.py:462 +#: forms.py:461  msgid "Ended after"  msgstr "Terminé après"  #: forms.py:464 -msgid "Parcel (section/number)" -msgstr "Parcelle (section/numéro)" - -#: forms.py:465 -msgid "Is open?" -msgstr "Est ouvert ?" +msgid "Search within relations" +msgstr "Recherche parmi les relations" -#: forms.py:467 forms.py:1085 -msgid "Created by" -msgstr "Créé par" +#: forms.py:466 forms.py:755 models.py:223 +msgid "Comment" +msgstr "Commentaire" -#: forms.py:472 +#: forms.py:467  msgid "Abstract (full text search)"  msgstr "Résumé (recherche texte intégral)" -#: forms.py:473 forms.py:745 models.py:235 +#: forms.py:468 forms.py:757 models.py:235  msgid "Record quality"  msgstr "Qualité d'enregistrement" -#: forms.py:474 forms.py:702 models.py:189 +#: forms.py:469 forms.py:736 models.py:189  msgid "Report processing"  msgstr "Traitement du rapport" -#: forms.py:476 forms.py:748 models.py:230 +#: forms.py:471 forms.py:760 models.py:230  msgid "Virtual operation"  msgstr "Opération virtuelle" -#: forms.py:478 -msgid "Search within relations" -msgstr "Recherche parmi les relations" +#: forms.py:473 +msgid "Archaelogical site" +msgstr "Entité Archéologique" + +#: forms.py:479 forms.py:1101 +msgid "Created by" +msgstr "Créé par" + +#: forms.py:485 forms.py:1107 +msgid "Modified by" +msgstr "Modifié par" -#: forms.py:516 forms.py:1042 views.py:214 +#: forms.py:527 forms.py:1054 views.py:230  msgid "Operation search"  msgstr "Recherche d'opérations" -#: forms.py:529 forms.py:1044 +#: forms.py:540 forms.py:1056  msgid "You should select an operation."  msgstr "Vous devez sélectionner une opération." -#: forms.py:560 +#: forms.py:571  msgid "Associated file"  msgstr "Dossier associé" -#: forms.py:564 forms.py:808 models.py:594 wizards.py:78 +#: forms.py:575 forms.py:820 models.py:594 wizards.py:78  msgid "Archaelogical file"  msgstr "Dossier" -#: forms.py:571 forms.py:573 models.py:237 +#: forms.py:582 forms.py:584 models.py:237  msgid "Abstract"  msgstr "Résumé" -#: forms.py:576 +#: forms.py:587  msgid "months"  msgstr "mois" -#: forms.py:576 +#: forms.py:587  msgid "years"  msgstr "années" -#: forms.py:578 models.py:142 +#: forms.py:589 models.py:142  msgid "Creation date"  msgstr "Date de création" -#: forms.py:579 +#: forms.py:590  msgid "Start of field work"  msgstr "Début du travail de terrain" -#: forms.py:581 +#: forms.py:592  msgid "All"  msgstr "Tous" -#: forms.py:582 +#: forms.py:593  msgid "Preventive"  msgstr "Préventif" -#: forms.py:583 +#: forms.py:594  msgid "Research"  msgstr "Programmée" -#: forms.py:587 +#: forms.py:598  msgid "Slicing"  msgstr "Découpage" -#: forms.py:590 +#: forms.py:601  msgid "Department detail"  msgstr "Détail par département" -#: forms.py:592 +#: forms.py:603  msgid "Date get from"  msgstr "Date obtenue depuis" -#: forms.py:594 +#: forms.py:605  msgid "Preventive/Research"  msgstr "Préventif/Programmé" -#: forms.py:600 +#: forms.py:611  msgid "Date after"  msgstr "Date après" -#: forms.py:602 +#: forms.py:613  msgid "Date before"  msgstr "Date avant" -#: forms.py:604 +#: forms.py:615  msgid "With reports"  msgstr "Avec un rapport" -#: forms.py:605 +#: forms.py:616  msgid "With finds"  msgstr "Avec du matériel" -#: forms.py:657 forms.py:1124 templates/ishtar/sheet_administrativeact.html:11 +#: forms.py:668 forms.py:1154 templates/ishtar/sheet_administrativeact.html:11  #: templates/ishtar/sheet_operation.html:32  msgid "General"  msgstr "Général" -#: forms.py:668 -msgid "Head scientist" -msgstr "Responsable scientifique" - -#: forms.py:695 models.py:51 models.py:145 models.py:951 -msgid "Start date" -msgstr "Date de début" - -#: forms.py:697 models.py:147 -msgid "Excavation end date" -msgstr "Date de fin de chantier" - -#: forms.py:700 models.py:148 -msgid "Report delivery date" -msgstr "Date de livraison du rapport" - -#: forms.py:706 -msgid "Total surface (m2)" -msgstr "Surface totale (m2)" +#: forms.py:681 models.py:222 +msgid "Generic name" +msgstr "Nom générique" -#: forms.py:714 forms.py:803 models.py:162 models.py:375 +#: forms.py:690 forms.py:815 models.py:162 models.py:375  msgid "Operation code"  msgstr "Code de l'opération" -#: forms.py:717 models.py:222 -msgid "Generic name" -msgstr "Nom générique" +#: forms.py:694 +msgid "Head scientist" +msgstr "Responsable scientifique" -#: forms.py:719 models.py:221 +#: forms.py:710 models.py:221  msgid "Operator reference"  msgstr "Référence de l'opérateur" -#: forms.py:723 +#: forms.py:722 +msgid "Total surface (m2)" +msgstr "Surface totale (m2)" + +#: forms.py:727  msgid "Associated archaeological sites"  msgstr "Entités archéologiques associées" -#: forms.py:743 models.py:223 -msgid "Comment" -msgstr "Commentaire" +#: forms.py:729 models.py:51 models.py:145 models.py:951 +msgid "Start date" +msgstr "Date de début" + +#: forms.py:731 models.py:147 +msgid "Excavation end date" +msgstr "Date de fin de chantier" + +#: forms.py:734 models.py:148 +msgid "Report delivery date" +msgstr "Date de livraison du rapport" -#: forms.py:773 +#: forms.py:785  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:778 +#: forms.py:790  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." -#: forms.py:793 +#: forms.py:805  #, python-format  msgid ""  "Operation code already exist for year: %(year)d - use a value bigger than " @@ -325,100 +329,96 @@ msgstr ""  "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "  "plus grande que %(last_val)d" -#: forms.py:797 +#: forms.py:809  msgid "Bad operation code"  msgstr "Mauvais code d'opération" -#: forms.py:829 +#: forms.py:841  msgid "Preventive informations - excavation"  msgstr "Information archéologie préventive - fouille" -#: forms.py:830 models.py:175 +#: forms.py:842 models.py:175  #: templates/ishtar/dashboards/dashboard_operation.html:495  msgid "Cost (euros)"  msgstr "Coût (euros)" -#: forms.py:831 models.py:180 +#: forms.py:843 models.py:180  msgid "Scheduled man-days"  msgstr "Jours-hommes prévus" -#: forms.py:833 models.py:183 +#: forms.py:845 models.py:183  msgid "Optional man-days"  msgstr "Jours-hommes optionnels" -#: forms.py:835 models.py:186 +#: forms.py:847 models.py:186  msgid "Effective man-days"  msgstr "Jours-hommes effectifs" -#: forms.py:845 +#: forms.py:857  msgid "Preventive informations - diagnostic"  msgstr "Information archéologie préventive - diagnostic" -#: forms.py:848 models.py:205 +#: forms.py:860 models.py:205  msgid "Prescription on zoning"  msgstr "Prescription sur zonage" -#: forms.py:850 models.py:208 +#: forms.py:862 models.py:208  msgid "Prescription on large area"  msgstr "Prescription sur une vaste surface" -#: forms.py:853 models.py:210 +#: forms.py:865 models.py:210  msgid "Prescription on geoarchaeological context"  msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:857 forms.py:879 models.py:174 models.py:607 +#: forms.py:869 forms.py:891 models.py:174 models.py:607  msgid "Towns"  msgstr "Communes" -#: forms.py:886 models.py:790 models.py:949 +#: forms.py:898 models.py:790 models.py:949  msgid "Parcel"  msgstr "Parcelle" -#: forms.py:913 models.py:45 +#: forms.py:925 models.py:45  msgid "Remain types"  msgstr "Types de vestige" -#: forms.py:917 models.py:44 +#: forms.py:929 models.py:44  msgid "Remain type"  msgstr "Type de vestige" -#: forms.py:932 +#: forms.py:944  msgid "Period"  msgstr "Période" -#: forms.py:943 models.py:78 +#: forms.py:955 models.py:78  msgid "Reference"  msgstr "Référence" -#: forms.py:944 models.py:79 -msgid "Name" -msgstr "Nom" - -#: forms.py:968 +#: forms.py:980  msgid "This reference already exists."  msgstr "Cette référence existe déjà." -#: forms.py:985 +#: forms.py:997  msgid "Associated archaelogical sites"  msgstr "Entités archéologiques associées" -#: forms.py:991 ishtar_menu.py:36 ishtar_menu.py:63 ishtar_menu.py:125 +#: forms.py:1003 ishtar_menu.py:36 ishtar_menu.py:63 ishtar_menu.py:125  msgid "Search"  msgstr "Recherche" -#: forms.py:996 +#: forms.py:1008  msgid "Would you like to close this operation?"  msgstr "Voulez-vous clore cette opération ?" -#: forms.py:1001 +#: forms.py:1013  msgid "Would you like to delete this operation?"  msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1010 forms.py:1073 models.py:523 models.py:573 +#: forms.py:1022 forms.py:1085 models.py:523 models.py:573  msgid "Index"  msgstr "Index" -#: forms.py:1036 +#: forms.py:1048  #, python-format  msgid ""  "Index already exists for operation: %(operation)s - use a value bigger than " @@ -427,27 +427,31 @@ msgstr ""  "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "  "plus grande que %(last_val)d" -#: forms.py:1048 +#: forms.py:1060  msgid "Operation's town"  msgstr "Commune de l'opération" -#: forms.py:1051 +#: forms.py:1063  msgid "Operation's year"  msgstr "Année de l'opération" -#: forms.py:1062 +#: forms.py:1074  msgid "Documentation search"  msgstr "Recherche de document" -#: forms.py:1064 +#: forms.py:1076  msgid "You should select a document."  msgstr "Vous devez sélectionner un document." -#: forms.py:1077 forms.py:1127 models.py:547 models.py:567 +#: forms.py:1091 forms.py:1157 models.py:547 models.py:567  msgid "Act type"  msgstr "Type d'acte" -#: forms.py:1081 models.py:497 +#: forms.py:1092 forms.py:1245 +msgid "Indexed?" +msgstr "Indexé ?" + +#: forms.py:1097 models.py:497  #: templates/ishtar/dashboards/dashboard_operation.html:273  #: templates/ishtar/dashboards/dashboard_operation.html:286  #: templates/ishtar/dashboards/dashboard_operation.html:453 @@ -455,52 +459,44 @@ msgstr "Type d'acte"  msgid "Department"  msgstr "Département" -#: forms.py:1082 -msgid "Object (full text search)" -msgstr "Objet (recherche texte intégral)" +#: forms.py:1098 forms.py:1162 models.py:598 +#: templates/ishtar/blocks/window_tables/administrativacts.html:8 +msgid "Object" +msgstr "Objet" -#: forms.py:1104 views.py:350 +#: forms.py:1134 views.py:366  msgid "Administrative act search"  msgstr "Recherche d'actes administratifs" -#: forms.py:1119 forms.py:1173 forms.py:1240 +#: forms.py:1149 forms.py:1203 forms.py:1270  msgid "You should select an administrative act."  msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1132 models.py:598 -#: templates/ishtar/blocks/window_tables/administrativacts.html:8 -msgid "Object" -msgstr "Objet" - -#: forms.py:1135 models.py:595 +#: forms.py:1165 models.py:595  msgid "Signature date"  msgstr "Date de signature" -#: forms.py:1150 +#: forms.py:1180  msgid "Would you like to delete this administrative act?"  msgstr "Voulez-vous supprimer cet acte administratif ?" -#: forms.py:1155 +#: forms.py:1185  msgid "Template"  msgstr "Patron" -#: forms.py:1179 forms.py:1183 +#: forms.py:1209 forms.py:1213  msgid "This document is not intended for this type of act."  msgstr "Ce document n'est pas destiné à ce type d'acte." -#: forms.py:1201 +#: forms.py:1231  msgid "Doc generation"  msgstr "Génération de document" -#: forms.py:1203 +#: forms.py:1233  msgid "Generate the associated doc?"  msgstr "Générer le document associé ?" -#: forms.py:1215 -msgid "Indexed?" -msgstr "Indexé ?" - -#: forms.py:1224 ishtar_menu.py:110 views.py:384 +#: forms.py:1254 ishtar_menu.py:110 views.py:400  msgctxt "admin act register"  msgid "Register"  msgstr "Registre" @@ -879,47 +875,47 @@ msgstr "Type d'opération - ancien"  msgid "Operation types old"  msgstr "Types d'opération - ancien" -#: views.py:236 +#: views.py:252  msgid "New operation"  msgstr "Nouvelle opération" -#: views.py:271 +#: views.py:287  msgid "Operation modification"  msgstr "Modification d'une opération" -#: views.py:311 +#: views.py:327  msgid "Operation closing"  msgstr "Clôture de l'opération" -#: views.py:317 +#: views.py:333  msgid "Operation deletion"  msgstr "Suppression d'une opération" -#: views.py:322 +#: views.py:338  msgid "Operation: source search"  msgstr "Opération : recherche de documentation associée" -#: views.py:330 +#: views.py:346  msgid "Operation: source creation"  msgstr "Opération : nouvelle documentation associée" -#: views.py:338 +#: views.py:354  msgid "Operation: source modification"  msgstr "Opération : modification d'une documentation associée" -#: views.py:344 +#: views.py:360  msgid "Operation: source deletion"  msgstr "Opération : suppression d'une documentation associée" -#: views.py:359 +#: views.py:375  msgid "Operation: new administrative act"  msgstr "Opération : nouvel acte administratif" -#: views.py:369 +#: views.py:385  msgid "Operation: administrative act modification"  msgstr "Opération : modification d'un acte administratif" -#: views.py:378 +#: views.py:394  msgid "Operation: administrative act deletion"  msgstr "Opération : suppression d'un acte administratif" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index b9ea9a031..85c87abff 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -318,7 +318,7 @@ msgstr "Type d'individu"  msgid "Account"  msgstr "Compte" -#: forms_common.py:379 wizards.py:1141 +#: forms_common.py:379 wizards.py:1146  msgid "New password"  msgstr "Nouveau mot de passe" @@ -443,7 +443,7 @@ msgstr "Administration"  msgid "Account management"  msgstr "Gestion des comptes" -#: ishtar_menu.py:34 models.py:776 views.py:1117 +#: ishtar_menu.py:34 models.py:776 views.py:1116  msgid "Global variables"  msgstr "Variables globales" @@ -451,7 +451,7 @@ msgstr "Variables globales"  msgid "Directory"  msgstr "Annuaire" -#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:4 +#: ishtar_menu.py:45 ishtar_menu.py:69 templates/blocks/JQueryJqGrid.html:3  msgid "Search"  msgstr "Recherche" @@ -475,11 +475,11 @@ msgstr "Suppression"  msgid "Imports"  msgstr "Imports" -#: ishtar_menu.py:99 views.py:1125 +#: ishtar_menu.py:99 views.py:1124  msgid "New import"  msgstr "Nouvel import" -#: ishtar_menu.py:103 views.py:1139 +#: ishtar_menu.py:103 views.py:1138  msgid "Current imports"  msgstr "Imports en cours" @@ -625,15 +625,15 @@ msgstr "Parcelles"  msgid "Operation source"  msgstr "Documentation de l'opération" -#: models.py:1189 views.py:932 views.py:989 +#: models.py:1189 views.py:931 views.py:988  msgid "Archaeological files"  msgstr "Dossiers archéologiques" -#: models.py:1196 views.py:935 views.py:999 +#: models.py:1196 views.py:934 views.py:998  msgid "Context records"  msgstr "Unité d'Enregistrement" -#: models.py:1199 views.py:937 views.py:1004 +#: models.py:1199 views.py:936 views.py:1003  msgid "Finds"  msgstr "Mobilier" @@ -1148,34 +1148,34 @@ msgstr "Modification d'une organisation"  msgid "Organization deletion"  msgstr "Suppression d'une organisation" -#: views.py:633 templates/base.html:80 +#: views.py:632 templates/base.html:80  #: templates/ishtar/sheet_organization.html:35  #: templatetags/link_to_window.py:16  msgid "Details"  msgstr "Détails" -#: views.py:861 views.py:915 +#: views.py:860 views.py:914  msgid "Operation not permitted."  msgstr "Opération non permise." -#: views.py:863 +#: views.py:862  #, python-format  msgid "New %s"  msgstr "Nouveau %s" -#: views.py:933 views.py:993 +#: views.py:932 views.py:992  msgid "Operations"  msgstr "Opérations" -#: views.py:1186 templates/ishtar/import_list.html:43 +#: views.py:1185 templates/ishtar/import_list.html:43  msgid "Link unmatched items"  msgstr "Associer les éléments non rapprochés" -#: views.py:1201 +#: views.py:1200  msgid "Delete import"  msgstr "Suppression de l'import" -#: views.py:1260 views.py:1276 +#: views.py:1259 views.py:1275  msgid "Corporation manager"  msgstr "Représentant de la personne morale" @@ -1183,27 +1183,27 @@ msgstr "Représentant de la personne morale"  msgid "Search..."  msgstr "Recherche..." -#: widgets.py:595 templatetags/window_tables.py:72 +#: widgets.py:596 templatetags/window_tables.py:72  msgid "No results"  msgstr "Pas de résultats" -#: widgets.py:596 templatetags/window_tables.py:73 +#: widgets.py:597 templatetags/window_tables.py:73  msgid "Loading..."  msgstr "Chargement..." -#: widgets.py:597 +#: widgets.py:598  msgid "Remove"  msgstr "Enlever" -#: wizards.py:313 templates/ishtar/import_delete.html:20 +#: wizards.py:317 templates/ishtar/import_delete.html:20  msgid "Yes"  msgstr "Oui" -#: wizards.py:315 +#: wizards.py:319  msgid "No"  msgstr "Non" -#: wizards.py:1198 +#: wizards.py:1203  #, python-format  msgid "[%(app_name)s] Account creation/modification"  msgstr "[%(app_name)s] Ajout - modification du compte" @@ -1502,7 +1502,7 @@ msgstr "Chronologie"  msgid "No recording unit associated to this operation"  msgstr "Pas d'Unité d'Enregistrement associée à ce dossier" -#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:26 +#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:25  msgid "Add"  msgstr "Ajout" @@ -1519,33 +1519,34 @@ msgstr "Région"  msgid "Choose a state first"  msgstr "Choisissez une région" -#: templates/blocks/JQueryJqGrid.html:10 +#: templates/blocks/JQueryJqGrid.html:9  msgid "Search and select an item"  msgstr "Rechercher puis sélectionner un élément" -#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:21 +#: templates/blocks/JQueryJqGrid.html:16 templates/blocks/JQueryJqGrid.html:20  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:9  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:13  msgid "Export as CSV"  msgstr "Export en CSV" -#: templates/blocks/JQueryJqGrid.html:18 +#: templates/blocks/JQueryJqGrid.html:17  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:10  msgid "simple"  msgstr "simple" -#: templates/blocks/JQueryJqGrid.html:19 +#: templates/blocks/JQueryJqGrid.html:18  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:11  msgid "full"  msgstr "complet" -#: templates/blocks/JQueryJqGrid.html:96 +#: templates/blocks/JQueryJqGrid.html:95  #: templates/ishtar/blocks/window_tables/dynamic_documents.html:42  msgid "An error as occured during search. Check your query fields."  msgstr ""  "Une erreur est intervenue sur cette recherche. Vérifiez la pertinence de vos "  "critères de recherche." +#: templates/blocks/form_flex_snippet.html:10  #: templates/blocks/form_snippet.html:9  msgid "Help"  msgstr "Aide" | 
