From e44cf85ed6990189d7d73e7a969a5969dd7bfc5e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 14 Nov 2016 17:16:30 +0100 Subject: Update translations files --- archaeological_context_records/locale/django.pot | 120 +++-- archaeological_files/locale/django.pot | 126 +++-- archaeological_files_pdl/locale/django.pot | 60 +-- archaeological_finds/locale/django.pot | 176 +++---- archaeological_operations/locale/django.pot | 270 +++++----- ishtar_common/locale/django.pot | 569 +++++++++++---------- translations/fr/archaeological_context_records.po | 131 ++--- translations/fr/archaeological_files.po | 137 ++--- translations/fr/archaeological_files_pdl.po | 68 +-- translations/fr/archaeological_finds.po | 184 +++---- translations/fr/archaeological_operations.po | 281 +++++------ translations/fr/archaeological_warehouse.po | 8 +- translations/fr/ishtar_common.po | 581 +++++++++++----------- 13 files changed, 1360 insertions(+), 1351 deletions(-) diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 283d5b050..dfd388ac2 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -7,11 +7,11 @@ msgid "" msgstr "" -#: forms.py:47 forms.py:51 models.py:164 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:165 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:137 models.py:166 +#: forms.py:59 forms.py:137 models.py:167 msgid "ID" msgstr "" @@ -63,43 +63,43 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:136 models.py:131 models.py:162 +#: forms.py:136 models.py:131 models.py:163 msgid "Parcel" msgstr "" -#: forms.py:139 models.py:167 templates/ishtar/sheet_contextrecord.html:27 +#: forms.py:139 models.py:168 templates/ishtar/sheet_contextrecord.html:27 msgid "Description" msgstr "" -#: forms.py:141 models.py:168 +#: forms.py:141 models.py:169 msgid "General comment" msgstr "" -#: forms.py:143 models.py:172 +#: forms.py:143 models.py:173 msgid "Length (m)" msgstr "" -#: forms.py:144 models.py:173 +#: forms.py:144 models.py:174 msgid "Width (m)" msgstr "" -#: forms.py:145 models.py:174 +#: forms.py:145 models.py:175 msgid "Thickness (m)" msgstr "" -#: forms.py:146 models.py:176 +#: forms.py:146 models.py:177 msgid "Depth (m)" msgstr "" -#: forms.py:147 models.py:184 +#: forms.py:147 models.py:185 msgid "Unit" msgstr "" -#: forms.py:148 models.py:186 +#: forms.py:148 models.py:187 msgid "Has furniture?" msgstr "" -#: forms.py:151 models.py:178 +#: forms.py:151 models.py:179 msgid "Location" msgstr "" @@ -126,7 +126,7 @@ msgstr "" msgid "Start date" msgstr "" -#: forms.py:234 models.py:57 models.py:171 +#: forms.py:234 models.py:57 models.py:172 msgid "End date" msgstr "" @@ -138,7 +138,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: forms.py:263 ishtar_menu.py:29 models.py:457 +#: forms.py:263 ishtar_menu.py:29 models.py:459 msgid "Context record" msgstr "" @@ -146,7 +146,7 @@ msgstr "" msgid "Relations" msgstr "" -#: forms.py:288 forms.py:296 models.py:189 +#: forms.py:288 forms.py:296 models.py:190 #: templates/ishtar/sheet_contextrecord.html:39 msgid "Interpretation" msgstr "" @@ -155,31 +155,31 @@ msgstr "" msgid "Comments on dating" msgstr "" -#: forms.py:294 models.py:188 +#: forms.py:294 models.py:189 msgid "Filling" msgstr "" -#: forms.py:298 models.py:209 +#: forms.py:298 models.py:210 msgid "Activity" msgstr "" -#: forms.py:300 models.py:207 +#: forms.py:300 models.py:208 msgid "Identification" msgstr "" -#: forms.py:302 models.py:192 +#: forms.py:302 models.py:193 msgid "TAQ" msgstr "" -#: forms.py:303 models.py:196 +#: forms.py:303 models.py:197 msgid "Estimated TAQ" msgstr "" -#: forms.py:305 models.py:199 +#: forms.py:305 models.py:200 msgid "TPQ" msgstr "" -#: forms.py:306 models.py:203 +#: forms.py:306 models.py:204 msgid "Estimated TPQ" msgstr "" @@ -231,7 +231,7 @@ msgstr "" msgid "Search" msgstr "" -#: ishtar_menu.py:35 +#: ishtar_menu.py:35 ishtar_menu.py:55 msgid "Creation" msgstr "" @@ -247,10 +247,6 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:55 -msgid "Add" -msgstr "" - #: models.py:39 msgid "Dating types" msgstr "" @@ -303,148 +299,148 @@ msgstr "" msgid "Identification Types" msgstr "" -#: models.py:159 +#: models.py:160 msgid "External ID" msgstr "" -#: models.py:161 +#: models.py:162 msgid "External ID is set automatically" msgstr "" -#: models.py:169 +#: models.py:170 msgid "Date d'ouverture" msgstr "" -#: models.py:179 +#: models.py:180 msgid "A short description of the location of the context record" msgstr "" -#: models.py:182 +#: models.py:183 msgid "Comment on datings" msgstr "" -#: models.py:193 +#: models.py:194 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:197 +#: models.py:198 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:200 +#: models.py:201 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:204 +#: models.py:205 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:212 +#: models.py:213 msgid "Point" msgstr "" -#: models.py:213 +#: models.py:214 msgid "Polygon" msgstr "" -#: models.py:214 +#: models.py:215 msgid "Cached name" msgstr "" -#: models.py:218 models.py:219 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:219 models.py:220 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:221 +#: models.py:222 msgid "Can view all Context Records" msgstr "" -#: models.py:223 +#: models.py:224 msgid "Can view own Context Record" msgstr "" -#: models.py:225 +#: models.py:226 msgid "Can add own Context Record" msgstr "" -#: models.py:227 +#: models.py:228 msgid "Can change own Context Record" msgstr "" -#: models.py:229 +#: models.py:230 msgid "Can delete own Context Record" msgstr "" -#: models.py:239 +#: models.py:240 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:375 +#: models.py:377 msgid "Inverse relation" msgstr "" -#: models.py:379 models.py:403 +#: models.py:381 models.py:405 msgid "Relation type" msgstr "" -#: models.py:380 +#: models.py:382 msgid "Relation types" msgstr "" -#: models.py:398 +#: models.py:400 msgid "ID (left)" msgstr "" -#: models.py:399 +#: models.py:401 msgid "Unit (left)" msgstr "" -#: models.py:400 +#: models.py:402 msgid "Parcel (left)" msgstr "" -#: models.py:401 +#: models.py:403 msgid "Description (left)" msgstr "" -#: models.py:402 +#: models.py:404 msgid "Periods (left)" msgstr "" -#: models.py:404 +#: models.py:406 msgid "Unit (right)" msgstr "" -#: models.py:405 models.py:406 +#: models.py:407 models.py:408 msgid "Parcel (right)" msgstr "" -#: models.py:407 +#: models.py:409 msgid "Description (right)" msgstr "" -#: models.py:408 +#: models.py:410 msgid "Periods (right)" msgstr "" -#: models.py:417 +#: models.py:419 msgid "Record relation" msgstr "" -#: models.py:418 +#: models.py:420 msgid "Record relations" msgstr "" -#: models.py:454 +#: models.py:456 msgid "Context record documentation" msgstr "" -#: models.py:455 +#: models.py:457 msgid "Context record documentations" msgstr "" diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index c8e5b3952..05c775798 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -8,243 +8,243 @@ msgid "" msgstr "" -#: forms.py:52 forms.py:212 forms.py:257 forms.py:404 forms.py:431 +#: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 #: models.py:108 templates/ishtar/sheet_file.html:146 msgid "Year" msgstr "" -#: forms.py:53 forms.py:217 forms.py:259 models.py:111 +#: forms.py:48 forms.py:215 forms.py:257 models.py:111 msgid "Numeric reference" msgstr "" -#: forms.py:55 forms.py:219 +#: forms.py:50 forms.py:217 msgid "Other reference" msgstr "" -#: forms.py:57 forms.py:439 +#: forms.py:52 forms.py:431 msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:60 forms.py:415 forms.py:442 models.py:543 +#: forms.py:55 forms.py:407 forms.py:434 models.py:544 msgid "Department" msgstr "" -#: forms.py:61 forms.py:451 +#: forms.py:56 forms.py:443 msgid "File name" msgstr "" -#: forms.py:62 forms.py:158 forms.py:223 models.py:119 +#: forms.py:57 forms.py:154 forms.py:221 models.py:119 msgid "File type" msgstr "" -#: forms.py:63 +#: forms.py:58 msgid "Is active?" msgstr "" -#: forms.py:64 forms.py:160 forms.py:321 +#: forms.py:59 forms.py:156 forms.py:314 msgid "Saisine type" msgstr "" -#: forms.py:65 forms.py:311 models.py:60 models.py:150 +#: forms.py:60 forms.py:304 models.py:60 models.py:150 msgid "Permit type" msgstr "" -#: forms.py:67 forms.py:314 models.py:151 +#: forms.py:62 forms.py:307 models.py:151 msgid "Permit reference" msgstr "" -#: forms.py:68 forms.py:229 forms.py:372 models.py:180 +#: forms.py:63 forms.py:227 forms.py:364 models.py:180 #: templates/ishtar/sheet_file.html:99 msgid "Comment" msgstr "" -#: forms.py:70 templates/ishtar/sheet_file.html:119 +#: forms.py:65 templates/ishtar/sheet_file.html:119 msgid "In charge" msgstr "" -#: forms.py:77 forms.py:289 forms.py:453 models.py:126 +#: forms.py:72 forms.py:281 forms.py:445 models.py:126 msgid "General contractor" msgstr "" -#: forms.py:84 forms.py:462 +#: forms.py:79 forms.py:453 msgid "Organization of general contractor" msgstr "" -#: forms.py:91 forms.py:485 +#: forms.py:87 forms.py:476 msgid "Created by" msgstr "" -#: forms.py:98 forms.py:493 +#: forms.py:94 forms.py:484 msgid "Modified by" msgstr "" -#: forms.py:129 +#: forms.py:125 msgid "Archaeological file search" msgstr "" -#: forms.py:143 +#: forms.py:139 msgid "You should select a file." msgstr "" -#: forms.py:146 forms.py:221 models.py:159 +#: forms.py:142 forms.py:219 models.py:159 msgid "Creation date" msgstr "" -#: forms.py:147 forms.py:324 models.py:161 +#: forms.py:143 forms.py:317 models.py:161 msgid "Reception date" msgstr "" -#: forms.py:152 +#: forms.py:148 msgid "Slicing" msgstr "" -#: forms.py:154 +#: forms.py:150 msgid "Department detail" msgstr "" -#: forms.py:156 +#: forms.py:152 msgid "Date get from" msgstr "" -#: forms.py:162 +#: forms.py:158 msgid "Date after" msgstr "" -#: forms.py:164 +#: forms.py:160 msgid "Date before" msgstr "" -#: forms.py:201 templates/ishtar/sheet_file.html:14 +#: forms.py:197 templates/ishtar/sheet_file.html:14 msgid "General" msgstr "" -#: forms.py:206 models.py:121 +#: forms.py:202 models.py:121 msgid "Person in charge" msgstr "" -#: forms.py:220 models.py:118 +#: forms.py:218 models.py:118 msgid "Name" msgstr "" -#: forms.py:225 models.py:163 +#: forms.py:223 models.py:163 msgid "Related file" msgstr "" -#: forms.py:233 models.py:171 +#: forms.py:231 models.py:171 msgid "Total surface (m2)" msgstr "" -#: forms.py:236 models.py:177 +#: forms.py:234 models.py:177 msgid "Main address" msgstr "" -#: forms.py:237 +#: forms.py:235 msgid "Main address - complement" msgstr "" -#: forms.py:250 +#: forms.py:248 #, python-format msgid "
(last recorded: %s)" msgstr "" -#: forms.py:272 +#: forms.py:270 msgid "Another file with this numeric id exists." msgstr "" -#: forms.py:283 +#: forms.py:275 msgid "Preventive informations" msgstr "" -#: forms.py:301 models.py:138 +#: forms.py:293 models.py:138 msgid "Responsible for town planning service" msgstr "" -#: forms.py:317 models.py:174 +#: forms.py:310 models.py:174 msgid "Total developed surface (m2)" msgstr "" -#: forms.py:340 templates/ishtar/sheet_file.html:89 +#: forms.py:333 templates/ishtar/sheet_file.html:89 #: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "" -#: forms.py:348 models.py:183 templates/ishtar/sheet_file.html:90 +#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:90 msgid "Departments" msgstr "" -#: forms.py:359 models.py:192 +#: forms.py:351 models.py:192 msgid "Scientist in charge" msgstr "" -#: forms.py:361 models.py:186 templates/ishtar/sheet_file.html:92 +#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:92 msgid "Requested operation type" msgstr "" -#: forms.py:363 +#: forms.py:355 msgid "Lead organization" msgstr "" -#: forms.py:379 models.py:196 templates/ishtar/sheet_file.html:97 +#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:97 msgid "Classified area" msgstr "" -#: forms.py:381 models.py:198 templates/ishtar/sheet_file.html:98 +#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:98 msgid "Protected area" msgstr "" -#: forms.py:395 +#: forms.py:387 msgid "Would you like to close this archaeological file?" msgstr "" -#: forms.py:400 +#: forms.py:392 msgid "Would you like to delete this archaelogical file ?" msgstr "" -#: forms.py:405 forms.py:432 forms.py:556 +#: forms.py:397 forms.py:424 forms.py:547 msgid "Index" msgstr "" -#: forms.py:409 forms.py:436 forms.py:542 +#: forms.py:401 forms.py:428 forms.py:533 msgid "Act type" msgstr "" -#: forms.py:410 +#: forms.py:402 msgid "Object (full text search)" msgstr "" -#: forms.py:437 +#: forms.py:429 msgid "Indexed?" msgstr "" -#: forms.py:443 +#: forms.py:435 msgid "Object" msgstr "" -#: forms.py:447 +#: forms.py:439 msgid "Signature date after" msgstr "" -#: forms.py:449 +#: forms.py:441 msgid "Signature date before" msgstr "" -#: forms.py:470 +#: forms.py:461 msgid "File numeric reference" msgstr "" -#: forms.py:471 +#: forms.py:462 msgid "File year" msgstr "" -#: forms.py:473 +#: forms.py:464 msgid "File other reference" msgstr "" -#: forms.py:475 +#: forms.py:466 msgid "File in charge" msgstr "" -#: forms.py:483 +#: forms.py:474 msgid "File permit reference" msgstr "" @@ -256,7 +256,7 @@ msgstr "" msgid "Search" msgstr "" -#: ishtar_menu.py:41 +#: ishtar_menu.py:41 ishtar_menu.py:64 msgid "Creation" msgstr "" @@ -276,10 +276,6 @@ msgstr "" msgid "Administrative act" msgstr "" -#: ishtar_menu.py:64 -msgid "Add" -msgstr "" - #: ishtar_menu.py:76 msgid "Documents" msgstr "" @@ -417,7 +413,7 @@ msgstr "" msgid "No town" msgstr "" -#: models.py:542 +#: models.py:543 msgid "File" msgstr "" diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot index 5c3d03a37..79da87fd5 100644 --- a/archaeological_files_pdl/locale/django.pot +++ b/archaeological_files_pdl/locale/django.pot @@ -7,117 +7,121 @@ msgid "" msgstr "" -#: forms.py:41 +#: forms.py:38 msgid "General" msgstr "" -#: forms.py:43 +#: forms.py:40 msgid "File type" msgstr "" -#: forms.py:44 forms.py:403 +#: forms.py:41 forms.py:415 msgid "Year" msgstr "" -#: forms.py:48 +#: forms.py:45 msgid "Creation date" msgstr "" -#: forms.py:51 +#: forms.py:48 msgid "Reception date" msgstr "" -#: forms.py:63 +#: forms.py:60 msgid "Reception date cannot be after today." msgstr "" -#: forms.py:71 +#: forms.py:68 msgid "Permit type" msgstr "" -#: forms.py:73 +#: forms.py:70 msgid "Saisine type" msgstr "" -#: forms.py:87 +#: forms.py:84 msgid "Planning" msgstr "" -#: forms.py:90 +#: forms.py:87 msgid "Planning name" msgstr "" -#: forms.py:93 forms.py:123 +#: forms.py:90 forms.py:122 #: templates/ishtar/wizard/wizard_preventiveplanning.html:31 msgid "Towns" msgstr "" -#: forms.py:95 forms.py:125 +#: forms.py:92 forms.py:124 #: templates/ishtar/wizard/wizard_preventiveplanning.html:41 msgid "Departments" msgstr "" -#: forms.py:96 forms.py:126 +#: forms.py:93 forms.py:125 msgid "Locality" msgstr "" -#: forms.py:99 forms.py:129 +#: forms.py:96 forms.py:128 msgid "Address (number/street)" msgstr "" -#: forms.py:100 forms.py:130 +#: forms.py:97 forms.py:129 msgid "Number/street" msgstr "" -#: forms.py:102 forms.py:132 +#: forms.py:99 forms.py:131 msgid "Postal code" msgstr "" -#: forms.py:107 +#: forms.py:104 msgid "Total surface (m2)" msgstr "" -#: forms.py:112 +#: forms.py:109 msgid "Total developed surface (m2)" msgstr "" -#: forms.py:119 +#: forms.py:116 msgid "Address" msgstr "" -#: forms.py:233 forms.py:237 forms.py:267 forms.py:270 +#: forms.py:119 +msgid "Project name" +msgstr "" + +#: forms.py:232 forms.py:236 forms.py:273 forms.py:276 msgid "General contractor" msgstr "" -#: forms.py:252 forms.py:364 +#: forms.py:254 forms.py:372 msgid "In charge" msgstr "" -#: forms.py:342 +#: forms.py:348 msgid "Town planning service" msgstr "" -#: forms.py:346 +#: forms.py:352 msgid "File reference" msgstr "" -#: forms.py:349 +#: forms.py:355 msgid "Planning service" msgstr "" -#: forms.py:383 +#: forms.py:395 msgid "Person in charge" msgstr "" -#: forms.py:395 +#: forms.py:407 msgid "Related file" msgstr "" -#: forms.py:399 +#: forms.py:411 msgid "Comment" msgstr "" -#: forms.py:406 +#: forms.py:418 msgid "Numeric reference" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 93a83eb05..9c2550def 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -12,21 +12,21 @@ msgstr "" msgid "Context record" msgstr "" -#: forms.py:83 ishtar_menu.py:31 models.py:439 models.py:750 models.py:850 -#: models.py:1000 templates/ishtar/sheet_find.html:5 +#: forms.py:83 ishtar_menu.py:31 models.py:440 models.py:754 models.py:854 +#: models.py:1004 templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:94 forms.py:218 forms.py:425 models.py:127 models.py:376 +#: forms.py:94 forms.py:218 forms.py:425 models.py:127 models.py:377 msgid "Free ID" msgstr "" -#: forms.py:96 models.py:425 +#: forms.py:96 models.py:426 msgid "Previous ID" msgstr "" -#: forms.py:97 forms.py:250 forms.py:591 models.py:131 models.py:377 -#: models.py:784 +#: forms.py:97 forms.py:250 forms.py:591 models.py:131 models.py:378 +#: models.py:788 msgid "Description" msgstr "" @@ -34,7 +34,7 @@ msgstr "" msgid "Batch/object" msgstr "" -#: forms.py:102 models.py:405 +#: forms.py:102 models.py:406 msgid "Is complete?" msgstr "" @@ -42,15 +42,15 @@ msgstr "" msgid "Material type" msgstr "" -#: forms.py:106 forms.py:244 models.py:62 models.py:381 +#: forms.py:106 forms.py:244 models.py:62 models.py:382 msgid "Conservatory state" msgstr "" -#: forms.py:109 models.py:383 +#: forms.py:109 models.py:384 msgid "Conservatory comment" msgstr "" -#: forms.py:112 models.py:102 models.py:408 +#: forms.py:112 models.py:102 models.py:409 msgid "Object types" msgstr "" @@ -58,67 +58,67 @@ msgstr "" msgid "Preservation type" msgstr "" -#: forms.py:117 forms.py:246 models.py:410 +#: forms.py:117 forms.py:246 models.py:411 msgid "Integrity / interest" msgstr "" -#: forms.py:120 forms.py:248 models.py:413 +#: forms.py:120 forms.py:248 models.py:414 msgid "Remarkability" msgstr "" -#: forms.py:122 models.py:415 +#: forms.py:122 models.py:416 msgid "Length (cm)" msgstr "" -#: forms.py:123 models.py:416 +#: forms.py:123 models.py:417 msgid "Width (cm)" msgstr "" -#: forms.py:124 models.py:417 +#: forms.py:124 models.py:418 msgid "Height (cm)" msgstr "" -#: forms.py:125 models.py:418 +#: forms.py:125 models.py:419 msgid "Diameter (cm)" msgstr "" -#: forms.py:126 forms.py:430 models.py:388 +#: forms.py:126 forms.py:430 models.py:389 msgid "Volume (l)" msgstr "" -#: forms.py:127 forms.py:431 models.py:389 +#: forms.py:127 forms.py:431 models.py:390 msgid "Weight (g)" msgstr "" -#: forms.py:129 models.py:419 +#: forms.py:129 models.py:420 msgid "Dimensions comment" msgstr "" -#: forms.py:130 forms.py:432 models.py:392 +#: forms.py:130 forms.py:432 models.py:393 msgid "Find number" msgstr "" -#: forms.py:131 models.py:421 +#: forms.py:131 models.py:422 msgid "Mark" msgstr "" -#: forms.py:132 forms.py:254 models.py:427 +#: forms.py:132 forms.py:254 models.py:428 msgid "Check" msgstr "" -#: forms.py:134 models.py:429 +#: forms.py:134 models.py:430 msgid "Check date" msgstr "" -#: forms.py:135 models.py:132 models.py:422 models.py:785 +#: forms.py:135 models.py:132 models.py:423 models.py:789 msgid "Comment" msgstr "" -#: forms.py:138 models.py:423 +#: forms.py:138 models.py:424 msgid "Comment on dating" msgstr "" -#: forms.py:139 models.py:431 +#: forms.py:139 models.py:432 msgid "Estimated value" msgstr "" @@ -133,7 +133,7 @@ msgid "" "p>" msgstr "" -#: forms.py:181 forms.py:212 models.py:400 +#: forms.py:181 forms.py:212 models.py:401 msgid "Dating" msgstr "" @@ -141,12 +141,12 @@ msgstr "" msgid "Period" msgstr "" -#: forms.py:187 forms.py:593 models.py:798 models.py:863 models.py:1005 +#: forms.py:187 forms.py:593 models.py:802 models.py:867 models.py:1009 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:121 msgid "Start date" msgstr "" -#: forms.py:189 forms.py:595 models.py:799 models.py:864 models.py:1006 +#: forms.py:189 forms.py:595 models.py:803 models.py:868 models.py:1010 #: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:122 msgid "End date" msgstr "" @@ -207,7 +207,7 @@ msgstr "" msgid "Upstream finds" msgstr "" -#: forms.py:326 models.py:440 +#: forms.py:326 models.py:441 msgid "Finds" msgstr "" @@ -283,16 +283,16 @@ msgstr "" msgid "Base treatment" msgstr "" -#: forms.py:578 models.py:772 models.py:787 models.py:862 +#: forms.py:578 models.py:776 models.py:791 models.py:866 msgid "Treatment type" msgstr "" -#: forms.py:580 models.py:796 models.py:867 +#: forms.py:580 models.py:800 models.py:871 #: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:119 msgid "Doer" msgstr "" -#: forms.py:586 models.py:789 models.py:865 +#: forms.py:586 models.py:793 models.py:869 msgid "Location" msgstr "" @@ -344,7 +344,7 @@ msgstr "" msgid "Parent material" msgstr "" -#: models.py:51 models.py:379 +#: models.py:51 models.py:380 msgid "Material types" msgstr "" @@ -392,11 +392,11 @@ msgstr "" msgid "Batch" msgstr "" -#: models.py:128 models.py:372 models.py:780 +#: models.py:128 models.py:373 models.py:784 msgid "External ID" msgstr "" -#: models.py:130 models.py:374 +#: models.py:130 models.py:375 msgid "External ID is set automatically" msgstr "" @@ -436,7 +436,7 @@ msgstr "" msgid "Cached value - do not edit" msgstr "" -#: models.py:159 models.py:370 +#: models.py:159 models.py:371 msgid "Base find" msgstr "" @@ -464,209 +464,209 @@ msgstr "" msgid "Can delete own Base find" msgstr "" -#: models.py:275 +#: models.py:276 msgid "g" msgstr "" -#: models.py:276 +#: models.py:277 msgid "kg" msgstr "" -#: models.py:278 +#: models.py:279 msgid "Not checked" msgstr "" -#: models.py:279 +#: models.py:280 msgid "Checked but incorrect" msgstr "" -#: models.py:280 +#: models.py:281 msgid "Checked and correct" msgstr "" -#: models.py:320 +#: models.py:321 msgid "Base find - Short ID" msgstr "" -#: models.py:321 +#: models.py:322 msgid "Base find - Complete ID" msgstr "" -#: models.py:322 +#: models.py:323 msgid "Base find - Comment" msgstr "" -#: models.py:323 +#: models.py:324 msgid "Base find - Description" msgstr "" -#: models.py:324 +#: models.py:325 msgid "Base find - Topographic localisation" msgstr "" -#: models.py:326 +#: models.py:327 msgid "Base find - Special interest" msgstr "" -#: models.py:327 +#: models.py:328 msgid "Base find - Discovery date" msgstr "" -#: models.py:375 models.py:856 +#: models.py:376 models.py:860 msgid "Order" msgstr "" -#: models.py:386 +#: models.py:387 msgid "Type of preservation to consider" msgstr "" -#: models.py:390 +#: models.py:391 msgid "Weight unit" msgstr "" -#: models.py:396 templates/ishtar/sheet_find.html:83 +#: models.py:397 templates/ishtar/sheet_find.html:83 msgid "Upstream treatment" msgstr "" -#: models.py:399 templates/ishtar/sheet_find.html:112 +#: models.py:400 templates/ishtar/sheet_find.html:112 msgid "Downstream treatment" msgstr "" -#: models.py:403 models.py:782 models.py:866 +#: models.py:404 models.py:786 models.py:870 #: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:120 msgid "Container" msgstr "" -#: models.py:433 +#: models.py:434 msgid "Cached name" msgstr "" -#: models.py:442 +#: models.py:443 msgid "Can view all Finds" msgstr "" -#: models.py:443 +#: models.py:444 msgid "Can view own Find" msgstr "" -#: models.py:444 +#: models.py:445 msgid "Can add own Find" msgstr "" -#: models.py:445 +#: models.py:446 msgid "Can change own Find" msgstr "" -#: models.py:446 +#: models.py:447 msgid "Can delete own Find" msgstr "" -#: models.py:452 +#: models.py:453 msgid "FIND" msgstr "" -#: models.py:748 +#: models.py:752 msgid "Find documentation" msgstr "" -#: models.py:749 +#: models.py:753 msgid "Find documentations" msgstr "" -#: models.py:759 +#: models.py:763 msgid "Virtual" msgstr "" -#: models.py:761 +#: models.py:765 msgid "Upstream is many" msgstr "" -#: models.py:763 +#: models.py:767 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" -#: models.py:766 +#: models.py:770 msgid "Downstream is many" msgstr "" -#: models.py:768 +#: models.py:772 msgid "Check this if for this treatment from one find you'll get many." msgstr "" -#: models.py:773 +#: models.py:777 msgid "Treatment types" msgstr "" -#: models.py:791 +#: models.py:795 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: models.py:793 +#: models.py:797 msgid "Other location" msgstr "" -#: models.py:803 models.py:852 models.py:992 +#: models.py:807 models.py:856 models.py:996 msgid "Treatment" msgstr "" -#: models.py:804 templates/ishtar/sheet_find.html:80 +#: models.py:808 templates/ishtar/sheet_find.html:80 msgid "Treatments" msgstr "" -#: models.py:806 +#: models.py:810 msgid "Can view all Treatments" msgstr "" -#: models.py:807 +#: models.py:811 msgid "Can view own Treatment" msgstr "" -#: models.py:808 +#: models.py:812 msgid "Can add own Treatment" msgstr "" -#: models.py:809 +#: models.py:813 msgid "Can change own Treatment" msgstr "" -#: models.py:810 +#: models.py:814 msgid "Can delete own Treatment" msgstr "" -#: models.py:816 +#: models.py:820 msgid "by" msgstr "" -#: models.py:868 models.py:869 templates/ishtar/sheet_find.html:89 +#: models.py:872 models.py:873 templates/ishtar/sheet_find.html:89 #: templates/ishtar/sheet_find.html:118 msgid "Related finds" msgstr "" -#: models.py:978 +#: models.py:982 msgid "Is upstream" msgstr "" -#: models.py:989 +#: models.py:993 msgid "Treatment documentation" msgstr "" -#: models.py:990 +#: models.py:994 msgid "Treament documentations" msgstr "" -#: models.py:1002 +#: models.py:1006 msgid "Administrative act" msgstr "" -#: models.py:1003 +#: models.py:1007 msgid "Person" msgstr "" -#: models.py:1009 +#: models.py:1013 msgid "Property" msgstr "" -#: models.py:1010 +#: models.py:1014 msgid "Properties" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 0e55c760b..d20ceba2d 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -8,13 +8,13 @@ msgid "" msgstr "" -#: forms.py:67 forms.py:369 forms.py:1004 forms.py:1026 forms.py:1030 +#: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035 #: models.py:1168 templates/ishtar/sheet_operation.html:144 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" -#: forms.py:70 forms.py:203 forms.py:980 models.py:1154 +#: forms.py:72 forms.py:205 forms.py:985 models.py:1154 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -23,96 +23,96 @@ msgstr "" msgid "Town" msgstr "" -#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:249 +#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:249 #: models.py:971 models.py:1152 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" -#: forms.py:75 models.py:1155 +#: forms.py:77 models.py:1155 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" -#: forms.py:78 models.py:1157 +#: forms.py:80 models.py:1157 msgid "Parcel number" msgstr "" -#: forms.py:80 models.py:1159 models.py:1176 models.py:1225 +#: forms.py:82 models.py:1159 models.py:1176 models.py:1225 msgid "Public domain" msgstr "" -#: forms.py:124 +#: forms.py:126 msgid "Town section is required." msgstr "" -#: forms.py:160 +#: forms.py:162 msgid "public domain" msgstr "" -#: forms.py:167 +#: forms.py:169 msgid "Current parcels" msgstr "" -#: forms.py:169 +#: forms.py:171 msgid "Deleted parcels" msgstr "" -#: forms.py:206 +#: forms.py:208 msgid "Full text input" msgstr "" -#: forms.py:208 +#: forms.py:210 msgid "example: \"2013: XD:1 to 13,24,33 to 39, YD:24\" or \"AB:24,AC:42\"" msgstr "" -#: forms.py:363 +#: forms.py:365 msgid "There are identical parcels." msgstr "" -#: forms.py:378 +#: forms.py:380 msgid "Relation type" msgstr "" -#: forms.py:381 ishtar_menu.py:30 models.py:344 models.py:804 models.py:834 +#: forms.py:383 ishtar_menu.py:30 models.py:344 models.py:804 models.py:834 #: models.py:862 models.py:963 models.py:1151 wizards.py:339 wizards.py:350 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" -#: forms.py:401 +#: forms.py:403 msgid ":" msgstr "" -#: forms.py:409 forms.py:608 forms.py:1215 +#: forms.py:411 forms.py:605 forms.py:1220 msgid "You should select an operation." msgstr "" -#: forms.py:413 +#: forms.py:415 msgid "You should select a relation type." msgstr "" -#: forms.py:443 +#: forms.py:445 msgid "Current relations" msgstr "" -#: forms.py:445 +#: forms.py:447 msgid "Deleted relations" msgstr "" -#: forms.py:449 templates/ishtar/sheet_operation.html:83 +#: forms.py:451 templates/ishtar/sheet_operation.html:83 msgid "Relations" msgstr "" -#: forms.py:460 forms.py:1221 models.py:250 +#: forms.py:456 forms.py:1226 models.py:250 msgid "Numeric reference" msgstr "" -#: forms.py:466 forms.py:1261 +#: forms.py:462 forms.py:1266 msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:469 forms.py:1264 models.py:805 +#: forms.py:465 forms.py:1269 models.py:805 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -121,211 +121,211 @@ msgstr "" msgid "Department" msgstr "" -#: forms.py:470 forms.py:1092 models.py:85 +#: forms.py:466 forms.py:1097 models.py:85 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "" -#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:257 +#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:257 msgid "Operation type" msgstr "" -#: forms.py:474 +#: forms.py:470 msgid "Is open?" msgstr "" -#: forms.py:483 forms.py:782 models.py:246 +#: forms.py:478 forms.py:782 models.py:246 msgid "In charge" msgstr "" -#: forms.py:490 models.py:957 +#: forms.py:485 models.py:957 msgid "Scientist in charge" msgstr "" -#: forms.py:492 forms.py:677 forms.py:773 models.py:244 +#: forms.py:487 forms.py:674 forms.py:772 models.py:244 msgid "Operator" msgstr "" -#: forms.py:499 forms.py:1097 models.py:89 models.py:259 +#: forms.py:496 forms.py:1102 models.py:89 models.py:259 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "" -#: forms.py:500 forms.py:1075 forms.py:1094 models.py:87 models.py:265 +#: forms.py:497 forms.py:1080 forms.py:1099 models.py:87 models.py:265 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "" -#: forms.py:501 +#: forms.py:498 msgid "Started before" msgstr "" -#: forms.py:503 +#: forms.py:500 msgid "Started after" msgstr "" -#: forms.py:505 +#: forms.py:502 msgid "Ended before" msgstr "" -#: forms.py:507 +#: forms.py:504 msgid "Ended after" msgstr "" -#: forms.py:510 +#: forms.py:507 msgid "Search within relations" msgstr "" -#: forms.py:512 forms.py:832 +#: forms.py:509 forms.py:837 msgid "Comment" msgstr "" -#: forms.py:513 +#: forms.py:510 msgid "Abstract (full text search)" msgstr "" -#: forms.py:515 forms.py:835 models.py:313 +#: forms.py:512 forms.py:840 models.py:313 msgid "Comment about scientific documentation" msgstr "" -#: forms.py:516 forms.py:837 models.py:325 +#: forms.py:513 forms.py:842 models.py:325 msgid "Record quality" msgstr "" -#: forms.py:517 forms.py:805 models.py:277 +#: forms.py:514 forms.py:807 models.py:277 msgid "Report processing" msgstr "" -#: forms.py:519 forms.py:840 models.py:320 +#: forms.py:516 forms.py:845 models.py:320 msgid "Virtual operation" msgstr "" -#: forms.py:521 forms.py:1141 +#: forms.py:518 forms.py:1146 msgid "Archaelogical site" msgstr "" -#: forms.py:527 forms.py:1268 +#: forms.py:524 forms.py:1273 msgid "Created by" msgstr "" -#: forms.py:533 forms.py:1274 +#: forms.py:530 forms.py:1279 msgid "Modified by" msgstr "" -#: forms.py:540 +#: forms.py:537 msgid "Documentation deadline before" msgstr "" -#: forms.py:542 +#: forms.py:539 msgid "Documentation deadline after" msgstr "" -#: forms.py:544 forms.py:825 models.py:332 +#: forms.py:541 forms.py:830 models.py:332 msgid "Documentation received" msgstr "" -#: forms.py:546 +#: forms.py:543 msgid "Finds deadline before" msgstr "" -#: forms.py:548 +#: forms.py:545 msgid "Finds deadline after" msgstr "" -#: forms.py:550 forms.py:830 models.py:336 +#: forms.py:547 forms.py:835 models.py:336 msgid "Finds received" msgstr "" -#: forms.py:595 forms.py:1213 views.py:168 +#: forms.py:592 forms.py:1218 views.py:168 msgid "Operation search" msgstr "" -#: forms.py:639 +#: forms.py:636 msgid "Associated file" msgstr "" -#: forms.py:643 forms.py:928 models.py:968 wizards.py:76 +#: forms.py:640 forms.py:933 models.py:968 wizards.py:76 msgid "Archaelogical file" msgstr "" -#: forms.py:650 forms.py:652 models.py:327 +#: forms.py:647 forms.py:649 models.py:327 msgid "Abstract" msgstr "" -#: forms.py:655 +#: forms.py:652 msgid "months" msgstr "" -#: forms.py:655 +#: forms.py:652 msgid "years" msgstr "" -#: forms.py:657 models.py:230 +#: forms.py:654 models.py:230 msgid "Creation date" msgstr "" -#: forms.py:658 +#: forms.py:655 msgid "Start of field work" msgstr "" -#: forms.py:660 +#: forms.py:657 msgid "All" msgstr "" -#: forms.py:661 +#: forms.py:658 msgid "Preventive" msgstr "" -#: forms.py:662 +#: forms.py:659 msgid "Research" msgstr "" -#: forms.py:666 +#: forms.py:663 msgid "Slicing" msgstr "" -#: forms.py:669 +#: forms.py:666 msgid "Department detail" msgstr "" -#: forms.py:671 +#: forms.py:668 msgid "Date get from" msgstr "" -#: forms.py:673 +#: forms.py:670 msgid "Preventive/Research" msgstr "" -#: forms.py:679 +#: forms.py:676 msgid "Date after" msgstr "" -#: forms.py:681 +#: forms.py:678 msgid "Date before" msgstr "" -#: forms.py:683 +#: forms.py:680 msgid "With reports" msgstr "" -#: forms.py:684 +#: forms.py:681 msgid "With finds" msgstr "" -#: forms.py:736 forms.py:1322 templates/ishtar/sheet_administrativeact.html:13 +#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:13 #: templates/ishtar/sheet_operation.html:24 msgid "General" msgstr "" -#: forms.py:751 models.py:310 +#: forms.py:748 models.py:310 msgid "Generic name" msgstr "" -#: forms.py:760 models.py:279 +#: forms.py:757 models.py:279 msgid "Old code" msgstr "" -#: forms.py:763 +#: forms.py:760 msgid "Head scientist" msgstr "" @@ -333,245 +333,245 @@ msgstr "" msgid "Operator reference" msgstr "" -#: forms.py:791 +#: forms.py:793 msgid "Total surface (m2)" msgstr "" -#: forms.py:798 models.py:53 models.py:233 models.py:1341 +#: forms.py:800 models.py:53 models.py:233 models.py:1341 msgid "Start date" msgstr "" -#: forms.py:800 models.py:235 +#: forms.py:802 models.py:235 msgid "Excavation end date" msgstr "" -#: forms.py:803 models.py:236 +#: forms.py:805 models.py:236 msgid "Report delivery date" msgstr "" -#: forms.py:822 models.py:329 +#: forms.py:827 models.py:329 msgid "Deadline for submission of the documentation" msgstr "" -#: forms.py:827 models.py:334 +#: forms.py:832 models.py:334 msgid "Deadline for submission of the finds" msgstr "" -#: forms.py:842 +#: forms.py:847 msgid "Image" msgstr "" -#: forms.py:843 +#: forms.py:848 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:881 +#: forms.py:886 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: forms.py:886 +#: forms.py:891 msgid "The excavation end date cannot be before the start date." msgstr "" -#: forms.py:914 +#: forms.py:919 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:918 +#: forms.py:923 msgid "Bad operation code" msgstr "" -#: forms.py:924 models.py:486 +#: forms.py:929 models.py:486 msgid "Operation code" msgstr "" -#: forms.py:950 +#: forms.py:955 msgid "Preventive informations - excavation" msgstr "" -#: forms.py:951 models.py:263 +#: forms.py:956 models.py:263 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" -#: forms.py:952 models.py:268 +#: forms.py:957 models.py:268 msgid "Scheduled man-days" msgstr "" -#: forms.py:954 models.py:271 +#: forms.py:959 models.py:271 msgid "Optional man-days" msgstr "" -#: forms.py:956 models.py:274 +#: forms.py:961 models.py:274 msgid "Effective man-days" msgstr "" -#: forms.py:966 +#: forms.py:971 msgid "Preventive informations - diagnostic" msgstr "" -#: forms.py:969 models.py:293 +#: forms.py:974 models.py:293 msgid "Prescription on zoning" msgstr "" -#: forms.py:971 models.py:296 +#: forms.py:976 models.py:296 msgid "Prescription on large area" msgstr "" -#: forms.py:974 models.py:298 +#: forms.py:979 models.py:298 msgid "Prescription on geoarchaeological context" msgstr "" -#: forms.py:978 forms.py:1000 models.py:261 models.py:981 +#: forms.py:983 forms.py:1005 models.py:261 models.py:981 msgid "Towns" msgstr "" -#: forms.py:1007 models.py:1167 models.py:1339 +#: forms.py:1012 models.py:1167 models.py:1339 msgid "Parcel" msgstr "" -#: forms.py:1059 models.py:45 +#: forms.py:1064 models.py:45 msgid "Remain types" msgstr "" -#: forms.py:1063 models.py:44 +#: forms.py:1068 models.py:44 msgid "Remain type" msgstr "" -#: forms.py:1079 templates/ishtar/sheet_operation.html:164 +#: forms.py:1084 templates/ishtar/sheet_operation.html:164 #: templates/ishtar/sheet_operation.html:195 msgid "Period" msgstr "" -#: forms.py:1091 models.py:84 +#: forms.py:1096 models.py:84 msgid "Reference" msgstr "" -#: forms.py:1120 +#: forms.py:1125 msgid "This reference already exists." msgstr "" -#: forms.py:1137 models.py:93 +#: forms.py:1142 models.py:93 msgid "Archaeological site" msgstr "" -#: forms.py:1152 models.py:94 models.py:317 +#: forms.py:1157 models.py:94 models.py:317 #: templates/ishtar/sheet_operation.html:94 msgid "Archaeological sites" msgstr "" -#: forms.py:1156 +#: forms.py:1161 msgid "Associated archaelogical sites" msgstr "" -#: forms.py:1162 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 +#: forms.py:1167 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 msgid "Search" msgstr "" -#: forms.py:1167 +#: forms.py:1172 msgid "Would you like to close this operation?" msgstr "" -#: forms.py:1172 +#: forms.py:1177 msgid "Would you like to delete this operation?" msgstr "" -#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:836 models.py:948 +#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:836 models.py:948 msgid "Index" msgstr "" -#: forms.py:1207 +#: forms.py:1212 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1219 +#: forms.py:1224 msgid "Operation's year" msgstr "" -#: forms.py:1226 +#: forms.py:1231 msgid "Operation's town" msgstr "" -#: forms.py:1239 +#: forms.py:1244 msgid "Documentation search" msgstr "" -#: forms.py:1241 +#: forms.py:1246 msgid "You should select a document." msgstr "" -#: forms.py:1258 forms.py:1325 models.py:873 models.py:942 +#: forms.py:1263 forms.py:1330 models.py:873 models.py:942 msgid "Act type" msgstr "" -#: forms.py:1259 forms.py:1457 +#: forms.py:1264 forms.py:1462 msgid "Indexed?" msgstr "" -#: forms.py:1265 forms.py:1330 models.py:972 +#: forms.py:1270 forms.py:1335 models.py:972 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: forms.py:1302 views.py:324 +#: forms.py:1307 views.py:324 msgid "Administrative act search" msgstr "" -#: forms.py:1317 forms.py:1415 forms.py:1482 +#: forms.py:1322 forms.py:1420 forms.py:1487 msgid "You should select an administrative act." msgstr "" -#: forms.py:1333 models.py:969 +#: forms.py:1338 models.py:969 msgid "Signature date" msgstr "" -#: forms.py:1375 +#: forms.py:1380 #, python-format msgid "" "This index already exist for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1379 +#: forms.py:1384 msgid "Bad index" msgstr "" -#: forms.py:1392 +#: forms.py:1397 msgid "Would you like to delete this administrative act?" msgstr "" -#: forms.py:1397 +#: forms.py:1402 msgid "Template" msgstr "" -#: forms.py:1421 forms.py:1425 +#: forms.py:1426 forms.py:1430 msgid "This document is not intended for this type of act." msgstr "" -#: forms.py:1443 +#: forms.py:1448 msgid "Doc generation" msgstr "" -#: forms.py:1445 +#: forms.py:1450 msgid "Generate the associated doc?" msgstr "" -#: forms.py:1466 ishtar_menu.py:121 views.py:377 +#: forms.py:1471 ishtar_menu.py:121 views.py:377 msgctxt "admin act register" msgid "Register" msgstr "" -#: ishtar_menu.py:38 +#: ishtar_menu.py:38 ishtar_menu.py:69 ishtar_menu.py:97 msgid "Creation" msgstr "" @@ -592,10 +592,6 @@ msgstr "" msgid "Administrative act" msgstr "" -#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:55 -msgid "Add" -msgstr "" - #: ishtar_menu.py:84 msgid "Documents" msgstr "" @@ -1031,6 +1027,10 @@ msgstr "" msgid "Operation: administrative act deletion" msgstr "" +#: widgets.py:55 +msgid "Add" +msgstr "" + #: wizards.py:199 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 5110bca31..b687a55ed 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -127,40 +127,40 @@ msgstr "" msgid "\"%(value)s\" not in %(values)s" msgstr "" -#: forms.py:55 +#: forms.py:72 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "" -#: forms.py:71 forms_common.py:618 +#: forms.py:88 forms_common.py:618 msgid "Confirm" msgstr "" -#: forms.py:76 +#: forms.py:93 msgid "Are you sure you want to delete?" msgstr "" -#: forms.py:85 +#: forms.py:102 msgid "There are identical items." msgstr "" -#: forms.py:123 forms.py:124 +#: forms.py:140 forms.py:141 msgid "Closing date" msgstr "" -#: forms.py:137 +#: forms.py:154 msgid "You should select an item." msgstr "" -#: forms.py:138 +#: forms.py:155 msgid "Add a new item" msgstr "" -#: forms.py:245 models.py:1310 +#: forms.py:262 models.py:1355 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1376 models.py:2758 +#: forms_common.py:406 models.py:1421 models.py:2810 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -176,8 +176,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

