diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 | 
| commit | 2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (patch) | |
| tree | 7c0a2cb3713941ae7abb51e7591bd5398ac277ed | |
| parent | 97545b37f75b5a7297b5788cef32edd08b295f9d (diff) | |
| parent | 9b773927aaf6549ff52c697cce8009f55b042be8 (diff) | |
| download | Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.tar.bz2 Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.zip | |
Merge branch 'master' into develop
Conflicts:
	version.py
| -rw-r--r-- | archaeological_operations/locale/django.pot | 200 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 105 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 10 | ||||
| -rw-r--r-- | translations/de/ishtar_common.po | 104 | ||||
| -rw-r--r-- | translations/fr/archaeological_operations.po | 200 | ||||
| -rw-r--r-- | translations/fr/ishtar_common.po | 111 | ||||
| -rw-r--r-- | version.py | 2 | 
9 files changed, 402 insertions, 341 deletions
| diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index fafadea13..f8ba1f3a0 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -10,13 +10,13 @@  msgid ""  msgstr "" -#: forms.py:69 forms.py:371 forms.py:1047 forms.py:1069 forms.py:1073 +#: forms.py:69 forms.py:371 forms.py:1055 forms.py:1077 forms.py:1081  #: models.py:1252 templates/ishtar/sheet_operation.html:153  #: templates/ishtar/blocks/window_tables/parcels.html:10  msgid "Parcels"  msgstr "" -#: forms.py:72 forms.py:205 forms.py:1023 models.py:1238 +#: forms.py:72 forms.py:205 forms.py:1031 models.py:1238  #: templates/ishtar/blocks/window_tables/parcels.html:7  #: templates/ishtar/dashboards/dashboard_operation.html:432  #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -25,7 +25,7 @@ msgstr ""  msgid "Town"  msgstr "" -#: forms.py:74 forms.py:481 forms.py:783 forms.py:1293 models.py:276 +#: forms.py:74 forms.py:481 forms.py:781 forms.py:1301 models.py:276  #: models.py:1044 models.py:1236  #: templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Year" @@ -86,7 +86,7 @@ msgstr ""  msgid ":"  msgstr "" -#: forms.py:414 forms.py:633 forms.py:1258 +#: forms.py:414 forms.py:633 forms.py:1266  msgid "You should select an operation."  msgstr "" @@ -110,15 +110,15 @@ msgstr ""  msgid "Relations"  msgstr "" -#: forms.py:482 forms.py:1264 models.py:277 +#: forms.py:482 forms.py:1272 models.py:277  msgid "Numeric reference"  msgstr "" -#: forms.py:488 forms.py:1304 +#: forms.py:488 forms.py:1312  msgid "Parcel (section/number/public domain)"  msgstr "" -#: forms.py:491 forms.py:1307 models.py:848 +#: forms.py:491 forms.py:1315 models.py:848  #: templates/ishtar/dashboards/dashboard_operation.html:390  #: templates/ishtar/dashboards/dashboard_operation.html:411  #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -127,17 +127,17 @@ msgstr ""  msgid "Department"  msgstr "" -#: forms.py:492 forms.py:1135 models.py:86 +#: forms.py:492 forms.py:1143 models.py:86  #: templates/ishtar/sheet_operation.html:22  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8  msgid "Name"  msgstr "" -#: forms.py:494 forms.py:779 models.py:338 +#: forms.py:494 forms.py:777 models.py:338  msgid "Address / Locality"  msgstr "" -#: forms.py:496 forms.py:700 forms.py:781 forms.py:1270 models.py:284 +#: forms.py:496 forms.py:700 forms.py:779 forms.py:1278 models.py:284  msgid "Operation type"  msgstr "" @@ -145,7 +145,7 @@ msgstr ""  msgid "Is open?"  msgstr "" -#: forms.py:506 forms.py:813 models.py:269 +#: forms.py:506 forms.py:811 models.py:269  msgid "In charge"  msgstr "" @@ -153,16 +153,16 @@ msgstr ""  msgid "Scientist in charge"  msgstr "" -#: forms.py:515 forms.py:702 forms.py:803 models.py:267 +#: forms.py:515 forms.py:702 forms.py:801 models.py:267  msgid "Operator"  msgstr "" -#: forms.py:524 forms.py:1140 models.py:90 models.py:286 +#: forms.py:524 forms.py:1148 models.py:90 models.py:286  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10  msgid "Remains"  msgstr "" -#: forms.py:525 forms.py:1118 forms.py:1137 models.py:88 models.py:292 +#: forms.py:525 forms.py:1126 forms.py:1145 models.py:88 models.py:292  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9  msgid "Periods"  msgstr "" @@ -187,7 +187,7 @@ msgstr ""  msgid "Search within relations"  msgstr "" -#: forms.py:537 forms.py:867 +#: forms.py:537 forms.py:863  msgid "Comment"  msgstr "" @@ -195,31 +195,31 @@ msgstr ""  msgid "Abstract (full text search)"  msgstr "" -#: forms.py:540 forms.py:870 models.py:341 +#: forms.py:540 forms.py:866 models.py:341  msgid "Comment about scientific documentation"  msgstr "" -#: forms.py:541 forms.py:872 models.py:353 +#: forms.py:541 forms.py:868 models.py:353  msgid "Record quality"  msgstr "" -#: forms.py:542 forms.py:837 models.py:304 +#: forms.py:542 forms.py:833 models.py:304  msgid "Report processing"  msgstr "" -#: forms.py:544 forms.py:875 models.py:348 +#: forms.py:544 forms.py:871 models.py:348  msgid "Virtual operation"  msgstr "" -#: forms.py:546 forms.py:1180 forms.py:1184 models.py:94 +#: forms.py:546 forms.py:1188 forms.py:1192 models.py:94  msgid "Archaeological site"  msgstr "" -#: forms.py:552 forms.py:1311 +#: forms.py:552 forms.py:1319  msgid "Created by"  msgstr "" -#: forms.py:558 forms.py:1317 +#: forms.py:558 forms.py:1325  msgid "Modified by"  msgstr "" @@ -231,7 +231,7 @@ msgstr ""  msgid "Documentation deadline after"  msgstr "" -#: forms.py:569 forms.py:860 models.py:360 +#: forms.py:569 forms.py:856 models.py:360  msgid "Documentation received"  msgstr "" @@ -243,11 +243,11 @@ msgstr ""  msgid "Finds deadline after"  msgstr "" -#: forms.py:575 forms.py:865 models.py:364 +#: forms.py:575 forms.py:861 models.py:364  msgid "Finds received"  msgstr "" -#: forms.py:620 forms.py:1256 views.py:168 +#: forms.py:620 forms.py:1264 views.py:168  msgid "Operation search"  msgstr "" @@ -255,7 +255,7 @@ msgstr ""  msgid "Associated file"  msgstr "" -#: forms.py:668 forms.py:971 models.py:520 models.py:921 models.py:1031 +#: forms.py:668 forms.py:967 models.py:520 models.py:921 models.py:1031  #: wizards.py:80  msgid "Archaeological file"  msgstr "" @@ -324,261 +324,261 @@ msgstr ""  msgid "With finds"  msgstr "" -#: forms.py:761 forms.py:1365 templates/ishtar/sheet_administrativeact.html:20 +#: forms.py:761 forms.py:1373 templates/ishtar/sheet_administrativeact.html:20  #: templates/ishtar/sheet_operation.html:26  msgid "General"  msgstr "" -#: forms.py:777 models.py:337 +#: forms.py:775 models.py:337  msgid "Generic name"  msgstr "" -#: forms.py:788 models.py:306 +#: forms.py:786 models.py:306  msgid "Old code"  msgstr "" -#: forms.py:791 +#: forms.py:789  msgid "Head scientist"  msgstr "" -#: forms.py:810 models.py:336 +#: forms.py:808 models.py:336  msgid "Operator reference"  msgstr "" -#: forms.py:823 models.py:273 -msgid "Collaborators" -msgstr "" - -#: forms.py:826 +#: forms.py:822  msgid "Total surface (m2)"  msgstr "" -#: forms.py:830 models.py:54 models.py:256 models.py:1448 +#: forms.py:826 models.py:54 models.py:256 models.py:1448  msgid "Start date"  msgstr "" -#: forms.py:832 models.py:258 +#: forms.py:828 models.py:258  msgid "Excavation end date"  msgstr "" -#: forms.py:835 models.py:259 +#: forms.py:831 models.py:259  msgid "Report delivery date"  msgstr "" -#: forms.py:857 models.py:357 +#: forms.py:853 models.py:357  msgid "Deadline for submission of the documentation"  msgstr "" -#: forms.py:862 models.py:362 +#: forms.py:858 models.py:362  msgid "Deadline for submission of the finds"  msgstr "" -#: forms.py:877 +#: forms.py:873  msgid "Image"  msgstr "" -#: forms.py:878 +#: forms.py:874  #, python-format  msgid ""  "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"  "p>"  msgstr "" -#: forms.py:924 +#: forms.py:920  msgid ""  "If you want to set an excavation end date you have to provide a start date."  msgstr "" -#: forms.py:929 +#: forms.py:925  msgid "The excavation end date cannot be before the start date."  msgstr "" -#: forms.py:957 +#: forms.py:953  #, python-format  msgid ""  "Operation code already exists for year: %(year)d - use a value bigger than "  "%(last_val)d"  msgstr "" -#: forms.py:961 +#: forms.py:957  msgid "Bad operation code"  msgstr "" -#: forms.py:967 models.py:535 models.py:877 +#: forms.py:963 models.py:535 models.py:877  msgid "Operation code"  msgstr "" -#: forms.py:993 +#: forms.py:989 forms.py:993 models.py:273 +msgid "Collaborators" +msgstr "" + +#: forms.py:1001  msgid "Preventive informations - excavation"  msgstr "" -#: forms.py:994 models.py:290 +#: forms.py:1002 models.py:290  #: templates/ishtar/dashboards/dashboard_operation.html:701  msgid "Cost (euros)"  msgstr "" -#: forms.py:995 models.py:295 +#: forms.py:1003 models.py:295  msgid "Scheduled man-days"  msgstr "" -#: forms.py:997 models.py:298 +#: forms.py:1005 models.py:298  msgid "Optional man-days"  msgstr "" -#: forms.py:999 models.py:301 +#: forms.py:1007 models.py:301  msgid "Effective man-days"  msgstr "" -#: forms.py:1009 +#: forms.py:1017  msgid "Preventive informations - diagnostic"  msgstr "" -#: forms.py:1012 models.py:320 +#: forms.py:1020 models.py:320  msgid "Prescription on zoning"  msgstr "" -#: forms.py:1014 models.py:323 +#: forms.py:1022 models.py:323  msgid "Prescription on large area"  msgstr "" -#: forms.py:1017 models.py:325 +#: forms.py:1025 models.py:325  msgid "Prescription on geoarchaeological context"  msgstr "" -#: forms.py:1021 forms.py:1043 models.py:288 models.py:1054 +#: forms.py:1029 forms.py:1051 models.py:288 models.py:1054  msgid "Towns"  msgstr "" -#: forms.py:1050 models.py:1251 models.py:1446 +#: forms.py:1058 models.py:1251 models.py:1446  msgid "Parcel"  msgstr "" -#: forms.py:1102 models.py:46 +#: forms.py:1110 models.py:46  msgid "Remain types"  msgstr "" -#: forms.py:1106 models.py:45 +#: forms.py:1114 models.py:45  msgid "Remain type"  msgstr "" -#: forms.py:1122 templates/ishtar/sheet_operation.html:173 +#: forms.py:1130 templates/ishtar/sheet_operation.html:173  #: templates/ishtar/sheet_operation.html:204  msgid "Period"  msgstr "" -#: forms.py:1134 models.py:85 +#: forms.py:1142 models.py:85  msgid "Reference"  msgstr "" -#: forms.py:1163 +#: forms.py:1171  msgid "This reference already exists."  msgstr "" -#: forms.py:1195 models.py:95 models.py:345 +#: forms.py:1203 models.py:95 models.py:345  #: templates/ishtar/sheet_operation.html:97  msgid "Archaeological sites"  msgstr "" -#: forms.py:1199 +#: forms.py:1207  msgid "Associated archaeological sites"  msgstr "" -#: forms.py:1205 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1213 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93  msgid "Search"  msgstr "" -#: forms.py:1210 +#: forms.py:1218  msgid "Would you like to close this operation?"  msgstr "" -#: forms.py:1215 +#: forms.py:1223  msgid "Would you like to delete this operation?"  msgstr "" -#: forms.py:1224 forms.py:1294 forms.py:1430 models.py:884 models.py:1011 +#: forms.py:1232 forms.py:1302 forms.py:1438 models.py:884 models.py:1011  msgid "Index"  msgstr "" -#: forms.py:1250 +#: forms.py:1258  #, python-format  msgid ""  "Index already exists for operation: %(operation)s - use a value bigger than "  "%(last_val)d"  msgstr "" -#: forms.py:1262 +#: forms.py:1270  msgid "Operation's year"  msgstr "" -#: forms.py:1269 +#: forms.py:1277  msgid "Operation's town"  msgstr "" -#: forms.py:1282 +#: forms.py:1290  msgid "Documentation search"  msgstr "" -#: forms.py:1284 +#: forms.py:1292  msgid "You should select a document."  msgstr "" -#: forms.py:1301 forms.py:1368 models.py:935 models.py:1005 +#: forms.py:1309 forms.py:1376 models.py:935 models.py:1005  msgid "Act type"  msgstr "" -#: forms.py:1302 forms.py:1500 +#: forms.py:1310 forms.py:1508  msgid "Indexed?"  msgstr "" -#: forms.py:1308 forms.py:1373 models.py:1045 +#: forms.py:1316 forms.py:1381 models.py:1045  #: templates/ishtar/blocks/window_tables/administrativacts.html:10  msgid "Object"  msgstr "" -#: forms.py:1345 views.py:348 +#: forms.py:1353 views.py:350  msgid "Administrative act search"  msgstr "" -#: forms.py:1360 forms.py:1458 forms.py:1525 +#: forms.py:1368 forms.py:1466 forms.py:1533  msgid "You should select an administrative act."  msgstr "" -#: forms.py:1376 models.py:1042 +#: forms.py:1384 models.py:1042  msgid "Signature date"  msgstr "" -#: forms.py:1418 +#: forms.py:1426  #, python-format  msgid ""  "This index already exists for year: %(year)d - use a value bigger than "  "%(last_val)d"  msgstr "" -#: forms.py:1422 +#: forms.py:1430  msgid "Bad index"  msgstr "" -#: forms.py:1435 +#: forms.py:1443  msgid "Would you like to delete this administrative act?"  msgstr "" -#: forms.py:1440 +#: forms.py:1448  msgid "Template"  msgstr "" -#: forms.py:1464 forms.py:1468 +#: forms.py:1472 forms.py:1476  msgid "This document is not intended for this type of act."  msgstr "" -#: forms.py:1486 +#: forms.py:1494  msgid "Doc generation"  msgstr "" -#: forms.py:1488 +#: forms.py:1496  msgid "Generate the associated doc?"  msgstr "" -#: forms.py:1509 ishtar_menu.py:123 views.py:401 +#: forms.py:1517 ishtar_menu.py:123 views.py:403  msgctxt "admin act register"  msgid "Register"  msgstr "" @@ -1059,47 +1059,47 @@ msgstr ""  msgid "Operation types old"  msgstr "" -#: views.py:223 +#: views.py:224  msgid "New operation"  msgstr "" -#: views.py:267 +#: views.py:269  msgid "Operation modification"  msgstr "" -#: views.py:295 +#: views.py:297  msgid "Operation closing"  msgstr "" -#: views.py:306 +#: views.py:308  msgid "Operation deletion"  msgstr "" -#: views.py:311 +#: views.py:313  msgid "Operation: source search"  msgstr "" -#: views.py:319 +#: views.py:321  msgid "Operation: source creation"  msgstr "" -#: views.py:327 +#: views.py:329  msgid "Operation: source modification"  msgstr "" -#: views.py:342 +#: views.py:344  msgid "Operation: source deletion"  msgstr "" -#: views.py:361 +#: views.py:363  msgid "Operation: new administrative act"  msgstr "" -#: views.py:371 +#: views.py:373  msgid "Operation: administrative act modification"  msgstr "" -#: views.py:395 +#: views.py:397  msgid "Operation: administrative act deletion"  msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 002f724cf..26a06d0b8 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,6 +6,7 @@  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata  # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata  # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata  msgid ""  msgstr "" @@ -274,7 +275,7 @@ msgstr ""  msgid "Type"  msgstr "" -#: forms_common.py:222 views.py:149 +#: forms_common.py:222 views.py:157  msgid "Organization search"  msgstr "" @@ -295,7 +296,7 @@ msgstr ""  msgid "Surname"  msgstr "" -#: forms_common.py:341 forms_common.py:436 views.py:114 +#: forms_common.py:341 forms_common.py:436 views.py:122  msgid "Person search"  msgstr "" @@ -526,7 +527,7 @@ msgstr ""  msgid "Deletion"  msgstr "" -#: ishtar_menu.py:39 models.py:1338 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1648  msgid "Global variables"  msgstr "" @@ -558,15 +559,15 @@ msgstr ""  msgid "Imports"  msgstr "" -#: ishtar_menu.py:112 views.py:1648 +#: ishtar_menu.py:112 views.py:1656  msgid "New import"  msgstr "" -#: ishtar_menu.py:116 views.py:1662 +#: ishtar_menu.py:116 views.py:1670  msgid "Current imports"  msgstr "" -#: ishtar_menu.py:120 views.py:1701 +#: ishtar_menu.py:120 views.py:1709  msgid "Old imports"  msgstr "" @@ -634,11 +635,11 @@ msgstr ""  msgid "US dollar"  msgstr "" -#: models.py:1153 views.py:1438 views.py:1500 +#: models.py:1153 views.py:1446 views.py:1508  msgid "Operations"  msgstr "" -#: models.py:1154 views.py:1440 views.py:1504 +#: models.py:1154 views.py:1448 views.py:1512  msgid "Context records"  msgstr "" @@ -1037,11 +1038,11 @@ msgstr ""  msgid "Importer - Targets"  msgstr "" -#: models.py:2133 views.py:570 +#: models.py:2133 views.py:578  msgid "True"  msgstr "" -#: models.py:2134 views.py:572 +#: models.py:2134 views.py:580  msgid "False"  msgstr "" @@ -1299,7 +1300,7 @@ msgstr ""  msgid "Unarchive"  msgstr "" -#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:198 templates/ishtar/form_delete.html:11  msgid "Delete"  msgstr "" @@ -1519,128 +1520,140 @@ msgstr ""  msgid "Load another random image?"  msgstr "" -#: views.py:121 -msgid "New person" +#: views.py:96 +msgid "" +"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask " +"your admin to do it)." +msgstr "" + +#: views.py:101 +msgid "" +"The slug of your current profile is set to \"default\" change it on the " +"administration page (or ask your admin to do it)."  msgstr ""  #: views.py:129 +msgid "New person" +msgstr "" + +#: views.py:137  msgid "Person modification"  msgstr "" -#: views.py:144 +#: views.py:152  msgid "Person deletion"  msgstr "" -#: views.py:155 +#: views.py:163  msgid "New organization"  msgstr "" -#: views.py:162 +#: views.py:170  msgid "Organization modification"  msgstr "" -#: views.py:178 +#: views.py:186  msgid "Organization deletion"  msgstr "" -#: views.py:185 +#: views.py:193  msgid "Account management"  msgstr "" -#: views.py:191 +#: views.py:199  msgid "Account deletion"  msgstr "" -#: views.py:253 +#: views.py:261  msgid "Archaeological file"  msgstr "" -#: views.py:254 +#: views.py:262  msgid "Operation"  msgstr "" -#: views.py:256 +#: views.py:264  msgid "Context record"  msgstr "" -#: views.py:258 +#: views.py:266  msgid "Find"  msgstr "" -#: views.py:260 +#: views.py:268  msgid "Treatment request"  msgstr "" -#: views.py:261 +#: views.py:269  msgid "Treatment"  msgstr "" -#: views.py:1376 views.py:1419 +#: views.py:1384 views.py:1427  msgid "Operation not permitted."  msgstr "" -#: views.py:1378 +#: views.py:1386  #, python-format  msgid "New %s"  msgstr "" -#: views.py:1437 views.py:1496 +#: views.py:1445 views.py:1504  msgid "Archaeological files"  msgstr "" -#: views.py:1442 views.py:1507 +#: views.py:1450 views.py:1515  msgid "Finds"  msgstr "" -#: views.py:1444 views.py:1512 +#: views.py:1452 views.py:1520  msgid "Treatment requests"  msgstr "" -#: views.py:1445 views.py:1518 +#: views.py:1453 views.py:1526  msgid "Treatments"  msgstr "" -#: views.py:1715 templates/ishtar/import_list.html:47 +#: views.py:1723 templates/ishtar/import_list.html:47  msgid "Link unmatched items"  msgstr "" -#: views.py:1730 +#: views.py:1738  msgid "Delete import"  msgstr "" -#: views.py:1769 +#: views.py:1777  msgid "Merge persons"  msgstr "" -#: views.py:1793 +#: views.py:1801  msgid "Select the main person"  msgstr "" -#: views.py:1802 +#: views.py:1810  msgid "Merge organization"  msgstr "" -#: views.py:1812 +#: views.py:1820  msgid "Select the main organization"  msgstr "" -#: views.py:1852 views.py:1868 +#: views.py:1860 views.py:1876  msgid "Corporation manager"  msgstr "" -#: widgets.py:313 widgets.py:420 widgets.py:535 +#: widgets.py:327 widgets.py:434 widgets.py:549  msgid "Search..."  msgstr "" -#: widgets.py:724 templatetags/window_tables.py:96 +#: widgets.py:738 templatetags/window_tables.py:96  msgid "No results"  msgstr "" -#: widgets.py:725 templatetags/window_tables.py:97 +#: widgets.py:739 templatetags/window_tables.py:97  msgid "Loading..."  msgstr "" -#: widgets.py:726 +#: widgets.py:740  msgid "Remove"  msgstr "" @@ -1727,19 +1740,19 @@ msgstr ""  msgid ":"  msgstr "" -#: templates/base.html:123 +#: templates/base.html:128  msgid "Processing..."  msgstr "" -#: templates/base.html:124 +#: templates/base.html:129  msgid "This can be long."  msgstr "" -#: templates/base.html:125 +#: templates/base.html:130  msgid "Time to take a coffee?"  msgstr "" -#: templates/base.html:126 +#: templates/base.html:131  msgid "Time to take another coffee?"  msgstr "" diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 0016ca0e5..468b6557e 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -1323,6 +1323,12 @@ p.alert{      color:#D14;  } +ul.alert{ +    background-color: #FF9999; +    padding: 0.5em 2em; +    text-align: left; +} +  p.info-box{      color: #1c94c4;  } diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 6b4b715af..75e0e3740 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -109,6 +109,11 @@      </ul>      </div>      <div id="content"> +        {% if warnings %} +        <ul class="alert">{% for warning in warnings %} +            <li>{{warning}}</li>{% endfor %} +        </ul> +        {% endif %}          {% block content %}{% endblock %}      </div> diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 7a7c99953..be7c7b8e0 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -94,8 +94,16 @@ def index(request):      """      Main page      """ -    dct = {} +    dct = {'warnings': []} +    if settings.PROJECT_SLUG == 'default': +        dct['warnings'].append(_( +            u"PROJECT_SLUG is set to \"default\" change it in your " +            u"local_settings (or ask your admin to do it)."))      profile = get_current_profile() +    if profile.slug == 'default': +        dct['warnings'].append(_( +            u"The slug of your current profile is set to \"default\" change it " +            u"on the administration page (or ask your admin to do it)."))      image = get_random_item_image_link(request)      if hasattr(profile, 'homepage') and profile.homepage:          dct['homepage'] = markdown(profile.homepage) diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index 900a7339c..90908f2a6 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -277,7 +277,7 @@ msgstr ""  msgid "Type"  msgstr "" -#: forms_common.py:222 views.py:149 +#: forms_common.py:222 views.py:157  msgid "Organization search"  msgstr "" @@ -298,7 +298,7 @@ msgstr ""  msgid "Surname"  msgstr "" -#: forms_common.py:341 forms_common.py:436 views.py:114 +#: forms_common.py:341 forms_common.py:436 views.py:122  msgid "Person search"  msgstr "" @@ -529,7 +529,7 @@ msgstr ""  msgid "Deletion"  msgstr "" -#: ishtar_menu.py:39 models.py:1338 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1648  msgid "Global variables"  msgstr "" @@ -561,15 +561,15 @@ msgstr ""  msgid "Imports"  msgstr "" -#: ishtar_menu.py:112 views.py:1648 +#: ishtar_menu.py:112 views.py:1656  msgid "New import"  msgstr "" -#: ishtar_menu.py:116 views.py:1662 +#: ishtar_menu.py:116 views.py:1670  msgid "Current imports"  msgstr "" -#: ishtar_menu.py:120 views.py:1701 +#: ishtar_menu.py:120 views.py:1709  msgid "Old imports"  msgstr "" @@ -637,11 +637,11 @@ msgstr ""  msgid "US dollar"  msgstr "" -#: models.py:1153 views.py:1438 views.py:1500 +#: models.py:1153 views.py:1446 views.py:1508  msgid "Operations"  msgstr "" -#: models.py:1154 views.py:1440 views.py:1504 +#: models.py:1154 views.py:1448 views.py:1512  msgid "Context records"  msgstr "" @@ -1040,11 +1040,11 @@ msgstr ""  msgid "Importer - Targets"  msgstr "" -#: models.py:2133 views.py:570 +#: models.py:2133 views.py:578  msgid "True"  msgstr "" -#: models.py:2134 views.py:572 +#: models.py:2134 views.py:580  msgid "False"  msgstr "" @@ -1302,7 +1302,7 @@ msgstr ""  msgid "Unarchive"  msgstr "" -#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:198 templates/ishtar/form_delete.html:11  msgid "Delete"  msgstr "" @@ -1522,128 +1522,140 @@ msgstr ""  msgid "Load another random image?"  msgstr "" -#: views.py:121 -msgid "New person" +#: views.py:96 +msgid "" +"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask " +"your admin to do it)." +msgstr "" + +#: views.py:101 +msgid "" +"The slug of your current profile is set to \"default\" change it on the " +"administration page (or ask your admin to do it)."  msgstr ""  #: views.py:129 +msgid "New person" +msgstr "" + +#: views.py:137  msgid "Person modification"  msgstr "" -#: views.py:144 +#: views.py:152  msgid "Person deletion"  msgstr "" -#: views.py:155 +#: views.py:163  msgid "New organization"  msgstr "" -#: views.py:162 +#: views.py:170  msgid "Organization modification"  msgstr "" -#: views.py:178 +#: views.py:186  msgid "Organization deletion"  msgstr "" -#: views.py:185 +#: views.py:193  msgid "Account management"  msgstr "" -#: views.py:191 +#: views.py:199  msgid "Account deletion"  msgstr "" -#: views.py:253 +#: views.py:261  msgid "Archaeological file"  msgstr "" -#: views.py:254 +#: views.py:262  msgid "Operation"  msgstr "" -#: views.py:256 +#: views.py:264  msgid "Context record"  msgstr "" -#: views.py:258 +#: views.py:266  msgid "Find"  msgstr "" -#: views.py:260 +#: views.py:268  msgid "Treatment request"  msgstr "" -#: views.py:261 +#: views.py:269  msgid "Treatment"  msgstr "" -#: views.py:1376 views.py:1419 +#: views.py:1384 views.py:1427  msgid "Operation not permitted."  msgstr "" -#: views.py:1378 +#: views.py:1386  #, python-format  msgid "New %s"  msgstr "" -#: views.py:1437 views.py:1496 +#: views.py:1445 views.py:1504  msgid "Archaeological files"  msgstr "" -#: views.py:1442 views.py:1507 +#: views.py:1450 views.py:1515  msgid "Finds"  msgstr "" -#: views.py:1444 views.py:1512 +#: views.py:1452 views.py:1520  msgid "Treatment requests"  msgstr "" -#: views.py:1445 views.py:1518 +#: views.py:1453 views.py:1526  msgid "Treatments"  msgstr "" -#: views.py:1715 templates/ishtar/import_list.html:47 +#: views.py:1723 templates/ishtar/import_list.html:47  msgid "Link unmatched items"  msgstr "" -#: views.py:1730 +#: views.py:1738  msgid "Delete import"  msgstr "" -#: views.py:1769 +#: views.py:1777  msgid "Merge persons"  msgstr "" -#: views.py:1793 +#: views.py:1801  msgid "Select the main person"  msgstr "" -#: views.py:1802 +#: views.py:1810  msgid "Merge organization"  msgstr "" -#: views.py:1812 +#: views.py:1820  msgid "Select the main organization"  msgstr "" -#: views.py:1852 views.py:1868 +#: views.py:1860 views.py:1876  msgid "Corporation manager"  msgstr "" -#: widgets.py:313 widgets.py:420 widgets.py:535 +#: widgets.py:327 widgets.py:434 widgets.py:549  msgid "Search..."  msgstr "" -#: widgets.py:724 templatetags/window_tables.py:96 +#: widgets.py:738 templatetags/window_tables.py:96  msgid "No results"  msgstr "" -#: widgets.py:725 templatetags/window_tables.py:97 +#: widgets.py:739 templatetags/window_tables.py:97  msgid "Loading..."  msgstr "" -#: widgets.py:726 +#: widgets.py:740  msgid "Remove"  msgstr "" @@ -1730,19 +1742,19 @@ msgstr ""  msgid ":"  msgstr "" -#: templates/base.html:123 +#: templates/base.html:128  msgid "Processing..."  msgstr "" -#: templates/base.html:124 +#: templates/base.html:129  msgid "This can be long."  msgstr "" -#: templates/base.html:125 +#: templates/base.html:130  msgid "Time to take a coffee?"  msgstr "" -#: templates/base.html:126 +#: templates/base.html:131  msgid "Time to take another coffee?"  msgstr "" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 21d309c9d..ccff86182 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -19,13 +19,13 @@ msgstr ""  "Plural-Forms: nplurals=2; plural=n>1;\n"  "X-Generator: Zanata 3.9.6\n" -#: forms.py:69 forms.py:371 forms.py:1047 forms.py:1069 forms.py:1073 +#: forms.py:69 forms.py:371 forms.py:1055 forms.py:1077 forms.py:1081  #: models.py:1252 templates/ishtar/sheet_operation.html:153  #: templates/ishtar/blocks/window_tables/parcels.html:10  msgid "Parcels"  msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:1023 models.py:1238 +#: forms.py:72 forms.py:205 forms.py:1031 models.py:1238  #: templates/ishtar/blocks/window_tables/parcels.html:7  #: templates/ishtar/dashboards/dashboard_operation.html:432  #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -34,7 +34,7 @@ msgstr "Parcelles"  msgid "Town"  msgstr "Commune" -#: forms.py:74 forms.py:481 forms.py:783 forms.py:1293 models.py:276 +#: forms.py:74 forms.py:481 forms.py:781 forms.py:1301 models.py:276  #: models.py:1044 models.py:1236  #: templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Year" @@ -95,7 +95,7 @@ msgstr "Opération"  msgid ":"  msgstr ": " -#: forms.py:414 forms.py:633 forms.py:1258 +#: forms.py:414 forms.py:633 forms.py:1266  msgid "You should select an operation."  msgstr "Vous devez sélectionner une opération." @@ -119,15 +119,15 @@ msgstr "Relations supprimées"  msgid "Relations"  msgstr "Relations" -#: forms.py:482 forms.py:1264 models.py:277 +#: forms.py:482 forms.py:1272 models.py:277  msgid "Numeric reference"  msgstr "Identifiant numérique" -#: forms.py:488 forms.py:1304 +#: forms.py:488 forms.py:1312  msgid "Parcel (section/number/public domain)"  msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:491 forms.py:1307 models.py:848 +#: forms.py:491 forms.py:1315 models.py:848  #: templates/ishtar/dashboards/dashboard_operation.html:390  #: templates/ishtar/dashboards/dashboard_operation.html:411  #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -136,17 +136,17 @@ msgstr "Parcelle (section/numéro/domaine public)"  msgid "Department"  msgstr "Département" -#: forms.py:492 forms.py:1135 models.py:86 +#: forms.py:492 forms.py:1143 models.py:86  #: templates/ishtar/sheet_operation.html:22  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8  msgid "Name"  msgstr "Nom" -#: forms.py:494 forms.py:779 models.py:338 +#: forms.py:494 forms.py:777 models.py:338  msgid "Address / Locality"  msgstr "Adresse / Lieu-dit" -#: forms.py:496 forms.py:700 forms.py:781 forms.py:1270 models.py:284 +#: forms.py:496 forms.py:700 forms.py:779 forms.py:1278 models.py:284  msgid "Operation type"  msgstr "Type d'opération" @@ -154,7 +154,7 @@ msgstr "Type d'opération"  msgid "Is open?"  msgstr "Est ouvert ?" -#: forms.py:506 forms.py:813 models.py:269 +#: forms.py:506 forms.py:811 models.py:269  msgid "In charge"  msgstr "Responsable du suivi scientifique" @@ -162,16 +162,16 @@ msgstr "Responsable du suivi scientifique"  msgid "Scientist in charge"  msgstr "Responsable scientifique" -#: forms.py:515 forms.py:702 forms.py:803 models.py:267 +#: forms.py:515 forms.py:702 forms.py:801 models.py:267  msgid "Operator"  msgstr "Opérateur" -#: forms.py:524 forms.py:1140 models.py:90 models.py:286 +#: forms.py:524 forms.py:1148 models.py:90 models.py:286  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10  msgid "Remains"  msgstr "Vestiges" -#: forms.py:525 forms.py:1118 forms.py:1137 models.py:88 models.py:292 +#: forms.py:525 forms.py:1126 forms.py:1145 models.py:88 models.py:292  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9  msgid "Periods"  msgstr "Périodes" @@ -196,7 +196,7 @@ msgstr "Terminé après"  msgid "Search within relations"  msgstr "Rechercher parmi les relations" -#: forms.py:537 forms.py:867 +#: forms.py:537 forms.py:863  msgid "Comment"  msgstr "Commentaire" @@ -204,31 +204,31 @@ msgstr "Commentaire"  msgid "Abstract (full text search)"  msgstr "Résumé (recherche texte intégral)" -#: forms.py:540 forms.py:870 models.py:341 +#: forms.py:540 forms.py:866 models.py:341  msgid "Comment about scientific documentation"  msgstr "Commentaire concernant la documentation scientifique" -#: forms.py:541 forms.py:872 models.py:353 +#: forms.py:541 forms.py:868 models.py:353  msgid "Record quality"  msgstr "Qualité d'enregistrement" -#: forms.py:542 forms.py:837 models.py:304 +#: forms.py:542 forms.py:833 models.py:304  msgid "Report processing"  msgstr "Traitement du rapport" -#: forms.py:544 forms.py:875 models.py:348 +#: forms.py:544 forms.py:871 models.py:348  msgid "Virtual operation"  msgstr "Opération virtuelle" -#: forms.py:546 forms.py:1180 forms.py:1184 models.py:94 +#: forms.py:546 forms.py:1188 forms.py:1192 models.py:94  msgid "Archaeological site"  msgstr "Entité archéologique" -#: forms.py:552 forms.py:1311 +#: forms.py:552 forms.py:1319  msgid "Created by"  msgstr "Créé par" -#: forms.py:558 forms.py:1317 +#: forms.py:558 forms.py:1325  msgid "Modified by"  msgstr "Modifié par" @@ -240,7 +240,7 @@ msgstr "Date limite de rendu de la documentation avant"  msgid "Documentation deadline after"  msgstr "Date limite de rendu de la documentation après" -#: forms.py:569 forms.py:860 models.py:360 +#: forms.py:569 forms.py:856 models.py:360  msgid "Documentation received"  msgstr "Documentation reçue" @@ -252,11 +252,11 @@ msgstr "Date limite de rendu du mobilier avant"  msgid "Finds deadline after"  msgstr "Date limite de rendu du mobilier après" -#: forms.py:575 forms.py:865 models.py:364 +#: forms.py:575 forms.py:861 models.py:364  msgid "Finds received"  msgstr "Mobilier reçu" -#: forms.py:620 forms.py:1256 views.py:168 +#: forms.py:620 forms.py:1264 views.py:168  msgid "Operation search"  msgstr "Rechercher une opération" @@ -264,7 +264,7 @@ msgstr "Rechercher une opération"  msgid "Associated file"  msgstr "Dossier associé" -#: forms.py:668 forms.py:971 models.py:520 models.py:921 models.py:1031 +#: forms.py:668 forms.py:967 models.py:520 models.py:921 models.py:1031  #: wizards.py:80  msgid "Archaeological file"  msgstr "Dossier archéologique" @@ -333,60 +333,56 @@ msgstr "Avec un rapport"  msgid "With finds"  msgstr "Avec du mobilier" -#: forms.py:761 forms.py:1365 templates/ishtar/sheet_administrativeact.html:20 +#: forms.py:761 forms.py:1373 templates/ishtar/sheet_administrativeact.html:20  #: templates/ishtar/sheet_operation.html:26  msgid "General"  msgstr "Général" -#: forms.py:777 models.py:337 +#: forms.py:775 models.py:337  msgid "Generic name"  msgstr "Nom générique" -#: forms.py:788 models.py:306 +#: forms.py:786 models.py:306  msgid "Old code"  msgstr "Ancien code" -#: forms.py:791 +#: forms.py:789  msgid "Head scientist"  msgstr "Responsable scientifique" -#: forms.py:810 models.py:336 +#: forms.py:808 models.py:336  msgid "Operator reference"  msgstr "Référence de l'opérateur" -#: forms.py:823 models.py:273 -msgid "Collaborators" -msgstr "Collaborateurs" - -#: forms.py:826 +#: forms.py:822  msgid "Total surface (m2)"  msgstr "Surface totale (m2)" -#: forms.py:830 models.py:54 models.py:256 models.py:1448 +#: forms.py:826 models.py:54 models.py:256 models.py:1448  msgid "Start date"  msgstr "Date de début" -#: forms.py:832 models.py:258 +#: forms.py:828 models.py:258  msgid "Excavation end date"  msgstr "Date de fin de chantier" -#: forms.py:835 models.py:259 +#: forms.py:831 models.py:259  msgid "Report delivery date"  msgstr "Date de livraison du rapport" -#: forms.py:857 models.py:357 +#: forms.py:853 models.py:357  msgid "Deadline for submission of the documentation"  msgstr "Date limite de rendu de la documentation" -#: forms.py:862 models.py:362 +#: forms.py:858 models.py:362  msgid "Deadline for submission of the finds"  msgstr "Date limite de rendu du mobilier" -#: forms.py:877 +#: forms.py:873  msgid "Image"  msgstr "Image" -#: forms.py:878 +#: forms.py:874  #, python-format  msgid ""  "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</" @@ -395,19 +391,19 @@ msgstr ""  "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "  "ratio est conservé).</p>" -#: forms.py:924 +#: forms.py:920  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:929 +#: forms.py:925  msgid "The excavation end date cannot be before the start date."  msgstr ""  "La date de fin de chantier ne peut être antérieure à la date de début." -#: forms.py:957 +#: forms.py:953  #, python-format  msgid ""  "Operation code already exists for year: %(year)d - use a value bigger than " @@ -416,106 +412,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:961 +#: forms.py:957  msgid "Bad operation code"  msgstr "Mauvais code d'opération" -#: forms.py:967 models.py:535 models.py:877 +#: forms.py:963 models.py:535 models.py:877  msgid "Operation code"  msgstr "Code de l'opération" -#: forms.py:993 +#: forms.py:989 forms.py:993 models.py:273 +msgid "Collaborators" +msgstr "Collaborateurs" + +#: forms.py:1001  msgid "Preventive informations - excavation"  msgstr "Information archéologie préventive - fouille" -#: forms.py:994 models.py:290 +#: forms.py:1002 models.py:290  #: templates/ishtar/dashboards/dashboard_operation.html:701  msgid "Cost (euros)"  msgstr "Coût (euros)" -#: forms.py:995 models.py:295 +#: forms.py:1003 models.py:295  msgid "Scheduled man-days"  msgstr "Jours-hommes prévus" -#: forms.py:997 models.py:298 +#: forms.py:1005 models.py:298  msgid "Optional man-days"  msgstr "Jours-hommes optionnels" -#: forms.py:999 models.py:301 +#: forms.py:1007 models.py:301  msgid "Effective man-days"  msgstr "Jours-hommes effectifs" -#: forms.py:1009 +#: forms.py:1017  msgid "Preventive informations - diagnostic"  msgstr "Information archéologie préventive - diagnostic" -#: forms.py:1012 models.py:320 +#: forms.py:1020 models.py:320  msgid "Prescription on zoning"  msgstr "Prescription sur zonage" -#: forms.py:1014 models.py:323 +#: forms.py:1022 models.py:323  msgid "Prescription on large area"  msgstr "Prescription sur une vaste surface" -#: forms.py:1017 models.py:325 +#: forms.py:1025 models.py:325  msgid "Prescription on geoarchaeological context"  msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:1021 forms.py:1043 models.py:288 models.py:1054 +#: forms.py:1029 forms.py:1051 models.py:288 models.py:1054  msgid "Towns"  msgstr "Communes" -#: forms.py:1050 models.py:1251 models.py:1446 +#: forms.py:1058 models.py:1251 models.py:1446  msgid "Parcel"  msgstr "Parcelle" -#: forms.py:1102 models.py:46 +#: forms.py:1110 models.py:46  msgid "Remain types"  msgstr "Types de vestige" -#: forms.py:1106 models.py:45 +#: forms.py:1114 models.py:45  msgid "Remain type"  msgstr "Type de vestige" -#: forms.py:1122 templates/ishtar/sheet_operation.html:173 +#: forms.py:1130 templates/ishtar/sheet_operation.html:173  #: templates/ishtar/sheet_operation.html:204  msgid "Period"  msgstr "Période" -#: forms.py:1134 models.py:85 +#: forms.py:1142 models.py:85  msgid "Reference"  msgstr "Référence" -#: forms.py:1163 +#: forms.py:1171  msgid "This reference already exists."  msgstr "Cette référence existe déjà." -#: forms.py:1195 models.py:95 models.py:345 +#: forms.py:1203 models.py:95 models.py:345  #: templates/ishtar/sheet_operation.html:97  msgid "Archaeological sites"  msgstr "Entités archéologiques" -#: forms.py:1199 +#: forms.py:1207  msgid "Associated archaeological sites"  msgstr "Entités archéologiques associées" -#: forms.py:1205 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1213 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93  msgid "Search"  msgstr "Recherche" -#: forms.py:1210 +#: forms.py:1218  msgid "Would you like to close this operation?"  msgstr "Voulez-vous clore cette opération ?" -#: forms.py:1215 +#: forms.py:1223  msgid "Would you like to delete this operation?"  msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1224 forms.py:1294 forms.py:1430 models.py:884 models.py:1011 +#: forms.py:1232 forms.py:1302 forms.py:1438 models.py:884 models.py:1011  msgid "Index"  msgstr "Index" -#: forms.py:1250 +#: forms.py:1258  #, python-format  msgid ""  "Index already exists for operation: %(operation)s - use a value bigger than " @@ -524,48 +524,48 @@ msgstr ""  "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "  "plus grande que %(last_val)d" -#: forms.py:1262 +#: forms.py:1270  msgid "Operation's year"  msgstr "Année de l'opération" -#: forms.py:1269 +#: forms.py:1277  msgid "Operation's town"  msgstr "Commune de l'opération" -#: forms.py:1282 +#: forms.py:1290  msgid "Documentation search"  msgstr "Rechercher une documentation" -#: forms.py:1284 +#: forms.py:1292  msgid "You should select a document."  msgstr "Vous devez sélectionner un document." -#: forms.py:1301 forms.py:1368 models.py:935 models.py:1005 +#: forms.py:1309 forms.py:1376 models.py:935 models.py:1005  msgid "Act type"  msgstr "Type d'acte" -#: forms.py:1302 forms.py:1500 +#: forms.py:1310 forms.py:1508  msgid "Indexed?"  msgstr "Indexé ?" -#: forms.py:1308 forms.py:1373 models.py:1045 +#: forms.py:1316 forms.py:1381 models.py:1045  #: templates/ishtar/blocks/window_tables/administrativacts.html:10  msgid "Object"  msgstr "Objet" -#: forms.py:1345 views.py:348 +#: forms.py:1353 views.py:350  msgid "Administrative act search"  msgstr "Rechercher un acte administratif" -#: forms.py:1360 forms.py:1458 forms.py:1525 +#: forms.py:1368 forms.py:1466 forms.py:1533  msgid "You should select an administrative act."  msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1376 models.py:1042 +#: forms.py:1384 models.py:1042  msgid "Signature date"  msgstr "Date de signature" -#: forms.py:1418 +#: forms.py:1426  #, python-format  msgid ""  "This index already exists for year: %(year)d - use a value bigger than " @@ -574,31 +574,31 @@ msgstr ""  "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus "  "grande que %(last_val)d" -#: forms.py:1422 +#: forms.py:1430  msgid "Bad index"  msgstr "Mauvais index" -#: forms.py:1435 +#: forms.py:1443  msgid "Would you like to delete this administrative act?"  msgstr "Voulez-vous supprimer cet acte administratif ?" -#: forms.py:1440 +#: forms.py:1448  msgid "Template"  msgstr "Patron" -#: forms.py:1464 forms.py:1468 +#: forms.py:1472 forms.py:1476  msgid "This document is not intended for this type of act."  msgstr "Ce document n'est pas destiné à ce type d'acte." -#: forms.py:1486 +#: forms.py:1494  msgid "Doc generation"  msgstr "Génération de document" -#: forms.py:1488 +#: forms.py:1496  msgid "Generate the associated doc?"  msgstr "Générer le document associé ?" -#: forms.py:1509 ishtar_menu.py:123 views.py:401 +#: forms.py:1517 ishtar_menu.py:123 views.py:403  msgctxt "admin act register"  msgid "Register"  msgstr "Registre" @@ -1081,47 +1081,47 @@ msgstr "Type d'opération - ancien"  msgid "Operation types old"  msgstr "Types d'opération - ancien" -#: views.py:223 +#: views.py:224  msgid "New operation"  msgstr "Ajouter une opération" -#: views.py:267 +#: views.py:269  msgid "Operation modification"  msgstr "Modifier une opération" -#: views.py:295 +#: views.py:297  msgid "Operation closing"  msgstr "Clôturer une opération" -#: views.py:306 +#: views.py:308  msgid "Operation deletion"  msgstr "Supprimer une opération" -#: views.py:311 +#: views.py:313  msgid "Operation: source search"  msgstr "Opération : rechercher une documentation associée" -#: views.py:319 +#: views.py:321  msgid "Operation: source creation"  msgstr "Opération : ajouter une documentation associée" -#: views.py:327 +#: views.py:329  msgid "Operation: source modification"  msgstr "Opération : modifier une documentation associée" -#: views.py:342 +#: views.py:344  msgid "Operation: source deletion"  msgstr "Opération : supprimer une documentation associée" -#: views.py:361 +#: views.py:363  msgid "Operation: new administrative act"  msgstr "Opération : ajouter un acte administratif" -#: views.py:371 +#: views.py:373  msgid "Operation: administrative act modification"  msgstr "Opération : modification d'un acte administratif" -#: views.py:395 +#: views.py:397  msgid "Operation: administrative act deletion"  msgstr "Opération : supprimer un acte administratif" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 980fba45d..fa2157116 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -12,7 +12,7 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-05-16 06:17-0400\n" +"PO-Revision-Date: 2017-05-29 05:30-0400\n"  "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n" @@ -304,7 +304,7 @@ msgstr "Téléphone portable"  msgid "Type"  msgstr "Type" -#: forms_common.py:222 views.py:149 +#: forms_common.py:222 views.py:157  msgid "Organization search"  msgstr "Rechercher une organisation" @@ -325,7 +325,7 @@ msgstr "Organisation à fusionner"  msgid "Surname"  msgstr "Prénom" -#: forms_common.py:341 forms_common.py:436 views.py:114 +#: forms_common.py:341 forms_common.py:436 views.py:122  msgid "Person search"  msgstr "Rechercher une personne" @@ -558,7 +558,7 @@ msgstr "Ajout/modification"  msgid "Deletion"  msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1338 views.py:1640 +#: ishtar_menu.py:39 models.py:1338 views.py:1648  msgid "Global variables"  msgstr "Variables globales" @@ -590,15 +590,15 @@ msgstr "Fusion manuelle"  msgid "Imports"  msgstr "Imports" -#: ishtar_menu.py:112 views.py:1648 +#: ishtar_menu.py:112 views.py:1656  msgid "New import"  msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1662 +#: ishtar_menu.py:116 views.py:1670  msgid "Current imports"  msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1701 +#: ishtar_menu.py:120 views.py:1709  msgid "Old imports"  msgstr "Anciens imports" @@ -666,11 +666,11 @@ msgstr "Euro"  msgid "US dollar"  msgstr "Dollar US" -#: models.py:1153 views.py:1438 views.py:1500 +#: models.py:1153 views.py:1446 views.py:1508  msgid "Operations"  msgstr "Opérations" -#: models.py:1154 views.py:1440 views.py:1504 +#: models.py:1154 views.py:1448 views.py:1512  msgid "Context records"  msgstr "Unités d'Enregistrement" @@ -1100,11 +1100,11 @@ msgstr "Importeur - Cible"  msgid "Importer - Targets"  msgstr "Importeur - Cibles" -#: models.py:2133 views.py:570 +#: models.py:2133 views.py:578  msgid "True"  msgstr "Oui" -#: models.py:2134 views.py:572 +#: models.py:2134 views.py:580  msgid "False"  msgstr "Non" @@ -1362,7 +1362,7 @@ msgstr "Archiver"  msgid "Unarchive"  msgstr "Désarchiver" -#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11 +#: models.py:2428 widgets.py:198 templates/ishtar/form_delete.html:11  msgid "Delete"  msgstr "Supprimer" @@ -1584,128 +1584,145 @@ msgstr " (...)"  msgid "Load another random image?"  msgstr "Charger une autre image au hasard ?" -#: views.py:121 +#: views.py:96 +msgid "" +"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask " +"your admin to do it)." +msgstr "" +"PROJECT_SLUG a été laissé à la valeur « default » changez le dans votre " +"fichier local_settings (ou demandez à un administrateur de le faire)." + +#: views.py:101 +msgid "" +"The slug of your current profile is set to \"default\" change it on the " +"administration page (or ask your admin to do it)." +msgstr "" +"Le « slug » du profil actuellement utilisé a été laissé à la valeur « " +"default » changez le sur la page d'administration (ou demandez à un " +"administrateur de le faire)." + +#: views.py:129  msgid "New person"  msgstr "Ajouter une personne" -#: views.py:129 +#: views.py:137  msgid "Person modification"  msgstr "Modifier une personne" -#: views.py:144 +#: views.py:152  msgid "Person deletion"  msgstr "Supprimer une personne" -#: views.py:155 +#: views.py:163  msgid "New organization"  msgstr "Ajouter une organisation" -#: views.py:162 +#: views.py:170  msgid "Organization modification"  msgstr "Modifier une organisation" -#: views.py:178 +#: views.py:186  msgid "Organization deletion"  msgstr "Supprimer une organisation" -#: views.py:185 +#: views.py:193  msgid "Account management"  msgstr "Gérer les comptes" -#: views.py:191 +#: views.py:199  msgid "Account deletion"  msgstr "Supprimer un compte" -#: views.py:253 +#: views.py:261  msgid "Archaeological file"  msgstr "Dossier" -#: views.py:254 +#: views.py:262  msgid "Operation"  msgstr "Opération" -#: views.py:256 +#: views.py:264  msgid "Context record"  msgstr "Unité d'Enregistrement" -#: views.py:258 +#: views.py:266  msgid "Find"  msgstr "Mobilier" -#: views.py:260 +#: views.py:268  msgid "Treatment request"  msgstr "Demande de traitement" -#: views.py:261 +#: views.py:269  msgid "Treatment"  msgstr "Traitement" -#: views.py:1376 views.py:1419 +#: views.py:1384 views.py:1427  msgid "Operation not permitted."  msgstr "Opération non permise." -#: views.py:1378 +#: views.py:1386  #, python-format  msgid "New %s"  msgstr "Nouveau %s" -#: views.py:1437 views.py:1496 +#: views.py:1445 views.py:1504  msgid "Archaeological files"  msgstr "Dossiers" -#: views.py:1442 views.py:1507 +#: views.py:1450 views.py:1515  msgid "Finds"  msgstr "Mobilier" -#: views.py:1444 views.py:1512 +#: views.py:1452 views.py:1520  msgid "Treatment requests"  msgstr "Demandes de traitement" -#: views.py:1445 views.py:1518 +#: views.py:1453 views.py:1526  msgid "Treatments"  msgstr "Traitements" -#: views.py:1715 templates/ishtar/import_list.html:47 +#: views.py:1723 templates/ishtar/import_list.html:47  msgid "Link unmatched items"  msgstr "Associer les éléments non rapprochés" -#: views.py:1730 +#: views.py:1738  msgid "Delete import"  msgstr "Supprimer un import" -#: views.py:1769 +#: views.py:1777  msgid "Merge persons"  msgstr "Fusionner des personnes" -#: views.py:1793 +#: views.py:1801  msgid "Select the main person"  msgstr "Choisir la personne principale" -#: views.py:1802 +#: views.py:1810  msgid "Merge organization"  msgstr "Fusionner des organisations" -#: views.py:1812 +#: views.py:1820  msgid "Select the main organization"  msgstr "Sélectionner l'organisation principale" -#: views.py:1852 views.py:1868 +#: views.py:1860 views.py:1876  msgid "Corporation manager"  msgstr "Représentant de la personne morale" -#: widgets.py:313 widgets.py:420 widgets.py:535 +#: widgets.py:327 widgets.py:434 widgets.py:549  msgid "Search..."  msgstr "Recherche..." -#: widgets.py:724 templatetags/window_tables.py:96 +#: widgets.py:738 templatetags/window_tables.py:96  msgid "No results"  msgstr "Pas de résultats" -#: widgets.py:725 templatetags/window_tables.py:97 +#: widgets.py:739 templatetags/window_tables.py:97  msgid "Loading..."  msgstr "Chargement..." -#: widgets.py:726 +#: widgets.py:740  msgid "Remove"  msgstr "Enlever" @@ -1794,19 +1811,19 @@ msgstr "Éléments courants"  msgid ":"  msgstr " :" -#: templates/base.html:123 +#: templates/base.html:128  msgid "Processing..."  msgstr "En traitement..." -#: templates/base.html:124 +#: templates/base.html:129  msgid "This can be long."  msgstr "Cela peut être long." -#: templates/base.html:125 +#: templates/base.html:130  msgid "Time to take a coffee?"  msgstr "Il est peut-être temps de prendre un café ?" -#: templates/base.html:126 +#: templates/base.html:131  msgid "Time to take another coffee?"  msgstr "Pourquoi pas un autre café ?" diff --git a/version.py b/version.py index efadf2154..3f6b5cc62 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@  # 1.99.1 -VERSION = (1, 99, 1) +VERSION = (1, 99, 1, 1)  def get_version(): | 