" msgstr "" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1546 -#: models.py:2384 models.py:2566 models.py:2628 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1594 +#: models.py:2436 models.py:2618 models.py:2680 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -189,63 +189,63 @@ msgid "" msgstr "" #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1547 models.py:2273 +#: ishtar_menu.py:75 models.py:1595 models.py:2322 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:977 models.py:1309 -#: models.py:1592 models.py:1810 models.py:2267 models.py:2370 models.py:2744 +#: forms_common.py:376 forms_common.py:446 models.py:1022 models.py:1354 +#: models.py:1640 models.py:1859 models.py:2316 models.py:2422 models.py:2796 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:174 models.py:1531 models.py:1941 +#: forms_common.py:174 models.py:1576 models.py:1990 msgid "Organization type" msgstr "" -#: forms_common.py:176 forms_common.py:400 models.py:1371 +#: forms_common.py:176 forms_common.py:400 models.py:1416 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:178 forms_common.py:403 models.py:1372 +#: forms_common.py:178 forms_common.py:403 models.py:1417 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:180 forms_common.py:404 models.py:1374 +#: forms_common.py:180 forms_common.py:404 models.py:1419 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:183 forms_common.py:407 models.py:1377 +#: forms_common.py:183 forms_common.py:407 models.py:1422 msgid "Country" msgstr "" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1404 +#: forms_common.py:448 forms_common.py:572 models.py:1449 msgid "Email" msgstr "" -#: forms_common.py:186 forms_common.py:383 models.py:1389 +#: forms_common.py:186 forms_common.py:383 models.py:1434 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:187 forms_common.py:392 models.py:1401 +#: forms_common.py:187 forms_common.py:392 models.py:1446 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:1969 -#: models.py:2269 models.py:2679 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2018 +#: models.py:2318 models.py:2731 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -253,12 +253,12 @@ msgstr "" msgid "Type" msgstr "" -#: forms_common.py:220 views.py:139 +#: forms_common.py:220 views.py:142 msgid "Organization search" msgstr "" #: forms_common.py:244 -msgid "At leat two items have to be selected." +msgid "At least two items have to be selected." msgstr "" #: forms_common.py:262 @@ -269,12 +269,12 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2368 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2420 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:339 forms_common.py:434 views.py:104 +#: forms_common.py:339 forms_common.py:434 views.py:107 msgid "Person search" msgstr "" @@ -287,25 +287,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1942 -#: models.py:2362 models.py:2364 models.py:2676 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1991 +#: models.py:2414 models.py:2416 models.py:2728 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:372 models.py:2366 +#: forms_common.py:372 models.py:2418 msgid "Salutation" msgstr "" -#: forms_common.py:378 models.py:2372 +#: forms_common.py:378 models.py:2424 msgid "Raw name" msgstr "" -#: forms_common.py:381 models.py:1390 +#: forms_common.py:381 models.py:1435 msgid "Phone description" msgstr "" -#: forms_common.py:384 models.py:1392 models.py:1394 +#: forms_common.py:384 models.py:1437 models.py:1439 msgid "Phone description 2" msgstr "" @@ -313,11 +313,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:388 models.py:1398 +#: forms_common.py:388 models.py:1443 msgid "Phone description 3" msgstr "" -#: forms_common.py:390 models.py:1396 +#: forms_common.py:390 models.py:1441 msgid "Phone 3" msgstr "" @@ -325,23 +325,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:409 models.py:1379 +#: forms_common.py:409 models.py:1424 msgid "Other address: address" msgstr "" -#: forms_common.py:412 models.py:1382 +#: forms_common.py:412 models.py:1427 msgid "Other address: address complement" msgstr "" -#: forms_common.py:414 models.py:1383 +#: forms_common.py:414 models.py:1428 msgid "Other address: postal code" msgstr "" -#: forms_common.py:416 models.py:1385 +#: forms_common.py:416 models.py:1430 msgid "Other address: town" msgstr "" -#: forms_common.py:418 models.py:1387 +#: forms_common.py:418 models.py:1432 msgid "Other address: country" msgstr "" @@ -357,7 +357,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2321 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2370 msgid "Person type" msgstr "" @@ -365,7 +365,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:575 wizards.py:1192 +#: forms_common.py:575 wizards.py:1194 msgid "New password" msgstr "" @@ -389,7 +389,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2759 +#: forms_common.py:628 forms_common.py:641 models.py:2811 msgid "Towns" msgstr "" @@ -405,7 +405,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:1943 models.py:2653 +#: forms_common.py:775 forms_common.py:823 models.py:1992 models.py:2705 msgid "Source type" msgstr "" @@ -417,37 +417,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2690 +#: forms_common.py:783 models.py:2742 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2692 +#: forms_common.py:784 models.py:2744 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2096 models.py:2694 +#: forms_common.py:786 models.py:2145 models.py:2746 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2697 +#: forms_common.py:789 models.py:2749 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:577 -#: models.py:1837 models.py:2376 models.py:2704 +#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:622 +#: models.py:1886 models.py:2428 models.py:2756 msgid "Comment" msgstr "" -#: forms_common.py:793 forms_common.py:826 models.py:979 models.py:1596 -#: models.py:1769 models.py:1811 models.py:2703 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1024 models.py:1644 +#: models.py:1818 models.py:1860 models.py:2755 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2705 +#: forms_common.py:796 models.py:2757 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2707 +#: forms_common.py:798 forms_common.py:830 models.py:2759 msgid "Has a duplicate" msgstr "" @@ -462,7 +462,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2633 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2685 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -475,7 +475,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:1944 models.py:2621 models.py:2630 +#: forms_common.py:856 models.py:1993 models.py:2673 models.py:2682 msgid "Author type" msgstr "" @@ -487,7 +487,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2634 models.py:2686 +#: forms_common.py:893 models.py:2686 models.py:2738 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -501,11 +501,11 @@ msgstr "" msgid "Add/modify" msgstr "" -#: ishtar_menu.py:36 +#: ishtar_menu.py:36 ishtar_menu.py:70 ishtar_menu.py:101 msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1105 views.py:1484 +#: ishtar_menu.py:39 models.py:1150 views.py:1494 msgid "Global variables" msgstr "" @@ -533,20 +533,15 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:70 ishtar_menu.py:101 models.py:2133 widgets.py:110 -#: templates/ishtar/form_delete.html:11 -msgid "Delete" -msgstr "" - -#: ishtar_menu.py:109 models.py:2107 +#: ishtar_menu.py:109 models.py:2156 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1492 +#: ishtar_menu.py:112 views.py:1502 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1506 +#: ishtar_menu.py:116 views.py:1516 msgid "Current imports" msgstr "" @@ -566,7 +561,7 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:313 models.py:576 models.py:1344 models.py:1356 +#: models.py:313 models.py:621 models.py:1389 models.py:1401 models.py:1815 msgid "Label" msgstr "" @@ -574,192 +569,192 @@ msgstr "" msgid "Textual ID" msgstr "" -#: models.py:318 models.py:579 models.py:1313 +#: models.py:318 models.py:624 models.py:1358 msgid "Available" msgstr "" -#: models.py:598 models.py:1883 +#: models.py:643 models.py:1932 msgid "Key" msgstr "" -#: models.py:604 +#: models.py:649 msgid "Specific key to an import" msgstr "" -#: models.py:696 +#: models.py:741 msgid "Last editor" msgstr "" -#: models.py:699 +#: models.py:744 msgid "Creator" msgstr "" -#: models.py:841 models.py:2770 +#: models.py:886 models.py:2822 msgid "Order" msgstr "" -#: models.py:842 +#: models.py:887 msgid "Symmetrical" msgstr "" -#: models.py:843 +#: models.py:888 msgid "Tiny label" msgstr "" -#: models.py:857 +#: models.py:902 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:971 +#: models.py:1016 msgid "Euro" msgstr "" -#: models.py:972 +#: models.py:1017 msgid "US dollar" msgstr "" -#: models.py:978 models.py:1594 +#: models.py:1023 models.py:1642 msgid "Slug" msgstr "" -#: models.py:980 +#: models.py:1025 msgid "Files module" msgstr "" -#: models.py:981 +#: models.py:1026 msgid "Context records module" msgstr "" -#: models.py:983 +#: models.py:1028 msgid "Finds module" msgstr "" -#: models.py:984 +#: models.py:1029 msgid "Need context records module" msgstr "" -#: models.py:986 +#: models.py:1031 msgid "Warehouses module" msgstr "" -#: models.py:987 +#: models.py:1032 msgid "Need finds module" msgstr "" -#: models.py:989 +#: models.py:1034 msgid "Home page" msgstr "" -#: models.py:990 +#: models.py:1035 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:994 +#: models.py:1039 msgid "File external id" msgstr "" -#: models.py:996 +#: models.py:1041 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1001 +#: models.py:1046 msgid "Parcel external id" msgstr "" -#: models.py:1004 +#: models.py:1049 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1009 +#: models.py:1054 msgid "Context record external id" msgstr "" -#: models.py:1011 +#: models.py:1056 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1016 +#: models.py:1061 msgid "Base find external id" msgstr "" -#: models.py:1018 +#: models.py:1063 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1023 +#: models.py:1068 msgid "Find external id" msgstr "" -#: models.py:1025 +#: models.py:1070 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1030 +#: models.py:1075 msgid "Raw name for person" msgstr "" -#: models.py:1032 +#: models.py:1077 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1036 +#: models.py:1081 msgid "Current active" msgstr "" -#: models.py:1037 +#: models.py:1082 msgid "Currency" msgstr "" -#: models.py:1041 +#: models.py:1086 msgid "Ishtar site profile" msgstr "" -#: models.py:1042 +#: models.py:1087 msgid "Ishtar site profiles" msgstr "" -#: models.py:1098 +#: models.py:1143 msgid "Variable name" msgstr "" -#: models.py:1099 +#: models.py:1144 msgid "Description of the variable" msgstr "" -#: models.py:1101 models.py:1884 +#: models.py:1146 models.py:1933 msgid "Value" msgstr "" -#: models.py:1104 +#: models.py:1149 msgid "Global variable" msgstr "" -#: models.py:1214 models.py:1244 +#: models.py:1259 models.py:1289 msgid "Total" msgstr "" -#: models.py:1221 models.py:1345 models.py:1357 +#: models.py:1266 models.py:1390 models.py:1402 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -767,597 +762,601 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1308 +#: models.py:1353 msgid "Administrative Act" msgstr "" -#: models.py:1312 +#: models.py:1357 msgid "Associated object" msgstr "" -#: models.py:1316 +#: models.py:1361 msgid "Document template" msgstr "" -#: models.py:1317 +#: models.py:1362 msgid "Document templates" msgstr "" -#: models.py:1348 models.py:1358 models.py:2091 +#: models.py:1393 models.py:1403 models.py:2140 msgid "State" msgstr "" -#: models.py:1362 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1407 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1363 +#: models.py:1408 msgid "Departments" msgstr "" -#: models.py:1400 +#: models.py:1445 msgid "Raw phone" msgstr "" -#: models.py:1406 +#: models.py:1451 msgid "Alternative address is prefered" msgstr "" -#: models.py:1445 +#: models.py:1490 msgid "Tel: " msgstr "" -#: models.py:1449 +#: models.py:1494 msgid "Mobile: " msgstr "" -#: models.py:1453 +#: models.py:1498 msgid "Email: " msgstr "" -#: models.py:1458 +#: models.py:1503 msgid "Merge key" msgstr "" -#: models.py:1532 +#: models.py:1577 msgid "Organization types" msgstr "" -#: models.py:1548 views.py:234 +#: models.py:1596 views.py:237 msgid "Operation" msgstr "" -#: models.py:1550 +#: models.py:1598 msgid "Archaeological site" msgstr "" -#: models.py:1551 +#: models.py:1599 msgid "Parcels" msgstr "" -#: models.py:1553 +#: models.py:1601 msgid "Operation source" msgstr "" -#: models.py:1556 views.py:1299 views.py:1350 +#: models.py:1604 views.py:1310 views.py:1360 msgid "Archaeological files" msgstr "" -#: models.py:1558 views.py:1302 views.py:1358 +#: models.py:1606 views.py:1313 views.py:1368 msgid "Context records" msgstr "" -#: models.py:1560 +#: models.py:1608 msgid "Context record relations" msgstr "" -#: models.py:1562 views.py:1304 views.py:1361 +#: models.py:1610 views.py:1315 views.py:1371 msgid "Finds" msgstr "" -#: models.py:1598 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1646 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1600 +#: models.py:1648 msgid "Associated model" msgstr "" -#: models.py:1603 +#: models.py:1651 msgid "Is template" msgstr "" -#: models.py:1604 +#: models.py:1652 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1608 +#: models.py:1656 msgid "Importer - Type" msgstr "" -#: models.py:1609 +#: models.py:1657 msgid "Importer - Types" msgstr "" -#: models.py:1699 +#: models.py:1747 msgid "Importer - Default" msgstr "" -#: models.py:1700 +#: models.py:1748 msgid "Importer - Defaults" msgstr "" -#: models.py:1735 +#: models.py:1783 msgid "Importer - Default value" msgstr "" -#: models.py:1736 +#: models.py:1784 msgid "Importer - Default values" msgstr "" -#: models.py:1768 +#: models.py:1817 msgid "Column number" msgstr "" -#: models.py:1771 +#: models.py:1820 msgid "Required" msgstr "" -#: models.py:1774 +#: models.py:1823 msgid "Importer - Column" msgstr "" -#: models.py:1775 +#: models.py:1824 msgid "Importer - Columns" msgstr "" -#: models.py:1795 +#: models.py:1844 msgid "Field name" msgstr "" -#: models.py:1797 models.py:1831 +#: models.py:1846 models.py:1880 msgid "Force creation of new items" msgstr "" -#: models.py:1799 models.py:1833 +#: models.py:1848 models.py:1882 msgid "Concatenate with existing" msgstr "" -#: models.py:1801 models.py:1835 +#: models.py:1850 models.py:1884 msgid "Concatenate character" msgstr "" -#: models.py:1805 +#: models.py:1854 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1806 +#: models.py:1855 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1813 +#: models.py:1862 msgid "Regular expression" msgstr "" -#: models.py:1816 +#: models.py:1865 msgid "Importer - Regular expression" msgstr "" -#: models.py:1817 +#: models.py:1866 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1840 +#: models.py:1889 msgid "Importer - Target" msgstr "" -#: models.py:1841 +#: models.py:1890 msgid "Importer - Targets" msgstr "" -#: models.py:1865 views.py:518 +#: models.py:1914 views.py:520 msgid "True" msgstr "" -#: models.py:1866 views.py:520 +#: models.py:1915 views.py:522 msgid "False" msgstr "" -#: models.py:1885 +#: models.py:1934 msgid "Is set" msgstr "" -#: models.py:1892 +#: models.py:1941 msgid "Importer - Target key" msgstr "" -#: models.py:1893 +#: models.py:1942 msgid "Importer - Targets keys" msgstr "" -#: models.py:1945 models.py:2669 models.py:2682 +#: models.py:1994 models.py:2721 models.py:2734 msgid "Format" msgstr "" -#: models.py:1946 models.py:2774 +#: models.py:1995 models.py:2826 msgid "Operation type" msgstr "" -#: models.py:1947 +#: models.py:1996 msgid "Period" msgstr "" -#: models.py:1948 +#: models.py:1997 msgid "Report state" msgstr "" -#: models.py:1949 +#: models.py:1998 msgid "Unit" msgstr "" -#: models.py:1950 +#: models.py:1999 msgid "Material" msgstr "" -#: models.py:1952 +#: models.py:2001 msgid "Conservatory state" msgstr "" -#: models.py:1953 +#: models.py:2002 msgid "Preservation type" msgstr "" -#: models.py:1954 +#: models.py:2003 msgid "Object type" msgstr "" -#: models.py:1956 +#: models.py:2005 msgid "Identification type" msgstr "" -#: models.py:1958 +#: models.py:2007 msgid "Context record relation type" msgstr "" -#: models.py:1959 models.py:2661 +#: models.py:2008 models.py:2713 msgid "Support type" msgstr "" -#: models.py:1965 +#: models.py:2014 msgid "Integer" msgstr "" -#: models.py:1966 +#: models.py:2015 msgid "Float" msgstr "" -#: models.py:1967 +#: models.py:2016 msgid "String" msgstr "" -#: models.py:1968 templates/sheet_ope.html:86 +#: models.py:2017 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:1970 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2019 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:1971 +#: models.py:2020 msgid "String to boolean" msgstr "" -#: models.py:1972 +#: models.py:2021 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:1973 +#: models.py:2022 msgid "Unknow type" msgstr "" -#: models.py:1989 +#: models.py:2038 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:1990 +#: models.py:2039 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:1991 +#: models.py:2040 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2001 +#: models.py:2050 msgid "Options" msgstr "" -#: models.py:2003 +#: models.py:2052 msgid "Split character(s)" msgstr "" -#: models.py:2007 +#: models.py:2056 msgid "Importer - Formater type" msgstr "" -#: models.py:2008 +#: models.py:2057 msgid "Importer - Formater types" msgstr "" -#: models.py:2055 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2104 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2056 +#: models.py:2105 msgid "Analyse in progress" msgstr "" -#: models.py:2057 +#: models.py:2106 msgid "Analysed" msgstr "" -#: models.py:2058 +#: models.py:2107 msgid "Import pending" msgstr "" -#: models.py:2059 +#: models.py:2108 msgid "Import in progress" msgstr "" -#: models.py:2060 +#: models.py:2109 msgid "Finished with errors" msgstr "" -#: models.py:2061 +#: models.py:2110 msgid "Finished" msgstr "" -#: models.py:2062 +#: models.py:2111 msgid "Archived" msgstr "" -#: models.py:2074 +#: models.py:2123 msgid "Imported file" msgstr "" -#: models.py:2077 +#: models.py:2126 msgid "Associated images (zip file)" msgstr "" -#: models.py:2079 +#: models.py:2128 msgid "Encoding" msgstr "" -#: models.py:2081 +#: models.py:2130 msgid "Skip lines" msgstr "" -#: models.py:2082 templates/ishtar/import_list.html:47 +#: models.py:2131 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:2085 +#: models.py:2134 msgid "Result file" msgstr "" -#: models.py:2088 templates/ishtar/import_list.html:53 +#: models.py:2137 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:2094 +#: models.py:2143 msgid "Conservative import" msgstr "" -#: models.py:2099 +#: models.py:2148 msgid "End date" msgstr "" -#: models.py:2101 +#: models.py:2150 msgid "Remaining seconds" msgstr "" -#: models.py:2106 +#: models.py:2155 msgid "Import" msgstr "" -#: models.py:2123 +#: models.py:2172 msgid "Analyse" msgstr "" -#: models.py:2125 models.py:2128 +#: models.py:2174 models.py:2177 msgid "Re-analyse" msgstr "" -#: models.py:2126 +#: models.py:2175 msgid "Launch import" msgstr "" -#: models.py:2129 +#: models.py:2178 msgid "Re-import" msgstr "" -#: models.py:2130 +#: models.py:2179 msgid "Archive" msgstr "" -#: models.py:2132 +#: models.py:2181 msgid "Unarchive" msgstr "" -#: models.py:2274 +#: models.py:2182 widgets.py:110 templates/ishtar/form_delete.html:11 +msgid "Delete" +msgstr "" + +#: models.py:2323 msgid "Organizations" msgstr "" -#: models.py:2276 +#: models.py:2325 msgid "Can view all Organizations" msgstr "" -#: models.py:2277 +#: models.py:2326 msgid "Can view own Organization" msgstr "" -#: models.py:2278 +#: models.py:2327 msgid "Can add own Organization" msgstr "" -#: models.py:2280 +#: models.py:2329 msgid "Can change own Organization" msgstr "" -#: models.py:2282 +#: models.py:2331 msgid "Can delete own Organization" msgstr "" -#: models.py:2317 +#: models.py:2366 msgid "Groups" msgstr "" -#: models.py:2322 +#: models.py:2371 msgid "Person types" msgstr "" -#: models.py:2330 +#: models.py:2382 msgid "Title type" msgstr "" -#: models.py:2331 +#: models.py:2383 msgid "Title types" msgstr "" -#: models.py:2340 +#: models.py:2392 msgid "Mr" msgstr "" -#: models.py:2341 +#: models.py:2393 msgid "Miss" msgstr "" -#: models.py:2342 +#: models.py:2394 msgid "Mr and Mrs" msgstr "" -#: models.py:2343 +#: models.py:2395 msgid "Mrs" msgstr "" -#: models.py:2344 +#: models.py:2396 msgid "Doctor" msgstr "" -#: models.py:2374 +#: models.py:2426 msgid "Contact type" msgstr "" -#: models.py:2377 models.py:2441 +#: models.py:2429 models.py:2493 msgid "Types" msgstr "" -#: models.py:2380 +#: models.py:2432 msgid "Is attached to" msgstr "" -#: models.py:2385 +#: models.py:2437 msgid "Persons" msgstr "" -#: models.py:2387 +#: models.py:2439 msgid "Can view all Persons" msgstr "" -#: models.py:2388 +#: models.py:2440 msgid "Can view own Person" msgstr "" -#: models.py:2389 +#: models.py:2441 msgid "Can add own Person" msgstr "" -#: models.py:2390 +#: models.py:2442 msgid "Can change own Person" msgstr "" -#: models.py:2391 +#: models.py:2443 msgid "Can delete own Person" msgstr "" -#: models.py:2569 +#: models.py:2621 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2572 +#: models.py:2624 msgid "Ishtar user" msgstr "" -#: models.py:2573 +#: models.py:2625 msgid "Ishtar users" msgstr "" -#: models.py:2616 +#: models.py:2668 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2622 +#: models.py:2674 msgid "Author types" msgstr "" -#: models.py:2654 +#: models.py:2706 msgid "Source types" msgstr "" -#: models.py:2662 +#: models.py:2714 msgid "Support types" msgstr "" -#: models.py:2670 +#: models.py:2722 msgid "Formats" msgstr "" -#: models.py:2677 +#: models.py:2729 msgid "External ID" msgstr "" -#: models.py:2680 +#: models.py:2732 msgid "Support" msgstr "" -#: models.py:2684 +#: models.py:2736 msgid "Scale" msgstr "" -#: models.py:2698 +#: models.py:2750 msgid "Item number" msgstr "" -#: models.py:2699 +#: models.py:2751 msgid "Ref." msgstr "" -#: models.py:2702 +#: models.py:2754 msgid "Internal ref." msgstr "" -#: models.py:2745 +#: models.py:2797 msgid "Surface (m2)" msgstr "" -#: models.py:2746 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2798 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2771 +#: models.py:2823 msgid "Is preventive" msgstr "" -#: models.py:2775 +#: models.py:2827 msgid "Operation types" msgstr "" -#: models.py:2804 +#: models.py:2856 msgid "Preventive" msgstr "" -#: models.py:2805 +#: models.py:2857 msgid "Research" msgstr "" @@ -1369,104 +1368,104 @@ msgstr "" msgid "Load another random image?" msgstr "" -#: views.py:111 +#: views.py:114 msgid "New person" msgstr "" -#: views.py:119 +#: views.py:122 msgid "Person modification" msgstr "" -#: views.py:134 +#: views.py:137 msgid "Person deletion" msgstr "" -#: views.py:145 +#: views.py:148 msgid "New organization" msgstr "" -#: views.py:152 +#: views.py:155 msgid "Organization modification" msgstr "" -#: views.py:168 +#: views.py:171 msgid "Organization deletion" msgstr "" -#: views.py:175 +#: views.py:178 msgid "Account management" msgstr "" -#: views.py:181 +#: views.py:184 msgid "Account deletion" msgstr "" -#: views.py:233 +#: views.py:236 msgid "Archaeological file" msgstr "" -#: views.py:236 +#: views.py:239 msgid "Context record" msgstr "" -#: views.py:238 +#: views.py:241 msgid "Find" msgstr "" -#: views.py:1238 views.py:1281 +#: views.py:1249 views.py:1292 msgid "Operation not permitted." msgstr "" -#: views.py:1240 +#: views.py:1251 #, python-format msgid "New %s" msgstr "" -#: views.py:1300 views.py:1354 +#: views.py:1311 views.py:1364 msgid "Operations" msgstr "" -#: views.py:1553 templates/ishtar/import_list.html:43 +#: views.py:1563 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1568 +#: views.py:1578 msgid "Delete import" msgstr "" -#: views.py:1607 +#: views.py:1617 msgid "Merge persons" msgstr "" -#: views.py:1631 +#: views.py:1641 msgid "Select the main person" msgstr "" -#: views.py:1640 +#: views.py:1650 msgid "Merge organization" msgstr "" -#: views.py:1650 +#: views.py:1660 msgid "Select the main organization" msgstr "" -#: views.py:1690 views.py:1706 +#: views.py:1700 views.py:1716 msgid "Corporation manager" msgstr "" -#: widgets.py:239 widgets.py:347 widgets.py:463 +#: widgets.py:239 widgets.py:347 widgets.py:462 msgid "Search..." msgstr "" -#: widgets.py:623 templatetags/window_tables.py:79 +#: widgets.py:642 templatetags/window_tables.py:79 msgid "No results" msgstr "" -#: widgets.py:624 templatetags/window_tables.py:80 +#: widgets.py:643 templatetags/window_tables.py:80 msgid "Loading..." msgstr "" -#: widgets.py:625 +#: widgets.py:644 msgid "Remove" msgstr "" @@ -1478,7 +1477,7 @@ msgstr "" msgid "No" msgstr "" -#: wizards.py:1249 +#: wizards.py:1251 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index b5ede5ba3..76c791c25 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -6,21 +6,23 @@ # Étienne Loks , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-10-17 01:16-0400\n" "Last-Translator: Étienne Loks \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.5\n" -#: forms.py:47 forms.py:51 models.py:164 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:165 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:137 models.py:166 +#: forms.py:59 forms.py:137 models.py:167 msgid "ID" msgstr "Identifiant" @@ -72,43 +74,43 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:136 models.py:131 models.py:162 +#: forms.py:136 models.py:131 models.py:163 msgid "Parcel" msgstr "Parcelle" -#: forms.py:139 models.py:167 templates/ishtar/sheet_contextrecord.html:27 +#: forms.py:139 models.py:168 templates/ishtar/sheet_contextrecord.html:27 msgid "Description" msgstr "Description" -#: forms.py:141 models.py:168 +#: forms.py:141 models.py:169 msgid "General comment" msgstr "Commentaire général" -#: forms.py:143 models.py:172 +#: forms.py:143 models.py:173 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:144 models.py:173 +#: forms.py:144 models.py:174 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:145 models.py:174 +#: forms.py:145 models.py:175 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:146 models.py:176 +#: forms.py:146 models.py:177 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:147 models.py:184 +#: forms.py:147 models.py:185 msgid "Unit" msgstr "Unité" -#: forms.py:148 models.py:186 +#: forms.py:148 models.py:187 msgid "Has furniture?" msgstr "Contient du mobilier ?" -#: forms.py:151 models.py:178 +#: forms.py:151 models.py:179 msgid "Location" msgstr "Lieu" @@ -137,7 +139,7 @@ msgstr "Datation" msgid "Start date" msgstr "Date de début" -#: forms.py:234 models.py:57 models.py:171 +#: forms.py:234 models.py:57 models.py:172 msgid "End date" msgstr "Date de fin" @@ -149,7 +151,7 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: forms.py:263 ishtar_menu.py:29 models.py:457 +#: forms.py:263 ishtar_menu.py:29 models.py:459 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -157,7 +159,7 @@ msgstr "Unité d'Enregistrement" msgid "Relations" msgstr "Relations" -#: forms.py:288 forms.py:296 models.py:189 +#: forms.py:288 forms.py:296 models.py:190 #: templates/ishtar/sheet_contextrecord.html:39 msgid "Interpretation" msgstr "Interprétation" @@ -166,31 +168,31 @@ msgstr "Interprétation" msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:294 models.py:188 +#: forms.py:294 models.py:189 msgid "Filling" msgstr "Remplissage" -#: forms.py:298 models.py:209 +#: forms.py:298 models.py:210 msgid "Activity" msgstr "Activité" -#: forms.py:300 models.py:207 +#: forms.py:300 models.py:208 msgid "Identification" msgstr "Identification" -#: forms.py:302 models.py:192 +#: forms.py:302 models.py:193 msgid "TAQ" msgstr "TAQ" -#: forms.py:303 models.py:196 +#: forms.py:303 models.py:197 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:305 models.py:199 +#: forms.py:305 models.py:200 msgid "TPQ" msgstr "TPQ" -#: forms.py:306 models.py:203 +#: forms.py:306 models.py:204 msgid "Estimated TPQ" msgstr "TPQ estimé" @@ -242,7 +244,7 @@ msgstr "Vous devez sélectionner un document." msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:35 +#: ishtar_menu.py:35 ishtar_menu.py:55 msgid "Creation" msgstr "Ajout" @@ -258,10 +260,6 @@ msgstr "Suppression" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:55 -msgid "Add" -msgstr "Ajout" - #: models.py:39 msgid "Dating types" msgstr "Types de datation" @@ -314,27 +312,27 @@ msgstr "Type d'identification" msgid "Identification Types" msgstr "Types d'identification" -#: models.py:159 +#: models.py:160 msgid "External ID" msgstr "ID externe" -#: models.py:161 +#: models.py:162 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:169 +#: models.py:170 msgid "Date d'ouverture" msgstr "Date d'ouverture" -#: models.py:179 +#: models.py:180 msgid "A short description of the location of the context record" msgstr "Une courte description de la localisation de l'Unité d'Enregistrement" -#: models.py:182 +#: models.py:183 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:193 +#: models.py:194 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -342,11 +340,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: models.py:197 +#: models.py:198 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: models.py:200 +#: models.py:201 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -354,112 +352,112 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: models.py:204 +#: models.py:205 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: models.py:212 +#: models.py:213 msgid "Point" msgstr "Point" -#: models.py:213 +#: models.py:214 msgid "Polygon" msgstr "Polygone" -#: models.py:214 +#: models.py:215 msgid "Cached name" msgstr "Nom en cache" -#: models.py:218 models.py:219 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:219 models.py:220 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:221 +#: models.py:222 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:223 +#: models.py:224 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:225 +#: models.py:226 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:227 +#: models.py:228 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:229 +#: models.py:230 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:239 +#: models.py:240 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:375 +#: models.py:377 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:379 models.py:403 +#: models.py:381 models.py:405 msgid "Relation type" msgstr "Type de relation" -#: models.py:380 +#: models.py:382 msgid "Relation types" msgstr "Types de relation" -#: models.py:398 +#: models.py:400 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:399 +#: models.py:401 msgid "Unit (left)" msgstr "Unité (gauche)" -#: models.py:400 +#: models.py:402 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:401 +#: models.py:403 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:402 +#: models.py:404 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:404 +#: models.py:406 msgid "Unit (right)" msgstr "Unité (droite)" -#: models.py:405 models.py:406 +#: models.py:407 models.py:408 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:407 +#: models.py:409 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:408 +#: models.py:410 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:417 +#: models.py:419 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:418 +#: models.py:420 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:454 +#: models.py:456 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:455 +#: models.py:457 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" @@ -566,3 +564,6 @@ msgstr "Documents du mobilier associé" #: templates/ishtar/sheet_contextrecordsource.html:4 msgid "Context record source" msgstr "Documentation associée à l'UE" + +#~ msgid "Add" +#~ msgstr "Ajout" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 925f44322..dcefc0c0b 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -7,253 +7,255 @@ # Étienne Loks , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-08-29 11:35-0400\n" "Last-Translator: Étienne Loks \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.5\n" -#: forms.py:52 forms.py:212 forms.py:257 forms.py:404 forms.py:431 +#: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 #: models.py:108 templates/ishtar/sheet_file.html:146 msgid "Year" msgstr "Année" -#: forms.py:53 forms.py:217 forms.py:259 models.py:111 +#: forms.py:48 forms.py:215 forms.py:257 models.py:111 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:55 forms.py:219 +#: forms.py:50 forms.py:217 msgid "Other reference" msgstr "Autre référence" -#: forms.py:57 forms.py:439 +#: forms.py:52 forms.py:431 msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/nombre/domaine public)" -#: forms.py:60 forms.py:415 forms.py:442 models.py:543 +#: forms.py:55 forms.py:407 forms.py:434 models.py:544 msgid "Department" msgstr "Département" -#: forms.py:61 forms.py:451 +#: forms.py:56 forms.py:443 msgid "File name" msgstr "Nom du dossier" -#: forms.py:62 forms.py:158 forms.py:223 models.py:119 +#: forms.py:57 forms.py:154 forms.py:221 models.py:119 msgid "File type" msgstr "Type de dossier" -#: forms.py:63 +#: forms.py:58 msgid "Is active?" msgstr "Est actif ?" -#: forms.py:64 forms.py:160 forms.py:321 +#: forms.py:59 forms.py:156 forms.py:314 msgid "Saisine type" msgstr "Type de saisine" -#: forms.py:65 forms.py:311 models.py:60 models.py:150 +#: forms.py:60 forms.py:304 models.py:60 models.py:150 msgid "Permit type" msgstr "Type de permis" -#: forms.py:67 forms.py:314 models.py:151 +#: forms.py:62 forms.py:307 models.py:151 msgid "Permit reference" msgstr "Référence du permis" -#: forms.py:68 forms.py:229 forms.py:372 models.py:180 +#: forms.py:63 forms.py:227 forms.py:364 models.py:180 #: templates/ishtar/sheet_file.html:99 msgid "Comment" msgstr "Commentaire" -#: forms.py:70 templates/ishtar/sheet_file.html:119 +#: forms.py:65 templates/ishtar/sheet_file.html:119 msgid "In charge" msgstr "Responsable" -#: forms.py:77 forms.py:289 forms.py:453 models.py:126 +#: forms.py:72 forms.py:281 forms.py:445 models.py:126 msgid "General contractor" msgstr "Aménageur" -#: forms.py:84 forms.py:462 +#: forms.py:79 forms.py:453 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: forms.py:91 forms.py:485 +#: forms.py:87 forms.py:476 msgid "Created by" msgstr "Créé par" -#: forms.py:98 forms.py:493 +#: forms.py:94 forms.py:484 msgid "Modified by" msgstr "Modifié par" -#: forms.py:129 +#: forms.py:125 msgid "Archaeological file search" msgstr "Recherche de dossiers archéologiques" -#: forms.py:143 +#: forms.py:139 msgid "You should select a file." msgstr "Vous devez sélectionner un dossier archéologique." -#: forms.py:146 forms.py:221 models.py:159 +#: forms.py:142 forms.py:219 models.py:159 msgid "Creation date" msgstr "Date de création" -#: forms.py:147 forms.py:324 models.py:161 +#: forms.py:143 forms.py:317 models.py:161 msgid "Reception date" msgstr "Date de réception" -#: forms.py:152 +#: forms.py:148 msgid "Slicing" msgstr "Découpage" -#: forms.py:154 +#: forms.py:150 msgid "Department detail" msgstr "Détail par département" -#: forms.py:156 +#: forms.py:152 msgid "Date get from" msgstr "Date utilisée" -#: forms.py:162 +#: forms.py:158 msgid "Date after" msgstr "Date après" -#: forms.py:164 +#: forms.py:160 msgid "Date before" msgstr "Date avant" -#: forms.py:201 templates/ishtar/sheet_file.html:14 +#: forms.py:197 templates/ishtar/sheet_file.html:14 msgid "General" msgstr "Général" -#: forms.py:206 models.py:121 +#: forms.py:202 models.py:121 msgid "Person in charge" msgstr "Responsable" -#: forms.py:220 models.py:118 +#: forms.py:218 models.py:118 msgid "Name" msgstr "Nom" -#: forms.py:225 models.py:163 +#: forms.py:223 models.py:163 msgid "Related file" msgstr "Dossier associé" -#: forms.py:233 models.py:171 +#: forms.py:231 models.py:171 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:236 models.py:177 +#: forms.py:234 models.py:177 msgid "Main address" msgstr "Adresse des terrains" -#: forms.py:237 +#: forms.py:235 msgid "Main address - complement" msgstr "Adresse des terrains - complément" -#: forms.py:250 +#: forms.py:248 #, python-format msgid "
(last recorded: %s)" msgstr "
(dernier enregistrement : %s)" -#: forms.py:272 +#: forms.py:270 msgid "Another file with this numeric id exists." msgstr "Un autre dossier avec cet identifiant numérique existe." -#: forms.py:283 +#: forms.py:275 msgid "Preventive informations" msgstr "Information archéologie préventive" -#: forms.py:301 models.py:138 +#: forms.py:293 models.py:138 msgid "Responsible for town planning service" msgstr "Responsable au service instructeur" -#: forms.py:317 models.py:174 +#: forms.py:310 models.py:174 msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" -#: forms.py:340 templates/ishtar/sheet_file.html:89 +#: forms.py:333 templates/ishtar/sheet_file.html:89 #: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "Archéologie programmée" -#: forms.py:348 models.py:183 templates/ishtar/sheet_file.html:90 +#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:90 msgid "Departments" msgstr "Départements" -#: forms.py:359 models.py:192 +#: forms.py:351 models.py:192 msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:361 models.py:186 templates/ishtar/sheet_file.html:92 +#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:92 msgid "Requested operation type" msgstr "Type d'opération demandée" -#: forms.py:363 +#: forms.py:355 msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: forms.py:379 models.py:196 templates/ishtar/sheet_file.html:97 +#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:97 msgid "Classified area" msgstr "Au sein d'un site classé" -#: forms.py:381 models.py:198 templates/ishtar/sheet_file.html:98 +#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:98 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" -#: forms.py:395 +#: forms.py:387 msgid "Would you like to close this archaeological file?" msgstr "Voulez vous clore ce dossier archéologique ?" -#: forms.py:400 +#: forms.py:392 msgid "Would you like to delete this archaelogical file ?" msgstr "Voulez vous supprimer ce dossier archéologique ?" -#: forms.py:405 forms.py:432 forms.py:556 +#: forms.py:397 forms.py:424 forms.py:547 msgid "Index" msgstr "Index" -#: forms.py:409 forms.py:436 forms.py:542 +#: forms.py:401 forms.py:428 forms.py:533 msgid "Act type" msgstr "Type d'acte" -#: forms.py:410 +#: forms.py:402 msgid "Object (full text search)" msgstr "Objet (recherche texte intégral)" -#: forms.py:437 +#: forms.py:429 msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:443 +#: forms.py:435 msgid "Object" msgstr "Objet" -#: forms.py:447 +#: forms.py:439 msgid "Signature date after" msgstr "Date de signature après" -#: forms.py:449 +#: forms.py:441 msgid "Signature date before" msgstr "Date de signature avant" -#: forms.py:470 +#: forms.py:461 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: forms.py:471 +#: forms.py:462 msgid "File year" msgstr "Dossier : année" -#: forms.py:473 +#: forms.py:464 msgid "File other reference" msgstr "Dossier : autre référence" -#: forms.py:475 +#: forms.py:466 msgid "File in charge" msgstr "Dossier : responsable" -#: forms.py:483 +#: forms.py:474 msgid "File permit reference" msgstr "Dossier : réf. du permis" @@ -265,7 +267,7 @@ msgstr "Dossier" msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:41 +#: ishtar_menu.py:41 ishtar_menu.py:64 msgid "Creation" msgstr "Ajout" @@ -285,10 +287,6 @@ msgstr "Suppression" msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:64 -msgid "Add" -msgstr "Ajout" - #: ishtar_menu.py:76 msgid "Documents" msgstr "Documents" @@ -426,7 +424,7 @@ msgstr "Intercommunal" msgid "No town" msgstr "Pas de commune" -#: models.py:542 +#: models.py:543 msgid "File" msgstr "Dossier" @@ -677,3 +675,6 @@ msgstr "communes principales en nombre" #: templates/ishtar/dashboards/dashboard_file.html:220 msgid "main towns by surface (ha)" msgstr "communes principales en surface (ha)" + +#~ msgid "Add" +#~ msgstr "Ajout" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 34955a35a..7fb2c2643 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -6,127 +6,133 @@ # Valérie-Emma Leroux , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-02-23 08:09-0500\n" "Last-Translator: Valérie-Emma Leroux \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.5\n" -#: forms.py:41 +#: forms.py:38 msgid "General" msgstr "Général" -#: forms.py:43 +#: forms.py:40 msgid "File type" msgstr "Type de dossier" -#: forms.py:44 forms.py:403 +#: forms.py:41 forms.py:415 msgid "Year" msgstr "Année" -#: forms.py:48 +#: forms.py:45 msgid "Creation date" msgstr "Date de création" -#: forms.py:51 +#: forms.py:48 msgid "Reception date" msgstr "Date de réception" -#: forms.py:63 +#: forms.py:60 msgid "Reception date cannot be after today." msgstr "La date de réception ne peut pas être dans le futur." -#: forms.py:71 +#: forms.py:68 msgid "Permit type" msgstr "Type de permis" -#: forms.py:73 +#: forms.py:70 msgid "Saisine type" msgstr "Type de saisine" -#: forms.py:87 +#: forms.py:84 msgid "Planning" msgstr "Aménagement" -#: forms.py:90 +#: forms.py:87 msgid "Planning name" msgstr "Nom de l'aménagement" -#: forms.py:93 forms.py:123 +#: forms.py:90 forms.py:122 #: templates/ishtar/wizard/wizard_preventiveplanning.html:31 msgid "Towns" msgstr "Communes" -#: forms.py:95 forms.py:125 +#: forms.py:92 forms.py:124 #: templates/ishtar/wizard/wizard_preventiveplanning.html:41 msgid "Departments" msgstr "Départements" -#: forms.py:96 forms.py:126 +#: forms.py:93 forms.py:125 msgid "Locality" msgstr "Lieu-dit" -#: forms.py:99 forms.py:129 +#: forms.py:96 forms.py:128 msgid "Address (number/street)" msgstr "Adresse (n° / voie)" -#: forms.py:100 forms.py:130 +#: forms.py:97 forms.py:129 msgid "Number/street" msgstr "N° / voie" -#: forms.py:102 forms.py:132 +#: forms.py:99 forms.py:131 msgid "Postal code" msgstr "Code postal" -#: forms.py:107 +#: forms.py:104 msgid "Total surface (m2)" msgstr "Surface totale des terrains (m2)" -#: forms.py:112 +#: forms.py:109 msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" -#: forms.py:119 +#: forms.py:116 msgid "Address" msgstr "Adresse" -#: forms.py:233 forms.py:237 forms.py:267 forms.py:270 +#: forms.py:119 +msgid "Project name" +msgstr "" + +#: forms.py:232 forms.py:236 forms.py:273 forms.py:276 msgid "General contractor" msgstr "Aménageur" -#: forms.py:252 forms.py:364 +#: forms.py:254 forms.py:372 msgid "In charge" msgstr "Responsable" -#: forms.py:342 +#: forms.py:348 msgid "Town planning service" msgstr "Service instructeur" -#: forms.py:346 +#: forms.py:352 msgid "File reference" msgstr "Référence du dossier" -#: forms.py:349 +#: forms.py:355 msgid "Planning service" msgstr "Service instructeur" -#: forms.py:383 +#: forms.py:395 msgid "Person in charge" msgstr "Dossier suivi par" -#: forms.py:395 +#: forms.py:407 msgid "Related file" msgstr "Dossier lié à" -#: forms.py:399 +#: forms.py:411 msgid "Comment" msgstr "Commentaires" -#: forms.py:406 +#: forms.py:418 msgid "Numeric reference" msgstr "Référence numérique" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 40d36c10b..20fdfd694 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -7,13 +7,15 @@ # Étienne Loks , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-09-15 10:20-0400\n" "Last-Translator: Étienne Loks \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.5\n" @@ -21,21 +23,21 @@ msgstr "" msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:83 ishtar_menu.py:31 models.py:439 models.py:750 models.py:850 -#: models.py:1000 templates/ishtar/sheet_find.html:5 +#: forms.py:83 ishtar_menu.py:31 models.py:440 models.py:754 models.py:854 +#: models.py:1004 templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:94 forms.py:218 forms.py:425 models.py:127 models.py:376 +#: forms.py:94 forms.py:218 forms.py:425 models.py:127 models.py:377 msgid "Free ID" msgstr "ID libre" -#: forms.py:96 models.py:425 +#: forms.py:96 models.py:426 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:97 forms.py:250 forms.py:591 models.py:131 models.py:377 -#: models.py:784 +#: forms.py:97 forms.py:250 forms.py:591 models.py:131 models.py:378 +#: models.py:788 msgid "Description" msgstr "Description" @@ -43,7 +45,7 @@ msgstr "Description" msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:102 models.py:405 +#: forms.py:102 models.py:406 msgid "Is complete?" msgstr "Est complet ?" @@ -51,15 +53,15 @@ msgstr "Est complet ?" msgid "Material type" msgstr "Type de matériau" -#: forms.py:106 forms.py:244 models.py:62 models.py:381 +#: forms.py:106 forms.py:244 models.py:62 models.py:382 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:109 models.py:383 +#: forms.py:109 models.py:384 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:112 models.py:102 models.py:408 +#: forms.py:112 models.py:102 models.py:409 msgid "Object types" msgstr "Types d'objet" @@ -67,67 +69,67 @@ msgstr "Types d'objet" msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:117 forms.py:246 models.py:410 +#: forms.py:117 forms.py:246 models.py:411 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:120 forms.py:248 models.py:413 +#: forms.py:120 forms.py:248 models.py:414 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:122 models.py:415 +#: forms.py:122 models.py:416 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:123 models.py:416 +#: forms.py:123 models.py:417 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:124 models.py:417 +#: forms.py:124 models.py:418 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:125 models.py:418 +#: forms.py:125 models.py:419 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:126 forms.py:430 models.py:388 +#: forms.py:126 forms.py:430 models.py:389 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:127 forms.py:431 models.py:389 +#: forms.py:127 forms.py:431 models.py:390 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:129 models.py:419 +#: forms.py:129 models.py:420 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:130 forms.py:432 models.py:392 +#: forms.py:130 forms.py:432 models.py:393 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:131 models.py:421 +#: forms.py:131 models.py:422 msgid "Mark" msgstr "Marque" -#: forms.py:132 forms.py:254 models.py:427 +#: forms.py:132 forms.py:254 models.py:428 msgid "Check" msgstr "Vérification" -#: forms.py:134 models.py:429 +#: forms.py:134 models.py:430 msgid "Check date" msgstr "Date de vérification" -#: forms.py:135 models.py:132 models.py:422 models.py:785 +#: forms.py:135 models.py:132 models.py:423 models.py:789 msgid "Comment" msgstr "Commentaires" -#: forms.py:138 models.py:423 +#: forms.py:138 models.py:424 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:139 models.py:431 +#: forms.py:139 models.py:432 msgid "Estimated value" msgstr "Valeur estimée" @@ -144,7 +146,7 @@ msgstr "" "

Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms.py:181 forms.py:212 models.py:400 +#: forms.py:181 forms.py:212 models.py:401 msgid "Dating" msgstr "Datation" @@ -152,12 +154,12 @@ msgstr "Datation" msgid "Period" msgstr "Période" -#: forms.py:187 forms.py:593 models.py:798 models.py:863 models.py:1005 +#: forms.py:187 forms.py:593 models.py:802 models.py:867 models.py:1009 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:121 msgid "Start date" msgstr "Date de début" -#: forms.py:189 forms.py:595 models.py:799 models.py:864 models.py:1006 +#: forms.py:189 forms.py:595 models.py:803 models.py:868 models.py:1010 #: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:122 msgid "End date" msgstr "Date de fin" @@ -218,7 +220,7 @@ msgstr "Recherche de mobilier" msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:326 models.py:440 +#: forms.py:326 models.py:441 msgid "Finds" msgstr "Mobilier" @@ -294,16 +296,16 @@ msgstr "Panier" msgid "Base treatment" msgstr "Traitement de base" -#: forms.py:578 models.py:772 models.py:787 models.py:862 +#: forms.py:578 models.py:776 models.py:791 models.py:866 msgid "Treatment type" msgstr "Type de traitement" -#: forms.py:580 models.py:796 models.py:867 +#: forms.py:580 models.py:800 models.py:871 #: templates/ishtar/sheet_find.html:90 templates/ishtar/sheet_find.html:119 msgid "Doer" msgstr "Opérateur" -#: forms.py:586 models.py:789 models.py:865 +#: forms.py:586 models.py:793 models.py:869 msgid "Location" msgstr "Lieu" @@ -355,7 +357,7 @@ msgstr "Recommandation" msgid "Parent material" msgstr "Matériau parent" -#: models.py:51 models.py:379 +#: models.py:51 models.py:380 msgid "Material types" msgstr "Types de matériau" @@ -403,11 +405,11 @@ msgstr "Objet" msgid "Batch" msgstr "Lot" -#: models.py:128 models.py:372 models.py:780 +#: models.py:128 models.py:373 models.py:784 msgid "External ID" msgstr "ID externe" -#: models.py:130 models.py:374 +#: models.py:130 models.py:375 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" @@ -447,7 +449,7 @@ msgstr "Polygon" msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models.py:159 models.py:370 +#: models.py:159 models.py:371 msgid "Base find" msgstr "Mobilier de base" @@ -475,215 +477,215 @@ msgstr "Peut modifier son propre Mobilier de base" msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models.py:275 +#: models.py:276 msgid "g" msgstr "g" -#: models.py:276 +#: models.py:277 msgid "kg" msgstr "kg" -#: models.py:278 +#: models.py:279 msgid "Not checked" msgstr "Non vérifié" -#: models.py:279 +#: models.py:280 msgid "Checked but incorrect" msgstr "Vérifié mais incorrect" -#: models.py:280 +#: models.py:281 msgid "Checked and correct" msgstr "Vérifié et correct" -#: models.py:320 +#: models.py:321 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models.py:321 +#: models.py:322 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models.py:322 +#: models.py:323 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models.py:323 +#: models.py:324 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models.py:324 +#: models.py:325 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models.py:326 +#: models.py:327 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models.py:327 +#: models.py:328 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models.py:375 models.py:856 +#: models.py:376 models.py:860 msgid "Order" msgstr "Ordre" -#: models.py:386 +#: models.py:387 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models.py:390 +#: models.py:391 msgid "Weight unit" msgstr "Unité de poids" -#: models.py:396 templates/ishtar/sheet_find.html:83 +#: models.py:397 templates/ishtar/sheet_find.html:83 msgid "Upstream treatment" msgstr "Traitement amont" -#: models.py:399 templates/ishtar/sheet_find.html:112 +#: models.py:400 templates/ishtar/sheet_find.html:112 msgid "Downstream treatment" msgstr "Traitement aval" -#: models.py:403 models.py:782 models.py:866 +#: models.py:404 models.py:786 models.py:870 #: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:120 msgid "Container" msgstr "Contenant" -#: models.py:433 +#: models.py:434 msgid "Cached name" msgstr "Nom en cache" -#: models.py:442 +#: models.py:443 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models.py:443 +#: models.py:444 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models.py:444 +#: models.py:445 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models.py:445 +#: models.py:446 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models.py:446 +#: models.py:447 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models.py:452 +#: models.py:453 msgid "FIND" msgstr "MOBILIER" -#: models.py:748 +#: models.py:752 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models.py:749 +#: models.py:753 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models.py:759 +#: models.py:763 msgid "Virtual" msgstr "Virtuel" -#: models.py:761 +#: models.py:765 msgid "Upstream is many" msgstr "Les éléments amonts sont multiple" -#: models.py:763 +#: models.py:767 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" "Cochez cela si pour ce traitement depuis plusieurs éléments vous en obtenez " "un." -#: models.py:766 +#: models.py:770 msgid "Downstream is many" msgstr "Les éléments avals sont multiple" -#: models.py:768 +#: models.py:772 msgid "Check this if for this treatment from one find you'll get many." msgstr "" "Cochez cela si pour ce traitement depuis un élément vous en obtenez " "plusieurs." -#: models.py:773 +#: models.py:777 msgid "Treatment types" msgstr "Types de traitement" -#: models.py:791 +#: models.py:795 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" "Endroit où le traitement est réalisé. Renseignez le dépôt de destination " "pour un déplacement." -#: models.py:793 +#: models.py:797 msgid "Other location" msgstr "Autre lieu" -#: models.py:803 models.py:852 models.py:992 +#: models.py:807 models.py:856 models.py:996 msgid "Treatment" msgstr "Traitement" -#: models.py:804 templates/ishtar/sheet_find.html:80 +#: models.py:808 templates/ishtar/sheet_find.html:80 msgid "Treatments" msgstr "Traitements" -#: models.py:806 +#: models.py:810 msgid "Can view all Treatments" msgstr "Peut voir tous les Traitements" -#: models.py:807 +#: models.py:811 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: models.py:808 +#: models.py:812 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: models.py:809 +#: models.py:813 msgid "Can change own Treatment" msgstr "Peut modifier son propre Traitement" -#: models.py:810 +#: models.py:814 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre Traitement" -#: models.py:816 +#: models.py:820 msgid "by" msgstr "par" -#: models.py:868 models.py:869 templates/ishtar/sheet_find.html:89 +#: models.py:872 models.py:873 templates/ishtar/sheet_find.html:89 #: templates/ishtar/sheet_find.html:118 msgid "Related finds" msgstr "Mobilier associé" -#: models.py:978 +#: models.py:982 msgid "Is upstream" msgstr "Est amont" -#: models.py:989 +#: models.py:993 msgid "Treatment documentation" msgstr "Documentation d'un traitement" -#: models.py:990 +#: models.py:994 msgid "Treament documentations" msgstr "Documentations des traitements" -#: models.py:1002 +#: models.py:1006 msgid "Administrative act" msgstr "Acte administratif" -#: models.py:1003 +#: models.py:1007 msgid "Person" msgstr "Individu" -#: models.py:1009 +#: models.py:1013 msgid "Property" msgstr "Propriété" -#: models.py:1010 +#: models.py:1014 msgid "Properties" msgstr "Propriétés" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index d8c54d684..a2f639881 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -7,23 +7,25 @@ # Étienne Loks , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-10-17 01:17-0400\n" "Last-Translator: Étienne Loks \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.5\n" -#: forms.py:67 forms.py:369 forms.py:1004 forms.py:1026 forms.py:1030 +#: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035 #: models.py:1168 templates/ishtar/sheet_operation.html:144 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" -#: forms.py:70 forms.py:203 forms.py:980 models.py:1154 +#: forms.py:72 forms.py:205 forms.py:985 models.py:1154 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -32,96 +34,96 @@ msgstr "Parcelles" msgid "Town" msgstr "Commune" -#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:249 +#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:249 #: models.py:971 models.py:1152 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" -#: forms.py:75 models.py:1155 +#: forms.py:77 models.py:1155 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" -#: forms.py:78 models.py:1157 +#: forms.py:80 models.py:1157 msgid "Parcel number" msgstr "Numéro de parcelle" -#: forms.py:80 models.py:1159 models.py:1176 models.py:1225 +#: forms.py:82 models.py:1159 models.py:1176 models.py:1225 msgid "Public domain" msgstr "Domaine public" -#: forms.py:124 +#: forms.py:126 msgid "Town section is required." msgstr "Vous devez renseigner le secteur." -#: forms.py:160 +#: forms.py:162 msgid "public domain" msgstr "domaine public" -#: forms.py:167 +#: forms.py:169 msgid "Current parcels" msgstr "Parcelles actuelles" -#: forms.py:169 +#: forms.py:171 msgid "Deleted parcels" msgstr "Parcelles supprimées" -#: forms.py:206 +#: forms.py:208 msgid "Full text input" msgstr "Saisie libre" -#: forms.py:208 +#: forms.py:210 msgid "example: \"2013: XD:1 to 13,24,33 to 39, YD:24\" or \"AB:24,AC:42\"" msgstr "exemple : \"2013: XD:1 à 13,24,33 à 39, YD:24\" ou \"AB:24,AC:42\"" -#: forms.py:363 +#: forms.py:365 msgid "There are identical parcels." msgstr "Il y a des parcelles identiques." -#: forms.py:378 +#: forms.py:380 msgid "Relation type" msgstr "Type de relation" -#: forms.py:381 ishtar_menu.py:30 models.py:344 models.py:804 models.py:834 +#: forms.py:383 ishtar_menu.py:30 models.py:344 models.py:804 models.py:834 #: models.py:862 models.py:963 models.py:1151 wizards.py:339 wizards.py:350 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" -#: forms.py:401 +#: forms.py:403 msgid ":" msgstr ": " -#: forms.py:409 forms.py:608 forms.py:1215 +#: forms.py:411 forms.py:605 forms.py:1220 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: forms.py:413 +#: forms.py:415 msgid "You should select a relation type." msgstr "Vous devez sélectionner un type de relation." -#: forms.py:443 +#: forms.py:445 msgid "Current relations" msgstr "Relations actuelles" -#: forms.py:445 +#: forms.py:447 msgid "Deleted relations" msgstr "Relations supprimées" -#: forms.py:449 templates/ishtar/sheet_operation.html:83 +#: forms.py:451 templates/ishtar/sheet_operation.html:83 msgid "Relations" msgstr "Relations" -#: forms.py:460 forms.py:1221 models.py:250 +#: forms.py:456 forms.py:1226 models.py:250 msgid "Numeric reference" msgstr "Identifiant numérique" -#: forms.py:466 forms.py:1261 +#: forms.py:462 forms.py:1266 msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/nombre/domaine public)" -#: forms.py:469 forms.py:1264 models.py:805 +#: forms.py:465 forms.py:1269 models.py:805 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -130,211 +132,211 @@ msgstr "Parcelle (section/nombre/domaine public)" msgid "Department" msgstr "Département" -#: forms.py:470 forms.py:1092 models.py:85 +#: forms.py:466 forms.py:1097 models.py:85 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "Nom" -#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:257 +#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:257 msgid "Operation type" msgstr "Type d'opération" -#: forms.py:474 +#: forms.py:470 msgid "Is open?" msgstr "Est ouvert ?" -#: forms.py:483 forms.py:782 models.py:246 +#: forms.py:478 forms.py:782 models.py:246 msgid "In charge" msgstr "Responsable" -#: forms.py:490 models.py:957 +#: forms.py:485 models.py:957 msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:492 forms.py:677 forms.py:773 models.py:244 +#: forms.py:487 forms.py:674 forms.py:772 models.py:244 msgid "Operator" msgstr "Opérateur" -#: forms.py:499 forms.py:1097 models.py:89 models.py:259 +#: forms.py:496 forms.py:1102 models.py:89 models.py:259 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "Vestiges" -#: forms.py:500 forms.py:1075 forms.py:1094 models.py:87 models.py:265 +#: forms.py:497 forms.py:1080 forms.py:1099 models.py:87 models.py:265 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "Périodes" -#: forms.py:501 +#: forms.py:498 msgid "Started before" msgstr "Commencé avant" -#: forms.py:503 +#: forms.py:500 msgid "Started after" msgstr "Commencé après" -#: forms.py:505 +#: forms.py:502 msgid "Ended before" msgstr "Terminé avant" -#: forms.py:507 +#: forms.py:504 msgid "Ended after" msgstr "Terminé après" -#: forms.py:510 +#: forms.py:507 msgid "Search within relations" msgstr "Recherche parmi les relations" -#: forms.py:512 forms.py:832 +#: forms.py:509 forms.py:837 msgid "Comment" msgstr "Commentaire" -#: forms.py:513 +#: forms.py:510 msgid "Abstract (full text search)" msgstr "Résumé (recherche texte intégral)" -#: forms.py:515 forms.py:835 models.py:313 +#: forms.py:512 forms.py:840 models.py:313 msgid "Comment about scientific documentation" msgstr "Commentaire concernant la documentation scientifique" -#: forms.py:516 forms.py:837 models.py:325 +#: forms.py:513 forms.py:842 models.py:325 msgid "Record quality" msgstr "Qualité d'enregistrement" -#: forms.py:517 forms.py:805 models.py:277 +#: forms.py:514 forms.py:807 models.py:277 msgid "Report processing" msgstr "Traitement du rapport" -#: forms.py:519 forms.py:840 models.py:320 +#: forms.py:516 forms.py:845 models.py:320 msgid "Virtual operation" msgstr "Opération virtuelle" -#: forms.py:521 forms.py:1141 +#: forms.py:518 forms.py:1146 msgid "Archaelogical site" msgstr "Entité Archéologique" -#: forms.py:527 forms.py:1268 +#: forms.py:524 forms.py:1273 msgid "Created by" msgstr "Créé par" -#: forms.py:533 forms.py:1274 +#: forms.py:530 forms.py:1279 msgid "Modified by" msgstr "Modifié par" -#: forms.py:540 +#: forms.py:537 msgid "Documentation deadline before" msgstr "Date limite de rendu de la documentation avant" -#: forms.py:542 +#: forms.py:539 msgid "Documentation deadline after" msgstr "Date limite de rendu de la documentation après" -#: forms.py:544 forms.py:825 models.py:332 +#: forms.py:541 forms.py:830 models.py:332 msgid "Documentation received" msgstr "Documentation reçue" -#: forms.py:546 +#: forms.py:543 msgid "Finds deadline before" msgstr "Date limite de rendu du mobilier avant" -#: forms.py:548 +#: forms.py:545 msgid "Finds deadline after" msgstr "Date limite de rendu du mobilier après" -#: forms.py:550 forms.py:830 models.py:336 +#: forms.py:547 forms.py:835 models.py:336 msgid "Finds received" msgstr "Mobilier reçu" -#: forms.py:595 forms.py:1213 views.py:168 +#: forms.py:592 forms.py:1218 views.py:168 msgid "Operation search" msgstr "Recherche d'opérations" -#: forms.py:639 +#: forms.py:636 msgid "Associated file" msgstr "Dossier associé" -#: forms.py:643 forms.py:928 models.py:968 wizards.py:76 +#: forms.py:640 forms.py:933 models.py:968 wizards.py:76 msgid "Archaelogical file" msgstr "Dossier" -#: forms.py:650 forms.py:652 models.py:327 +#: forms.py:647 forms.py:649 models.py:327 msgid "Abstract" msgstr "Résumé" -#: forms.py:655 +#: forms.py:652 msgid "months" msgstr "mois" -#: forms.py:655 +#: forms.py:652 msgid "years" msgstr "années" -#: forms.py:657 models.py:230 +#: forms.py:654 models.py:230 msgid "Creation date" msgstr "Date de création" -#: forms.py:658 +#: forms.py:655 msgid "Start of field work" msgstr "Début du travail de terrain" -#: forms.py:660 +#: forms.py:657 msgid "All" msgstr "Tout" -#: forms.py:661 +#: forms.py:658 msgid "Preventive" msgstr "Préventif" -#: forms.py:662 +#: forms.py:659 msgid "Research" msgstr "Programmé" -#: forms.py:666 +#: forms.py:663 msgid "Slicing" msgstr "Découpage" -#: forms.py:669 +#: forms.py:666 msgid "Department detail" msgstr "Détail par département" -#: forms.py:671 +#: forms.py:668 msgid "Date get from" msgstr "Date obtenue depuis" -#: forms.py:673 +#: forms.py:670 msgid "Preventive/Research" msgstr "Préventif/Programmé" -#: forms.py:679 +#: forms.py:676 msgid "Date after" msgstr "Date après" -#: forms.py:681 +#: forms.py:678 msgid "Date before" msgstr "Date avant" -#: forms.py:683 +#: forms.py:680 msgid "With reports" msgstr "Avec un rapport" -#: forms.py:684 +#: forms.py:681 msgid "With finds" msgstr "Avec du mobilier" -#: forms.py:736 forms.py:1322 templates/ishtar/sheet_administrativeact.html:13 +#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:13 #: templates/ishtar/sheet_operation.html:24 msgid "General" msgstr "Général" -#: forms.py:751 models.py:310 +#: forms.py:748 models.py:310 msgid "Generic name" msgstr "Nom générique" -#: forms.py:760 models.py:279 +#: forms.py:757 models.py:279 msgid "Old code" msgstr "Ancien code" -#: forms.py:763 +#: forms.py:760 msgid "Head scientist" msgstr "Responsable scientifique" @@ -342,35 +344,35 @@ msgstr "Responsable scientifique" msgid "Operator reference" msgstr "Référence de l'opérateur" -#: forms.py:791 +#: forms.py:793 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:798 models.py:53 models.py:233 models.py:1341 +#: forms.py:800 models.py:53 models.py:233 models.py:1341 msgid "Start date" msgstr "Date de début" -#: forms.py:800 models.py:235 +#: forms.py:802 models.py:235 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: forms.py:803 models.py:236 +#: forms.py:805 models.py:236 msgid "Report delivery date" msgstr "Date de livraison du rapport" -#: forms.py:822 models.py:329 +#: forms.py:827 models.py:329 msgid "Deadline for submission of the documentation" msgstr "Date limite de rendu de la documentation" -#: forms.py:827 models.py:334 +#: forms.py:832 models.py:334 msgid "Deadline for submission of the finds" msgstr "Date limite de rendu du mobilier" -#: forms.py:842 +#: forms.py:847 msgid "Image" msgstr "Image" -#: forms.py:843 +#: forms.py:848 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms.py:881 +#: forms.py:886 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:886 +#: forms.py:891 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:914 +#: forms.py:919 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -400,110 +401,110 @@ 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:918 +#: forms.py:923 msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: forms.py:924 models.py:486 +#: forms.py:929 models.py:486 msgid "Operation code" msgstr "Code de l'opération" -#: forms.py:950 +#: forms.py:955 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: forms.py:951 models.py:263 +#: forms.py:956 models.py:263 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "Coût (euros)" -#: forms.py:952 models.py:268 +#: forms.py:957 models.py:268 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: forms.py:954 models.py:271 +#: forms.py:959 models.py:271 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: forms.py:956 models.py:274 +#: forms.py:961 models.py:274 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: forms.py:966 +#: forms.py:971 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: forms.py:969 models.py:293 +#: forms.py:974 models.py:293 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: forms.py:971 models.py:296 +#: forms.py:976 models.py:296 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: forms.py:974 models.py:298 +#: forms.py:979 models.py:298 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:978 forms.py:1000 models.py:261 models.py:981 +#: forms.py:983 forms.py:1005 models.py:261 models.py:981 msgid "Towns" msgstr "Communes" -#: forms.py:1007 models.py:1167 models.py:1339 +#: forms.py:1012 models.py:1167 models.py:1339 msgid "Parcel" msgstr "Parcelle" -#: forms.py:1059 models.py:45 +#: forms.py:1064 models.py:45 msgid "Remain types" msgstr "Types de vestige" -#: forms.py:1063 models.py:44 +#: forms.py:1068 models.py:44 msgid "Remain type" msgstr "Type de vestige" -#: forms.py:1079 templates/ishtar/sheet_operation.html:164 +#: forms.py:1084 templates/ishtar/sheet_operation.html:164 #: templates/ishtar/sheet_operation.html:195 msgid "Period" msgstr "Période" -#: forms.py:1091 models.py:84 +#: forms.py:1096 models.py:84 msgid "Reference" msgstr "Référence" -#: forms.py:1120 +#: forms.py:1125 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: forms.py:1137 models.py:93 +#: forms.py:1142 models.py:93 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:1152 models.py:94 models.py:317 +#: forms.py:1157 models.py:94 models.py:317 #: templates/ishtar/sheet_operation.html:94 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: forms.py:1156 +#: forms.py:1161 msgid "Associated archaelogical sites" msgstr "Entités archéologiques associées" -#: forms.py:1162 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 +#: forms.py:1167 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 msgid "Search" msgstr "Recherche" -#: forms.py:1167 +#: forms.py:1172 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: forms.py:1172 +#: forms.py:1177 msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:836 models.py:948 +#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:836 models.py:948 msgid "Index" msgstr "Index" -#: forms.py:1207 +#: forms.py:1212 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " @@ -512,48 +513,48 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:1219 +#: forms.py:1224 msgid "Operation's year" msgstr "Année de l'opération" -#: forms.py:1226 +#: forms.py:1231 msgid "Operation's town" msgstr "Commune de l'opération" -#: forms.py:1239 +#: forms.py:1244 msgid "Documentation search" msgstr "Recherche de document" -#: forms.py:1241 +#: forms.py:1246 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:1258 forms.py:1325 models.py:873 models.py:942 +#: forms.py:1263 forms.py:1330 models.py:873 models.py:942 msgid "Act type" msgstr "Type d'acte" -#: forms.py:1259 forms.py:1457 +#: forms.py:1264 forms.py:1462 msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:1265 forms.py:1330 models.py:972 +#: forms.py:1270 forms.py:1335 models.py:972 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: forms.py:1302 views.py:324 +#: forms.py:1307 views.py:324 msgid "Administrative act search" msgstr "Recherche d'actes administratifs" -#: forms.py:1317 forms.py:1415 forms.py:1482 +#: forms.py:1322 forms.py:1420 forms.py:1487 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1333 models.py:969 +#: forms.py:1338 models.py:969 msgid "Signature date" msgstr "Date de signature" -#: forms.py:1375 +#: forms.py:1380 #, python-format msgid "" "This index already exist for year: %(year)d - use a value bigger than " @@ -562,36 +563,36 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: forms.py:1379 +#: forms.py:1384 msgid "Bad index" msgstr "Mauvais index" -#: forms.py:1392 +#: forms.py:1397 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: forms.py:1397 +#: forms.py:1402 msgid "Template" msgstr "Patron" -#: forms.py:1421 forms.py:1425 +#: forms.py:1426 forms.py:1430 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: forms.py:1443 +#: forms.py:1448 msgid "Doc generation" msgstr "Génération de document" -#: forms.py:1445 +#: forms.py:1450 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: forms.py:1466 ishtar_menu.py:121 views.py:377 +#: forms.py:1471 ishtar_menu.py:121 views.py:377 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: ishtar_menu.py:38 +#: ishtar_menu.py:38 ishtar_menu.py:69 ishtar_menu.py:97 msgid "Creation" msgstr "Ajout" @@ -612,10 +613,6 @@ msgstr "Suppression" msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:69 ishtar_menu.py:97 widgets.py:55 -msgid "Add" -msgstr "Ajout" - #: ishtar_menu.py:84 msgid "Documents" msgstr "Documents" @@ -1053,6 +1050,10 @@ msgstr "Opération : modification d'un acte administratif" msgid "Operation: administrative act deletion" msgstr "Opération : suppression d'un acte administratif" +#: widgets.py:55 +msgid "Add" +msgstr "Ajout" + #: wizards.py:199 msgid "" "Warning: No Archaelogical File is provided. If you have forget it return to " diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 5da94edbb..7f00b83eb 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-02-24 10:52-0500\n" "Last-Translator: Valérie-Emma Leroux \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.5\n" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 9e6d05458..bb3723b32 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -7,13 +7,15 @@ # Étienne Loks , 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: 2016-11-09 22:11+0100\n" "PO-Revision-Date: 2016-10-22 06:30-0400\n" "Last-Translator: Étienne Loks \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.5\n" @@ -141,40 +143,40 @@ msgstr "résultat" msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" -#: forms.py:55 +#: forms.py:72 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: forms.py:71 forms_common.py:618 +#: forms.py:88 forms_common.py:618 msgid "Confirm" msgstr "Confirmer" -#: forms.py:76 +#: forms.py:93 msgid "Are you sure you want to delete?" msgstr "Êtes-vous sûr de vouloir supprimer ?" -#: forms.py:85 +#: forms.py:102 msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: forms.py:123 forms.py:124 +#: forms.py:140 forms.py:141 msgid "Closing date" msgstr "Date de clôture" -#: forms.py:137 +#: forms.py:154 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." -#: forms.py:138 +#: forms.py:155 msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:245 models.py:1310 +#: forms.py:262 models.py:1355 msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1376 models.py:2758 +#: forms_common.py:406 models.py:1421 models.py:2810 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -198,8 +200,8 @@ msgstr "" "

Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.

" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1546 -#: models.py:2384 models.py:2566 models.py:2628 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1594 +#: models.py:2436 models.py:2618 models.py:2680 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -213,63 +215,63 @@ msgstr "" "pas possible." #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1547 models.py:2273 +#: ishtar_menu.py:75 models.py:1595 models.py:2322 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:977 models.py:1309 -#: models.py:1592 models.py:1810 models.py:2267 models.py:2370 models.py:2744 +#: forms_common.py:376 forms_common.py:446 models.py:1022 models.py:1354 +#: models.py:1640 models.py:1859 models.py:2316 models.py:2422 models.py:2796 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:174 models.py:1531 models.py:1941 +#: forms_common.py:174 models.py:1576 models.py:1990 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:176 forms_common.py:400 models.py:1371 +#: forms_common.py:176 forms_common.py:400 models.py:1416 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:178 forms_common.py:403 models.py:1372 +#: forms_common.py:178 forms_common.py:403 models.py:1417 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:180 forms_common.py:404 models.py:1374 +#: forms_common.py:180 forms_common.py:404 models.py:1419 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:183 forms_common.py:407 models.py:1377 +#: forms_common.py:183 forms_common.py:407 models.py:1422 msgid "Country" msgstr "Pays" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1404 +#: forms_common.py:448 forms_common.py:572 models.py:1449 msgid "Email" msgstr "Courriel" -#: forms_common.py:186 forms_common.py:383 models.py:1389 +#: forms_common.py:186 forms_common.py:383 models.py:1434 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:187 forms_common.py:392 models.py:1401 +#: forms_common.py:187 forms_common.py:392 models.py:1446 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:1969 -#: models.py:2269 models.py:2679 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2018 +#: models.py:2318 models.py:2731 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -277,12 +279,13 @@ msgstr "Téléphone portable" msgid "Type" msgstr "Type" -#: forms_common.py:220 views.py:139 +#: forms_common.py:220 views.py:142 msgid "Organization search" msgstr "Recherche d'organisations" #: forms_common.py:244 -msgid "At leat two items have to be selected." +#, fuzzy +msgid "At least two items have to be selected." msgstr "AU moins deux éléments doivent être sélectionnés." #: forms_common.py:262 @@ -293,12 +296,12 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2368 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2420 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" -#: forms_common.py:339 forms_common.py:434 views.py:104 +#: forms_common.py:339 forms_common.py:434 views.py:107 msgid "Person search" msgstr "Recherche de personnes" @@ -311,25 +314,25 @@ msgstr "Personne à fusionner" msgid "Identity" msgstr "Identité" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1942 -#: models.py:2362 models.py:2364 models.py:2676 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:1991 +#: models.py:2414 models.py:2416 models.py:2728 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:372 models.py:2366 +#: forms_common.py:372 models.py:2418 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:378 models.py:2372 +#: forms_common.py:378 models.py:2424 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:381 models.py:1390 +#: forms_common.py:381 models.py:1435 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:384 models.py:1392 models.py:1394 +#: forms_common.py:384 models.py:1437 models.py:1439 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -337,11 +340,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:388 models.py:1398 +#: forms_common.py:388 models.py:1443 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:390 models.py:1396 +#: forms_common.py:390 models.py:1441 msgid "Phone 3" msgstr "Téléphone 3" @@ -349,23 +352,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:409 models.py:1379 +#: forms_common.py:409 models.py:1424 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:412 models.py:1382 +#: forms_common.py:412 models.py:1427 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:414 models.py:1383 +#: forms_common.py:414 models.py:1428 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:416 models.py:1385 +#: forms_common.py:416 models.py:1430 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:418 models.py:1387 +#: forms_common.py:418 models.py:1432 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -381,7 +384,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Recherche de comptes" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2321 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2370 msgid "Person type" msgstr "Type de personne" @@ -389,7 +392,7 @@ msgstr "Type de personne" msgid "Account" msgstr "Compte" -#: forms_common.py:575 wizards.py:1192 +#: forms_common.py:575 wizards.py:1194 msgid "New password" msgstr "Nouveau mot de passe" @@ -413,7 +416,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:628 forms_common.py:641 models.py:2759 +#: forms_common.py:628 forms_common.py:641 models.py:2811 msgid "Towns" msgstr "Communes" @@ -429,7 +432,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:775 forms_common.py:823 models.py:1943 models.py:2653 +#: forms_common.py:775 forms_common.py:823 models.py:1992 models.py:2705 msgid "Source type" msgstr "Type de document" @@ -441,37 +444,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:783 models.py:2690 +#: forms_common.py:783 models.py:2742 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:784 models.py:2692 +#: forms_common.py:784 models.py:2744 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:786 models.py:2096 models.py:2694 +#: forms_common.py:786 models.py:2145 models.py:2746 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:789 models.py:2697 +#: forms_common.py:789 models.py:2749 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:577 -#: models.py:1837 models.py:2376 models.py:2704 +#: forms_common.py:791 forms_common.py:827 models.py:317 models.py:622 +#: models.py:1886 models.py:2428 models.py:2756 msgid "Comment" msgstr "Commentaire" -#: forms_common.py:793 forms_common.py:826 models.py:979 models.py:1596 -#: models.py:1769 models.py:1811 models.py:2703 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1024 models.py:1644 +#: models.py:1818 models.py:1860 models.py:2755 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:796 models.py:2705 +#: forms_common.py:796 models.py:2757 msgid "Additional information" msgstr "Informations supplémentaires" -#: forms_common.py:798 forms_common.py:830 models.py:2707 +#: forms_common.py:798 forms_common.py:830 models.py:2759 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -488,7 +491,7 @@ msgstr "" "

Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2633 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2685 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -501,7 +504,7 @@ msgstr "Informations complémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:856 models.py:1944 models.py:2621 models.py:2630 +#: forms_common.py:856 models.py:1993 models.py:2673 models.py:2682 msgid "Author type" msgstr "Type d'auteur" @@ -513,7 +516,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:893 models.py:2634 models.py:2686 +#: forms_common.py:893 models.py:2686 models.py:2738 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -527,11 +530,11 @@ msgstr "Administration" msgid "Add/modify" msgstr "Ajouter/Modifier" -#: ishtar_menu.py:36 +#: ishtar_menu.py:36 ishtar_menu.py:70 ishtar_menu.py:101 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1105 views.py:1484 +#: ishtar_menu.py:39 models.py:1150 views.py:1494 msgid "Global variables" msgstr "Variables globales" @@ -559,20 +562,15 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:70 ishtar_menu.py:101 models.py:2133 widgets.py:110 -#: templates/ishtar/form_delete.html:11 -msgid "Delete" -msgstr "Suppression" - -#: ishtar_menu.py:109 models.py:2107 +#: ishtar_menu.py:109 models.py:2156 msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1492 +#: ishtar_menu.py:112 views.py:1502 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1506 +#: ishtar_menu.py:116 views.py:1516 msgid "Current imports" msgstr "Imports en cours" @@ -592,7 +590,7 @@ msgstr "Un élément sélectionné n'est pas valide." msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:313 models.py:576 models.py:1344 models.py:1356 +#: models.py:313 models.py:621 models.py:1389 models.py:1401 models.py:1815 msgid "Label" msgstr "Libellé" @@ -600,83 +598,83 @@ msgstr "Libellé" msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:318 models.py:579 models.py:1313 +#: models.py:318 models.py:624 models.py:1358 msgid "Available" msgstr "Disponible" -#: models.py:598 models.py:1883 +#: models.py:643 models.py:1932 msgid "Key" msgstr "Clé" -#: models.py:604 +#: models.py:649 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: models.py:696 +#: models.py:741 msgid "Last editor" msgstr "Dernier éditeur" -#: models.py:699 +#: models.py:744 msgid "Creator" msgstr "Créateur" -#: models.py:841 models.py:2770 +#: models.py:886 models.py:2822 msgid "Order" msgstr "Ordre" -#: models.py:842 +#: models.py:887 msgid "Symmetrical" msgstr "Symétrique" -#: models.py:843 +#: models.py:888 msgid "Tiny label" msgstr "Petit libellé" -#: models.py:857 +#: models.py:902 msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: models.py:971 +#: models.py:1016 msgid "Euro" msgstr "Euro" -#: models.py:972 +#: models.py:1017 msgid "US dollar" msgstr "Dollars US" -#: models.py:978 models.py:1594 +#: models.py:1023 models.py:1642 msgid "Slug" msgstr "Identifiant texte" -#: models.py:980 +#: models.py:1025 msgid "Files module" msgstr "Module Dossiers" -#: models.py:981 +#: models.py:1026 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:983 +#: models.py:1028 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:984 +#: models.py:1029 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:986 +#: models.py:1031 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:987 +#: models.py:1032 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:989 +#: models.py:1034 msgid "Home page" msgstr "Page d'accueil" -#: models.py:990 +#: models.py:1035 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -686,22 +684,22 @@ msgstr "" "défaut va apparaître. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: models.py:994 +#: models.py:1039 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:996 +#: models.py:1041 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "Formule pour gérer les identifiants externes" -#: models.py:1001 +#: models.py:1046 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:1004 +#: models.py:1049 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -711,11 +709,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1009 +#: models.py:1054 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:1011 +#: models.py:1056 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -725,11 +723,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1016 +#: models.py:1061 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:1018 +#: models.py:1063 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -739,11 +737,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1023 +#: models.py:1068 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:1025 +#: models.py:1070 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -753,11 +751,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1030 +#: models.py:1075 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: models.py:1032 +#: models.py:1077 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -767,43 +765,43 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: models.py:1036 +#: models.py:1081 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:1037 +#: models.py:1082 msgid "Currency" msgstr "Devise" -#: models.py:1041 +#: models.py:1086 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:1042 +#: models.py:1087 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:1098 +#: models.py:1143 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1099 +#: models.py:1144 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1101 models.py:1884 +#: models.py:1146 models.py:1933 msgid "Value" msgstr "Valeur" -#: models.py:1104 +#: models.py:1149 msgid "Global variable" msgstr "Variable globale" -#: models.py:1214 models.py:1244 +#: models.py:1259 models.py:1289 msgid "Total" msgstr "Total" -#: models.py:1221 models.py:1345 models.py:1357 +#: models.py:1266 models.py:1390 models.py:1402 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -811,599 +809,603 @@ msgstr "Total" msgid "Number" msgstr "Nombre" -#: models.py:1308 +#: models.py:1353 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1312 +#: models.py:1357 msgid "Associated object" msgstr "Objet associé" -#: models.py:1316 +#: models.py:1361 msgid "Document template" msgstr "Patron de document" -#: models.py:1317 +#: models.py:1362 msgid "Document templates" msgstr "Patrons de documents" -#: models.py:1348 models.py:1358 models.py:2091 +#: models.py:1393 models.py:1403 models.py:2140 msgid "State" msgstr "État" -#: models.py:1362 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1407 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1363 +#: models.py:1408 msgid "Departments" msgstr "Départements" -#: models.py:1400 +#: models.py:1445 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1406 +#: models.py:1451 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1445 +#: models.py:1490 msgid "Tel: " msgstr "Tél :" -#: models.py:1449 +#: models.py:1494 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1453 +#: models.py:1498 msgid "Email: " msgstr "Courriel :" -#: models.py:1458 +#: models.py:1503 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1532 +#: models.py:1577 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1548 views.py:234 +#: models.py:1596 views.py:237 msgid "Operation" msgstr "Opération" -#: models.py:1550 +#: models.py:1598 msgid "Archaeological site" msgstr "Entité Archéologique" -#: models.py:1551 +#: models.py:1599 msgid "Parcels" msgstr "Parcelles" -#: models.py:1553 +#: models.py:1601 msgid "Operation source" msgstr "Documentation de l'opération" -#: models.py:1556 views.py:1299 views.py:1350 +#: models.py:1604 views.py:1310 views.py:1360 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: models.py:1558 views.py:1302 views.py:1358 +#: models.py:1606 views.py:1313 views.py:1368 msgid "Context records" msgstr "Unités d'Enregistrement" -#: models.py:1560 +#: models.py:1608 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:1562 views.py:1304 views.py:1361 +#: models.py:1610 views.py:1315 views.py:1371 msgid "Finds" msgstr "Mobilier" -#: models.py:1598 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1646 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "Utilisateurs" -#: models.py:1600 +#: models.py:1648 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1603 +#: models.py:1651 msgid "Is template" msgstr "Est un patron" -#: models.py:1604 +#: models.py:1652 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1608 +#: models.py:1656 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1609 +#: models.py:1657 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1699 +#: models.py:1747 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1700 +#: models.py:1748 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1735 +#: models.py:1783 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1736 +#: models.py:1784 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:1768 +#: models.py:1817 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:1771 +#: models.py:1820 msgid "Required" msgstr "Requis" -#: models.py:1774 +#: models.py:1823 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:1775 +#: models.py:1824 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:1795 +#: models.py:1844 msgid "Field name" msgstr "Nom du champ" -#: models.py:1797 models.py:1831 +#: models.py:1846 models.py:1880 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:1799 models.py:1833 +#: models.py:1848 models.py:1882 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:1801 models.py:1835 +#: models.py:1850 models.py:1884 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:1805 +#: models.py:1854 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:1806 +#: models.py:1855 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:1813 +#: models.py:1862 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:1816 +#: models.py:1865 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:1817 +#: models.py:1866 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:1840 +#: models.py:1889 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:1841 +#: models.py:1890 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:1865 views.py:518 +#: models.py:1914 views.py:520 msgid "True" msgstr "Oui" -#: models.py:1866 views.py:520 +#: models.py:1915 views.py:522 msgid "False" msgstr "Non" -#: models.py:1885 +#: models.py:1934 msgid "Is set" msgstr "Est défini" -#: models.py:1892 +#: models.py:1941 msgid "Importer - Target key" msgstr "Importeur - Rapprochement" -#: models.py:1893 +#: models.py:1942 msgid "Importer - Targets keys" msgstr "Importeur - Rapprochements" -#: models.py:1945 models.py:2669 models.py:2682 +#: models.py:1994 models.py:2721 models.py:2734 msgid "Format" msgstr "Format" -#: models.py:1946 models.py:2774 +#: models.py:1995 models.py:2826 msgid "Operation type" msgstr "Type d'opération" -#: models.py:1947 +#: models.py:1996 msgid "Period" msgstr "Périodes" -#: models.py:1948 +#: models.py:1997 msgid "Report state" msgstr "État de rapport" -#: models.py:1949 +#: models.py:1998 msgid "Unit" msgstr "Unité" -#: models.py:1950 +#: models.py:1999 msgid "Material" msgstr "Matériau" -#: models.py:1952 +#: models.py:2001 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:1953 +#: models.py:2002 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:1954 +#: models.py:2003 msgid "Object type" msgstr "Type d'objet" -#: models.py:1956 +#: models.py:2005 msgid "Identification type" msgstr "Type d'identification" -#: models.py:1958 +#: models.py:2007 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:1959 models.py:2661 +#: models.py:2008 models.py:2713 msgid "Support type" msgstr "Type de support" -#: models.py:1965 +#: models.py:2014 msgid "Integer" msgstr "Entier" -#: models.py:1966 +#: models.py:2015 msgid "Float" msgstr "Nombre à virgule" -#: models.py:1967 +#: models.py:2016 msgid "String" msgstr "Chaîne de caractères" -#: models.py:1968 templates/sheet_ope.html:86 +#: models.py:2017 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:1970 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2019 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:1971 +#: models.py:2020 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:1972 +#: models.py:2021 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:1973 +#: models.py:2022 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:1989 +#: models.py:2038 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:1990 +#: models.py:2039 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:1991 +#: models.py:2040 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2001 +#: models.py:2050 msgid "Options" msgstr "Options" -#: models.py:2003 +#: models.py:2052 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2007 +#: models.py:2056 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2008 +#: models.py:2057 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2055 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2104 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2056 +#: models.py:2105 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2057 +#: models.py:2106 msgid "Analysed" msgstr "Analysé" -#: models.py:2058 +#: models.py:2107 msgid "Import pending" msgstr "Import en attente" -#: models.py:2059 +#: models.py:2108 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2060 +#: models.py:2109 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2061 +#: models.py:2110 msgid "Finished" msgstr "Terminé" -#: models.py:2062 +#: models.py:2111 msgid "Archived" msgstr "Archivé" -#: models.py:2074 +#: models.py:2123 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2077 +#: models.py:2126 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2079 +#: models.py:2128 msgid "Encoding" msgstr "Codage" -#: models.py:2081 +#: models.py:2130 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2082 templates/ishtar/import_list.html:47 +#: models.py:2131 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2085 +#: models.py:2134 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2088 templates/ishtar/import_list.html:53 +#: models.py:2137 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2094 +#: models.py:2143 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2099 +#: models.py:2148 msgid "End date" msgstr "Date de fin" -#: models.py:2101 +#: models.py:2150 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2106 +#: models.py:2155 msgid "Import" msgstr "Import" -#: models.py:2123 +#: models.py:2172 msgid "Analyse" msgstr "Analyser" -#: models.py:2125 models.py:2128 +#: models.py:2174 models.py:2177 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2126 +#: models.py:2175 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2129 +#: models.py:2178 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2130 +#: models.py:2179 msgid "Archive" msgstr "Archiver" -#: models.py:2132 +#: models.py:2181 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2274 +#: models.py:2182 widgets.py:110 templates/ishtar/form_delete.html:11 +msgid "Delete" +msgstr "Suppression" + +#: models.py:2323 msgid "Organizations" msgstr "Organisations" -#: models.py:2276 +#: models.py:2325 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2277 +#: models.py:2326 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2278 +#: models.py:2327 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2280 +#: models.py:2329 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2282 +#: models.py:2331 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2317 +#: models.py:2366 msgid "Groups" msgstr "Groupes" -#: models.py:2322 +#: models.py:2371 msgid "Person types" msgstr "Types de personne" -#: models.py:2330 +#: models.py:2382 msgid "Title type" msgstr "Type de titre" -#: models.py:2331 +#: models.py:2383 msgid "Title types" msgstr "Types de titre" -#: models.py:2340 +#: models.py:2392 msgid "Mr" msgstr "M." -#: models.py:2341 +#: models.py:2393 msgid "Miss" msgstr "Mlle" -#: models.py:2342 +#: models.py:2394 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2343 +#: models.py:2395 msgid "Mrs" msgstr "Mme" -#: models.py:2344 +#: models.py:2396 msgid "Doctor" msgstr "Dr." -#: models.py:2374 +#: models.py:2426 msgid "Contact type" msgstr "Type de contact" -#: models.py:2377 models.py:2441 +#: models.py:2429 models.py:2493 msgid "Types" msgstr "Types" -#: models.py:2380 +#: models.py:2432 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2385 +#: models.py:2437 msgid "Persons" msgstr "Personnes" -#: models.py:2387 +#: models.py:2439 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2388 +#: models.py:2440 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2389 +#: models.py:2441 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2390 +#: models.py:2442 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2391 +#: models.py:2443 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2569 +#: models.py:2621 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2572 +#: models.py:2624 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2573 +#: models.py:2625 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2616 +#: models.py:2668 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2622 +#: models.py:2674 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2654 +#: models.py:2706 msgid "Source types" msgstr "Types de document" -#: models.py:2662 +#: models.py:2714 msgid "Support types" msgstr "Types de support" -#: models.py:2670 +#: models.py:2722 msgid "Formats" msgstr "Formats" -#: models.py:2677 +#: models.py:2729 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2680 +#: models.py:2732 msgid "Support" msgstr "Support" -#: models.py:2684 +#: models.py:2736 msgid "Scale" msgstr "Échelle" -#: models.py:2698 +#: models.py:2750 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2699 +#: models.py:2751 msgid "Ref." msgstr "Réf." -#: models.py:2702 +#: models.py:2754 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2745 +#: models.py:2797 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2746 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2798 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2771 +#: models.py:2823 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:2775 +#: models.py:2827 msgid "Operation types" msgstr "Types d'opération" -#: models.py:2804 +#: models.py:2856 msgid "Preventive" msgstr "Préventif" -#: models.py:2805 +#: models.py:2857 msgid "Research" msgstr "Programmé" @@ -1415,104 +1417,104 @@ msgstr " (...)" msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: views.py:111 +#: views.py:114 msgid "New person" msgstr "Nouvelle personne" -#: views.py:119 +#: views.py:122 msgid "Person modification" msgstr "Modification d'une personne" -#: views.py:134 +#: views.py:137 msgid "Person deletion" msgstr "Suppression de personne" -#: views.py:145 +#: views.py:148 msgid "New organization" msgstr "Nouvelle organisation" -#: views.py:152 +#: views.py:155 msgid "Organization modification" msgstr "Modification d'une organisation" -#: views.py:168 +#: views.py:171 msgid "Organization deletion" msgstr "Suppression d'une organisation" -#: views.py:175 +#: views.py:178 msgid "Account management" msgstr "Gestion des comptes" -#: views.py:181 +#: views.py:184 msgid "Account deletion" msgstr "Suppression de comptes" -#: views.py:233 +#: views.py:236 msgid "Archaeological file" msgstr "Dossier" -#: views.py:236 +#: views.py:239 msgid "Context record" msgstr "Unité d'Enregistrement" -#: views.py:238 +#: views.py:241 msgid "Find" msgstr "Mobilier" -#: views.py:1238 views.py:1281 +#: views.py:1249 views.py:1292 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1240 +#: views.py:1251 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1300 views.py:1354 +#: views.py:1311 views.py:1364 msgid "Operations" msgstr "Opérations" -#: views.py:1553 templates/ishtar/import_list.html:43 +#: views.py:1563 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1568 +#: views.py:1578 msgid "Delete import" msgstr "Suppression de l'import" -#: views.py:1607 +#: views.py:1617 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1631 +#: views.py:1641 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1640 +#: views.py:1650 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1650 +#: views.py:1660 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1690 views.py:1706 +#: views.py:1700 views.py:1716 msgid "Corporation manager" msgstr "Représentant de la personne morale" -#: widgets.py:239 widgets.py:347 widgets.py:463 +#: widgets.py:239 widgets.py:347 widgets.py:462 msgid "Search..." msgstr "Recherche..." -#: widgets.py:623 templatetags/window_tables.py:79 +#: widgets.py:642 templatetags/window_tables.py:79 msgid "No results" msgstr "Pas de résultats" -#: widgets.py:624 templatetags/window_tables.py:80 +#: widgets.py:643 templatetags/window_tables.py:80 msgid "Loading..." msgstr "Chargement..." -#: widgets.py:625 +#: widgets.py:644 msgid "Remove" msgstr "Enlever" @@ -1524,7 +1526,7 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: wizards.py:1249 +#: wizards.py:1251 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création /modification du compte" @@ -1565,8 +1567,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deals 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 deals with only your items." -- cgit v1.2.3 From 4778f7ab57c5bbd1ec1ff6a0e3bd9e1561ddf454 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 14 Nov 2016 19:43:27 +0100 Subject: Explicit CSV headers (refs #3340) --- archaeological_context_records/models.py | 13 ++++++-- archaeological_finds/models.py | 54 ++++++++++++++++---------------- archaeological_operations/models.py | 22 +++++++++++++ ishtar_common/models.py | 13 ++++++-- ishtar_common/views.py | 11 +++++-- 5 files changed, 80 insertions(+), 33 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 3f4dc1598..22ff3b095 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -29,7 +29,7 @@ from ishtar_common.utils import cached_label_changed from ishtar_common.models import GeneralType, BaseHistorizedItem, \ HistoricalRecords, OwnPerms, ShortMenuItem, Source, GeneralRelationType,\ GeneralRecordRelations, post_delete_record_relation, get_external_id, \ - ImageModel, post_save_cache + ImageModel, post_save_cache, ValueGetter from archaeological_operations.models import Operation, Period, Parcel @@ -118,7 +118,8 @@ post_save.connect(post_save_cache, sender=IdentificationType) post_delete.connect(post_save_cache, sender=IdentificationType) -class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): +class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, + ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' TABLE_COLS = ['parcel__town', 'operation__year', @@ -155,6 +156,14 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): RELATIVE_SESSION_NAMES = [ ('operation', 'operation__pk'), ('file', 'operation__associated_file__pk')] + EXTRA_FULL_FIELDS_LABELS = { + 'parcel__town': _(u"Parcel (town)"), + 'detailled_related_context_records': _(u"Related context records"), + 'operation__code_patriarche': u"Operation (code patriarche)", + 'parcel__external_id': _(u"Parcel (external ID)"), + 'datings__period': _(u"Datings (period)"), + 'parcel__year': _(u"Parcel (year)"), + } # fields external_id = models.TextField(_(u"External ID"), blank=True, null=True) diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index aa5eacc30..6dcbbce65 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -291,41 +291,41 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): CHECK_DICT = dict(CHECK_CHOICES) SHOW_URL = 'show-find' SLUG = 'find' - TABLE_COLS = ['label', 'material_types', 'datings.period', - 'base_finds.context_record.parcel.town', - 'base_finds.context_record.operation.year', - 'base_finds.context_record.operation.operation_code', - 'container.reference', 'container.location', - 'base_finds.batch', - 'base_finds.context_record.parcel.town', - 'base_finds.context_record.parcel', ] + TABLE_COLS = ['label', 'material_types', 'datings__period', + 'base_finds__context_record__parcel__town', + 'base_finds__context_record__operation__year', + 'base_finds__context_record__operation__operation_code', + 'container__reference', 'container__location', + 'base_finds__batch', + 'base_finds__context_record__parcel__town', + 'base_finds__context_record__parcel', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( - 6, 'base_finds.context_record.operation.code_patriarche') + 6, 'base_finds__context_record__operation__code_patriarche') TABLE_COLS_FOR_OPE = [ - 'base_finds.cache_short_id', - 'base_finds.cache_complete_id', + 'base_finds__cache_short_id', + 'base_finds__cache_complete_id', 'previous_id', 'label', 'material_types', - 'datings.period', 'find_number', 'object_types', + 'datings__period', 'find_number', 'object_types', 'description', - 'base_finds.context_record.parcel.town', - 'base_finds.context_record.parcel', ] + 'base_finds__context_record__parcel__town', + 'base_finds__context_record__parcel', ] EXTRA_FULL_FIELDS = [ - 'base_finds.cache_short_id', 'base_finds.cache_complete_id', - 'base_finds.comment', 'base_finds.description', - 'base_finds.topographic_localisation', - 'base_finds.special_interest', - 'base_finds.discovery_date'] + 'base_finds__cache_short_id', 'base_finds__cache_complete_id', + 'base_finds__comment', 'base_finds__description', + 'base_finds__topographic_localisation', + 'base_finds__special_interest', + 'base_finds__discovery_date'] EXTRA_FULL_FIELDS_LABELS = { - 'base_finds.cache_short_id': _(u"Base find - Short ID"), - 'base_finds.cache_complete_id': _(u"Base find - Complete ID"), - 'base_finds.comment': _(u"Base find - Comment"), - 'base_finds.description': _(u"Base find - Description"), - 'base_finds.topographic_localisation': _(u"Base find - " - u"Topographic localisation"), - 'base_finds.special_interest': _(u"Base find - Special interest"), - 'base_finds.discovery_date': _(u"Base find - Discovery date"), + 'base_finds__cache_short_id': _(u"Base find - Short ID"), + 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), + 'base_finds__comment': _(u"Base find - Comment"), + 'base_finds__description': _(u"Base find - Description"), + 'base_finds__topographic_localisation': _(u"Base find - " + u"Topographic localisation"), + 'base_finds__special_interest': _(u"Base find - Special interest"), + 'base_finds__discovery_date': _(u"Base find - Discovery date"), } ATTRS_EQUIV = {'get_first_base_find': 'base_finds'} diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 14e5e1f7e..1e108e98c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -225,6 +225,28 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, 'finds_deadline_before': 'finds_deadline__lte', 'finds_deadline_after': 'finds_deadline__gte', } + EXTRA_FULL_FIELDS_LABELS = { + 'full_code_patriarche': u"Code patriarche", + 'year_index': _(u"Year - Index"), + 'associated_file_short_label': _(u"Associated file (label)"), + 'operator__name': _(u"Operator name"), + 'scientist__raw_name': _(u"Scientist (full name)"), + 'associated_file__external_id': _(u"Associated file (external ID)"), + 'scientist__title': _(u"Scientist (title)"), + 'scientist__surname': _(u"Scientist (surname)"), + 'scientist__name': _(u"Scientist (name)"), + 'scientist__attached_to__name': _(u"Scientist - Organization (name)"), + 'in_charge__title': _(u"In charge (title)"), + 'in_charge__surname': _(u"In charge (surname)"), + 'in_charge__name': _(u"In charge (name)"), + 'in_charge__attached_to__name': _(u"In charge - Organization (name)"), + 'cira_rapporteur__surname': u"Rapporteur CIRA (prénom)", + 'cira_rapporteur__name': u"Rapporteur CIRA (nom)", + 'cira_rapporteur__attached_to__name': u"Rapporteur CIRA - " + u"Organisation (nom)", + 'archaeological_sites__reference': _(u"Archaeological sites (" + u"reference)"), + } # fields definition creation_date = models.DateField(_(u"Creation date"), diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 72a3432f8..5b822c7dd 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -25,6 +25,7 @@ import copy import datetime from PIL import Image from importlib import import_module +import logging import os import re import shutil @@ -65,6 +66,9 @@ from ishtar_common.data_importer import Importer, ImportFormater, \ TypeFormater, YearFormater, StrToBoolean, FileFormater +logger = logging.getLogger(__name__) + + def post_save_user(sender, **kwargs): user = kwargs['instance'] try: @@ -95,6 +99,7 @@ class Imported(models.Model): class ValueGetter(object): _prefix = "" GET_VALUES_EXTRA = [] + EXTRA_FULL_FIELDS_LABELS = {} def get_values(self, prefix=''): if not prefix: @@ -1607,7 +1612,7 @@ def get_importer_models(): ('archaeological_context_records.models.RecordRelations', _(u"Context record relations"))] + MODELS MODELS = [('archaeological_finds.models.BaseFind', - _(u"Finds")), ] + MODELS + _(u"Base finds")), ] + MODELS return MODELS @@ -1995,7 +2000,9 @@ TARGET_MODELS = [ ('archaeological_operations.models.OperationType', _(u"Operation type")), ('archaeological_operations.models.Period', _(u"Period")), ('archaeological_operations.models.ReportState', _(u"Report state")), + ('archaeological_operations.models.RemainType', _(u"Remain type")), ('archaeological_context_records.models.Unit', _(u"Unit")), + ('archaeological_context_records.models.ActivityType', _(u"Activity type")), ('archaeological_finds.models.MaterialType', _(u"Material")), ('archaeological_finds.models.ConservatoryState', _(u"Conservatory state")), @@ -2077,7 +2084,9 @@ class FormaterType(models.Model): kwargs['many_split'] = self.many_split if self.formater_type == 'TypeFormater': if self.options not in TARGET_MODELS_KEYS: - print('%s not in TARGET_MODELS_KEYS' % self.options) + logger.warning( + "**WARN FormaterType.get_formater_type**: {} " + "is not in TARGET_MODELS_KEYS".format(self.options)) return model = None if self.options in dir(): diff --git a/ishtar_common/views.py b/ishtar_common/views.py index cd34a2019..8634125cd 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -981,8 +981,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], lnk = link_template % reverse('show-' + default_name, args=[data[0], '']) except NoReverseMatch: - print( - '"show-' + default_name + "\" args (" + logger.warning( + '**WARN "show-' + default_name + '" args (' + unicode(data[0]) + ") url not available") lnk = '' res = {'id': data[0], 'link': lnk} @@ -1027,6 +1027,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], writer = csv.writer(response, **CSV_OPTIONS) col_names = [] for field_name in table_cols: + if type(field_name) in (list, tuple): + field_name = " ; ".join(field_name) if hasattr(model, 'EXTRA_FULL_FIELDS_LABELS') and\ field_name in model.EXTRA_FULL_FIELDS_LABELS: field = model.EXTRA_FULL_FIELDS_LABELS[field_name] @@ -1037,6 +1039,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[], field = model._meta.get_field(field_name) except: col_names.append(u"".encode(ENCODING)) + logger.warning( + "**WARN get_item - csv export**: no col name for " + "{}\nadd explicit label to " + "EXTRA_FULL_FIELDS_LABELS attribute of " + "{}".format(field_name, model)) continue col_names.append( unicode(field.verbose_name).encode(ENCODING)) -- cgit v1.2.3