Merge branch 'master' into develop

5 files changed, 207 insertions, 210 deletions

diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index f2eb79162..098fbe1d9 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -2,11 +2,10 @@
 # Copyright (C) 2010-2015
 # This file is distributed under the same license as the Ishtar package.
 # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
+# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
 msgid ""
 msgstr ""
 
@@ -31,20 +30,18 @@ msgid "Parent"
 msgstr ""
 
 #: admin.py:197
-#| msgid "center"
 msgid "Center"
 msgstr ""
 
-#: admin.py:199 models.py:2670
+#: admin.py:199 models.py:2727
 msgid "Limit"
 msgstr ""
 
-#: admin.py:202 models.py:2680
+#: admin.py:202 models.py:2737
 msgid "Town children"
 msgstr ""
 
 #: admin.py:210
-#| msgid "Parent"
 msgid "Parents"
 msgstr ""
 
@@ -227,12 +224,12 @@ msgstr ""
 msgid "Add a new item"
 msgstr ""
 
-#: forms.py:308 models.py:1818
+#: forms.py:308 models.py:1862
 msgid "Template"
 msgstr ""
 
 #: forms_common.py:41 forms_common.py:59 forms_common.py:270
-#: forms_common.py:494 models.py:1936 models.py:2687
+#: forms_common.py:494 models.py:1993 models.py:2744
 #: templates/blocks/JQueryAdvancedTown.html:19
 msgid "Town"
 msgstr ""
@@ -247,8 +244,8 @@ msgid ""
 "french town Saint-Denis in the Seine-Saint-Denis department.</p>"
 msgstr ""
 
-#: forms_common.py:68 forms_common.py:949 ishtar_menu.py:47 models.py:2231
-#: models.py:2426 models.py:2528 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:949 ishtar_menu.py:47 models.py:2288
+#: models.py:2483 models.py:2585 templates/ishtar/sheet_person.html:4
 msgid "Person"
 msgstr ""
 
@@ -287,15 +284,15 @@ msgid "all users"
 msgstr ""
 
 #: forms_common.py:258 forms_common.py:415 forms_common.py:539
-#: ishtar_menu.py:75 models.py:2116 models.py:2205
+#: ishtar_menu.py:75 models.py:2173 models.py:2262
 #: templates/ishtar/sheet_organization.html:4
 msgid "Organization"
 msgstr ""
 
 #: forms_common.py:261 forms_common.py:298 forms_common.py:410
 #: forms_common.py:464 forms_common.py:534 models.py:917 models.py:930
-#: models.py:1414 models.py:1814 models.py:2110 models.py:2217 models.py:2666
-#: models.py:2859 models_imports.py:88 models_imports.py:113
+#: models.py:1458 models.py:1858 models.py:2167 models.py:2274 models.py:2723
+#: models.py:2916 models_imports.py:88 models_imports.py:113
 #: models_imports.py:412 models_imports.py:504 models_imports.py:760
 #: templates/ishtar/import_list.html:12
 #: templates/ishtar/sheet_organization.html:8
@@ -303,48 +300,48 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: forms_common.py:262 models.py:2089 models_imports.py:597
+#: forms_common.py:262 models.py:2146 models_imports.py:597
 msgid "Organization type"
 msgstr ""
 
-#: forms_common.py:264 forms_common.py:488 models.py:1931
+#: forms_common.py:264 forms_common.py:488 models.py:1988
 #: templates/ishtar/blocks/sheet_address_section.html:3
 msgid "Address"
 msgstr ""
 
-#: forms_common.py:266 forms_common.py:491 models.py:1932
+#: forms_common.py:266 forms_common.py:491 models.py:1989
 msgid "Address complement"
 msgstr ""
 
-#: forms_common.py:268 forms_common.py:492 models.py:1934
+#: forms_common.py:268 forms_common.py:492 models.py:1991
 msgid "Postal code"
 msgstr ""
 
-#: forms_common.py:271 forms_common.py:495 models.py:1937
+#: forms_common.py:271 forms_common.py:495 models.py:1994
 msgid "Country"
 msgstr ""
 
 #: forms_common.py:273 forms_common.py:412 forms_common.py:468
-#: forms_common.py:536 forms_common.py:660 models.py:1964
+#: forms_common.py:536 forms_common.py:660 models.py:2021
 msgid "Email"
 msgstr ""
 
-#: forms_common.py:274 forms_common.py:471 models.py:1949
+#: forms_common.py:274 forms_common.py:471 models.py:2006
 #: templates/ishtar/sheet_organization.html:11
 #: templates/ishtar/sheet_person.html:21
 #: templates/ishtar/wizard/wizard_person.html:17
 msgid "Phone"
 msgstr ""
 
-#: forms_common.py:275 forms_common.py:480 models.py:1961
+#: forms_common.py:275 forms_common.py:480 models.py:2018
 #: templates/ishtar/sheet_organization.html:12
 #: templates/ishtar/sheet_person.html:39
 #: templates/ishtar/wizard/wizard_person.html:35
 msgid "Mobile phone"
 msgstr ""
 
-#: forms_common.py:299 forms_common.py:413 forms_common.py:537 models.py:2112
-#: models.py:2589 models_imports.py:642
+#: forms_common.py:299 forms_common.py:413 forms_common.py:537 models.py:2169
+#: models.py:2646 models_imports.py:642
 #: templates/ishtar/blocks/window_tables/documents.html:8
 #: templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:20 templates/sheet_ope.html:85
@@ -368,7 +365,7 @@ msgstr ""
 msgid "Organization to merge"
 msgstr ""
 
-#: forms_common.py:411 forms_common.py:462 forms_common.py:535 models.py:2215
+#: forms_common.py:411 forms_common.py:462 forms_common.py:535 models.py:2272
 #: templates/ishtar/sheet_organization.html:19
 msgid "Surname"
 msgstr ""
@@ -386,26 +383,26 @@ msgstr ""
 msgid "Identity"
 msgstr ""
 
-#: forms_common.py:459 forms_common.py:867 forms_common.py:916 models.py:2209
-#: models.py:2211 models.py:2586 models_imports.py:598
+#: forms_common.py:459 forms_common.py:867 forms_common.py:916 models.py:2266
+#: models.py:2268 models.py:2643 models_imports.py:598
 #: templates/ishtar/blocks/window_tables/documents.html:7
 #: templates/sheet_ope.html:104
 msgid "Title"
 msgstr ""
 
-#: forms_common.py:460 models.py:2213
+#: forms_common.py:460 models.py:2270
 msgid "Salutation"
 msgstr ""
 
-#: forms_common.py:466 models.py:2219
+#: forms_common.py:466 models.py:2276
 msgid "Raw name"
 msgstr ""
 
-#: forms_common.py:469 models.py:1950
+#: forms_common.py:469 models.py:2007
 msgid "Phone description"
 msgstr ""
 
-#: forms_common.py:472 models.py:1952 models.py:1954
+#: forms_common.py:472 models.py:2009 models.py:2011
 msgid "Phone description 2"
 msgstr ""
 
@@ -413,11 +410,11 @@ msgstr ""
 msgid "Phone 2"
 msgstr ""
 
-#: forms_common.py:476 models.py:1958
+#: forms_common.py:476 models.py:2015
 msgid "Phone description 3"
 msgstr ""
 
-#: forms_common.py:478 models.py:1956
+#: forms_common.py:478 models.py:2013
 msgid "Phone 3"
 msgstr ""
 
@@ -425,23 +422,23 @@ msgstr ""
 msgid "Current organization"
 msgstr ""
 
-#: forms_common.py:497 models.py:1939
+#: forms_common.py:497 models.py:1996
 msgid "Other address: address"
 msgstr ""
 
-#: forms_common.py:500 models.py:1942
+#: forms_common.py:500 models.py:1999
 msgid "Other address: address complement"
 msgstr ""
 
-#: forms_common.py:502 models.py:1943
+#: forms_common.py:502 models.py:2000
 msgid "Other address: postal code"
 msgstr ""
 
-#: forms_common.py:504 models.py:1945
+#: forms_common.py:504 models.py:2002
 msgid "Other address: town"
 msgstr ""
 
-#: forms_common.py:506 models.py:1947
+#: forms_common.py:506 models.py:2004
 msgid "Other address: country"
 msgstr ""
 
@@ -457,7 +454,7 @@ msgstr ""
 msgid "Account search"
 msgstr ""
 
-#: forms_common.py:598 forms_common.py:638 forms_common.py:642 models.py:2162
+#: forms_common.py:598 forms_common.py:638 forms_common.py:642 models.py:2219
 msgid "Person type"
 msgstr ""
 
@@ -489,7 +486,7 @@ msgstr ""
 msgid "Send the new password by email?"
 msgstr ""
 
-#: forms_common.py:722 forms_common.py:735 models.py:2688
+#: forms_common.py:722 forms_common.py:735 models.py:2745
 msgid "Towns"
 msgstr ""
 
@@ -505,7 +502,7 @@ msgstr ""
 msgid "Documentation informations"
 msgstr ""
 
-#: forms_common.py:869 forms_common.py:917 models.py:2561 models_imports.py:599
+#: forms_common.py:869 forms_common.py:917 models.py:2618 models_imports.py:599
 msgid "Source type"
 msgstr ""
 
@@ -517,38 +514,38 @@ msgstr ""
 msgid "Internal reference"
 msgstr ""
 
-#: forms_common.py:877 models.py:2600
+#: forms_common.py:877 models.py:2657
 msgid "Numerical ressource (web address)"
 msgstr ""
 
-#: forms_common.py:878 models.py:2602
+#: forms_common.py:878 models.py:2659
 msgid "Receipt date"
 msgstr ""
 
-#: forms_common.py:880 models.py:2604 models_imports.py:792
+#: forms_common.py:880 models.py:2661 models_imports.py:792
 msgid "Creation date"
 msgstr ""
 
-#: forms_common.py:883 models.py:2607
+#: forms_common.py:883 models.py:2664
 msgid "Receipt date in documentation"
 msgstr ""
 
-#: forms_common.py:885 forms_common.py:921 models.py:436 models.py:2223
-#: models.py:2491 models.py:2614 models_imports.py:450
+#: forms_common.py:885 forms_common.py:921 models.py:436 models.py:2280
+#: models.py:2548 models.py:2671 models_imports.py:450
 msgid "Comment"
 msgstr ""
 
-#: forms_common.py:887 forms_common.py:920 models.py:1416 models.py:2613
+#: forms_common.py:887 forms_common.py:920 models.py:1460 models.py:2670
 #: models_imports.py:115 models_imports.py:343 models_imports.py:413
 #: templates/sheet_ope.html:128
 msgid "Description"
 msgstr ""
 
-#: forms_common.py:890 models.py:2615
+#: forms_common.py:890 models.py:2672
 msgid "Additional information"
 msgstr ""
 
-#: forms_common.py:892 forms_common.py:924 models.py:2617
+#: forms_common.py:892 forms_common.py:924 models.py:2674
 msgid "Has a duplicate"
 msgstr ""
 
@@ -563,7 +560,7 @@ msgid ""
 "p>"
 msgstr ""
 
-#: forms_common.py:913 forms_common.py:942 forms_common.py:977 models.py:2533
+#: forms_common.py:913 forms_common.py:942 forms_common.py:977 models.py:2590
 #: templates/ishtar/wizard/wizard_person_deletion.html:139
 msgid "Author"
 msgstr ""
@@ -576,7 +573,7 @@ msgstr ""
 msgid "Would you like to delete this documentation?"
 msgstr ""
 
-#: forms_common.py:950 models.py:2520 models.py:2530 models_imports.py:600
+#: forms_common.py:950 models.py:2577 models.py:2587 models_imports.py:600
 msgid "Author type"
 msgstr ""
 
@@ -588,7 +585,7 @@ msgstr ""
 msgid "There are identical authors."
 msgstr ""
 
-#: forms_common.py:988 models.py:2534 models.py:2596
+#: forms_common.py:988 models.py:2591 models.py:2653
 #: templates/ishtar/blocks/window_tables/documents.html:9
 #: templates/sheet_ope.html:106
 msgid "Authors"
@@ -606,7 +603,7 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
-#: ishtar_menu.py:39 models.py:1596 views.py:1684
+#: ishtar_menu.py:39 models.py:1640 views.py:1684
 msgid "Global variables"
 msgstr ""
 
@@ -662,7 +659,7 @@ msgstr ""
 msgid "This item already exists."
 msgstr ""
 
-#: models.py:428 models.py:1904 models.py:1916 models.py:2490
+#: models.py:428 models.py:1953 models.py:1969 models.py:2547
 #: models_imports.py:339
 msgid "Label"
 msgstr ""
@@ -677,7 +674,7 @@ msgid ""
 "letters, numbers and hyphens. Each slug must be unique."
 msgstr ""
 
-#: models.py:437 models.py:1821 models.py:2493 models_imports.py:129
+#: models.py:437 models.py:1865 models.py:2550 models_imports.py:129
 #: models_imports.py:509
 msgid "Available"
 msgstr ""
@@ -691,8 +688,8 @@ msgstr ""
 msgid "Specific key to an import"
 msgstr ""
 
-#: models.py:918 models.py:939 models.py:1274 models.py:2517 models.py:2787
-#: models.py:2844
+#: models.py:918 models.py:939 models.py:1318 models.py:2574 models.py:2844
+#: models.py:2901
 msgid "Order"
 msgstr ""
 
@@ -707,8 +704,9 @@ msgstr ""
 #: models.py:934
 msgid ""
 "Value of the key in the JSON schema. For hierarchical key use \"__\" to "
-"explain it. For instance the key 'my_subkey' with data such as {'my_key': "
-"{'my_subkey': 'value'}} will be reached with my_key__my_subkey."
+"explain it. For instance for the key 'my_subkey' with data such as "
+"{'my_key': {'my_subkey': 'value'}}, its value will be reached with "
+"my_key__my_subkey."
 msgstr ""
 
 #: models.py:938
@@ -716,7 +714,6 @@ msgid "Display"
 msgstr ""
 
 #: models.py:943
-#| msgid "No data provided"
 msgid "Json data - Field"
 msgstr ""
 
@@ -725,11 +722,10 @@ msgid "Json data - Fields"
 msgstr ""
 
 #: models.py:955
-msgid "Content type of the field and of the menu do not match"
+msgid "Content types of the field and of the menu do not match"
 msgstr ""
 
 #: models.py:1015
-#| msgid "Search"
 msgid "Search vector"
 msgstr ""
 
@@ -737,556 +733,553 @@ msgstr ""
 msgid "Auto filled at save"
 msgstr ""
 
-#: models.py:1099
+#: models.py:1142
 msgid "Last editor"
 msgstr ""
 
-#: models.py:1102
+#: models.py:1145
 msgid "Creator"
 msgstr ""
 
-#: models.py:1275
+#: models.py:1319
 msgid "Symmetrical"
 msgstr ""
 
-#: models.py:1276
+#: models.py:1320
 msgid "Tiny label"
 msgstr ""
 
-#: models.py:1279
+#: models.py:1323
 msgid "Inverse relation"
 msgstr ""
 
-#: models.py:1289
+#: models.py:1333
 msgid "Cannot have symmetrical and an inverse_relation"
 msgstr ""
 
-#: models.py:1406
+#: models.py:1450
 msgid "Euro"
 msgstr ""
 
-#: models.py:1407
+#: models.py:1451
 msgid "US dollar"
 msgstr ""
 
-#: models.py:1408 views.py:1486 views.py:1546
+#: models.py:1452 views.py:1486 views.py:1546
 msgid "Operations"
 msgstr ""
 
-#: models.py:1409 views.py:1488 views.py:1550
+#: models.py:1453 views.py:1488 views.py:1550
 msgid "Context records"
 msgstr ""
 
-#: models.py:1415 models.py:1815 models_imports.py:114
+#: models.py:1459 models.py:1859 models_imports.py:114
 msgid "Slug"
 msgstr ""
 
-#: models.py:1418
+#: models.py:1462
 msgid "CSS color code for base module"
 msgstr ""
 
-#: models.py:1420
+#: models.py:1464
 msgid "Files module"
 msgstr ""
 
-#: models.py:1422
+#: models.py:1466
 msgid "CSS color code for files module"
 msgstr ""
 
-#: models.py:1424
+#: models.py:1468
 msgid "Context records module"
 msgstr ""
 
-#: models.py:1427
+#: models.py:1471
 msgid "CSS color code for context record module"
 msgstr ""
 
-#: models.py:1429
+#: models.py:1473
 msgid "Finds module"
 msgstr ""
 
-#: models.py:1430
+#: models.py:1474
 msgid "Need context records module"
 msgstr ""
 
-#: models.py:1432
+#: models.py:1476
 msgid "Find index is based on"
 msgstr ""
 
-#: models.py:1434
+#: models.py:1478
 msgid ""
 "To prevent irrelevant indexes, change this parameter only if there is no "
 "find in the database"
 msgstr ""
 
-#: models.py:1437
+#: models.py:1481
 msgid "CSS color code for find module"
 msgstr ""
 
-#: models.py:1440
+#: models.py:1484
 msgid "Warehouses module"
 msgstr ""
 
-#: models.py:1441
+#: models.py:1485
 msgid "Need finds module"
 msgstr ""
 
-#: models.py:1443
+#: models.py:1487
 msgid "CSS code for warehouse module"
 msgstr ""
 
-#: models.py:1445
+#: models.py:1489
 msgid "Preservation module"
 msgstr ""
 
-#: models.py:1447
+#: models.py:1491
 msgid "Mapping module"
 msgstr ""
 
-#: models.py:1449
+#: models.py:1493
 msgid "CSS code for mapping module"
 msgstr ""
 
-#: models.py:1452
+#: models.py:1496
 msgid "Home page"
 msgstr ""
 
-#: models.py:1453
+#: models.py:1497
 #, 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:1457
+#: models.py:1501
 msgid "File external id"
 msgstr ""
 
-#: models.py:1459
+#: models.py:1503
 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:1464
+#: models.py:1508
 msgid "Parcel external id"
 msgstr ""
 
-#: models.py:1467
+#: models.py:1511
 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:1472
+#: models.py:1516
 msgid "Context record external id"
 msgstr ""
 
-#: models.py:1474
+#: models.py:1518
 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:1479
+#: models.py:1523
 msgid "Base find external id"
 msgstr ""
 
-#: models.py:1481
+#: models.py:1525
 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:1486
+#: models.py:1530
 msgid "Find external id"
 msgstr ""
 
-#: models.py:1488
+#: models.py:1532
 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:1493
+#: models.py:1537
 msgid "Container external id"
 msgstr ""
 
-#: models.py:1495
+#: models.py:1539
 msgid ""
 "Formula to manage container 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:1500
+#: models.py:1544
 msgid "Warehouse external id"
 msgstr ""
 
-#: models.py:1502
+#: models.py:1546
 msgid ""
 "Formula to manage warehouse 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:1507
+#: models.py:1551
 msgid "Raw name for person"
 msgstr ""
 
-#: models.py:1509
+#: models.py:1553
 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:1513
+#: models.py:1557
 msgid "Current active"
 msgstr ""
 
-#: models.py:1514
+#: models.py:1558
 msgid "Currency"
 msgstr ""
 
-#: models.py:1518
+#: models.py:1562
 msgid "Ishtar site profile"
 msgstr ""
 
-#: models.py:1519
+#: models.py:1563
 msgid "Ishtar site profiles"
 msgstr ""
 
-#: models.py:1589
+#: models.py:1633
 msgid "Variable name"
 msgstr ""
 
-#: models.py:1590
+#: models.py:1634
 msgid "Description of the variable"
 msgstr ""
 
-#: models.py:1592 models_imports.py:531
+#: models.py:1636 models_imports.py:531
 #: templates/ishtar/formset_import_match.html:22
 msgid "Value"
 msgstr ""
 
-#: models.py:1595
+#: models.py:1639
 msgid "Global variable"
 msgstr ""
 
-#: models.py:1719 models.py:1749
+#: models.py:1763 models.py:1793
 msgid "Total"
 msgstr ""
 
-#: models.py:1726 models.py:1905 models.py:1917
+#: models.py:1770 models.py:1954 models.py:1970
 #: templates/ishtar/dashboards/dashboard_main_detail.html:140
 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
 #: templates/ishtar/sheet_person.html:24
-#: templates/ishtar/wizard/wizard_person.html:20
 msgid "Number"
 msgstr ""
 
-#: models.py:1813
+#: models.py:1857
 msgid "Administrative Act"
 msgstr ""
 
-#: models.py:1820
+#: models.py:1864
 msgid "Associated object"
 msgstr ""
 
-#: models.py:1825
+#: models.py:1869
 msgid "Document template"
 msgstr ""
 
-#: models.py:1826
+#: models.py:1870
 msgid "Document templates"
 msgstr ""
 
-#: models.py:1908 models.py:1918 models.py:2882 models_imports.py:786
+#: models.py:1958 models.py:1971 models.py:2939 models_imports.py:786
 msgid "State"
 msgstr ""
 
-#: models.py:1922 models.py:2674 templates/blocks/JQueryAdvancedTown.html:12
+#: models.py:1976 models.py:2731 templates/blocks/JQueryAdvancedTown.html:12
 msgid "Department"
 msgstr ""
 
-#: models.py:1923
+#: models.py:1977
 msgid "Departments"
 msgstr ""
 
-#: models.py:1960
+#: models.py:2017
 msgid "Raw phone"
 msgstr ""
 
-#: models.py:1966
+#: models.py:2023
 msgid "Alternative address is prefered"
 msgstr ""
 
-#: models.py:2005
+#: models.py:2062
 msgid "Tel: "
 msgstr ""
 
-#: models.py:2009
+#: models.py:2066
 msgid "Mobile: "
 msgstr ""
 
-#: models.py:2013
+#: models.py:2070
 msgid "Email: "
 msgstr ""
 
-#: models.py:2018
+#: models.py:2075
 msgid "Merge key"
 msgstr ""
 
-#: models.py:2090
+#: models.py:2147
 msgid "Organization types"
 msgstr ""
 
-#: models.py:2117
+#: models.py:2174
 msgid "Organizations"
 msgstr ""
 
-#: models.py:2158
+#: models.py:2215
 msgid "Groups"
 msgstr ""
 
-#: models.py:2163
+#: models.py:2220
 msgid "Person types"
 msgstr ""
 
-#: models.py:2174 models_imports.py:632
+#: models.py:2231 models_imports.py:632
 msgid "Title type"
 msgstr ""
 
-#: models.py:2175
+#: models.py:2232
 msgid "Title types"
 msgstr ""
 
-#: models.py:2184
+#: models.py:2241
 msgid "Mr"
 msgstr ""
 
-#: models.py:2185
+#: models.py:2242
 msgid "Miss"
 msgstr ""
 
-#: models.py:2186
+#: models.py:2243
 msgid "Mr and Mrs"
 msgstr ""
 
-#: models.py:2187
+#: models.py:2244
 msgid "Mrs"
 msgstr ""
 
-#: models.py:2188
+#: models.py:2245
 msgid "Doctor"
 msgstr ""
 
-#: models.py:2221
+#: models.py:2278
 msgid "Contact type"
 msgstr ""
 
-#: models.py:2224 models.py:2288
+#: models.py:2281 models.py:2345
 msgid "Types"
 msgstr ""
 
-#: models.py:2227
+#: models.py:2284
 msgid "Is attached to"
 msgstr ""
 
-#: models.py:2232
+#: models.py:2289
 msgid "Persons"
 msgstr ""
 
-#: models.py:2429
+#: models.py:2486
 msgid "Advanced shortcut menu"
 msgstr ""
 
-#: models.py:2432
+#: models.py:2489
 msgid "Ishtar user"
 msgstr ""
 
-#: models.py:2433
+#: models.py:2490
 msgid "Ishtar users"
 msgstr ""
 
-#: models.py:2521
+#: models.py:2578
 msgid "Author types"
 msgstr ""
 
-#: models.py:2562
+#: models.py:2619
 msgid "Source types"
 msgstr ""
 
-#: models.py:2570 models_imports.py:631
+#: models.py:2627 models_imports.py:631
 msgid "Support type"
 msgstr ""
 
-#: models.py:2571
+#: models.py:2628
 msgid "Support types"
 msgstr ""
 
-#: models.py:2578
+#: models.py:2635
 msgid "Format type"
 msgstr ""
 
-#: models.py:2579
+#: models.py:2636
 msgid "Format types"
 msgstr ""
 
-#: models.py:2587
+#: models.py:2644
 msgid "External ID"
 msgstr ""
 
-#: models.py:2590
+#: models.py:2647
 msgid "Support"
 msgstr ""
 
-#: models.py:2592 models_imports.py:601
+#: models.py:2649 models_imports.py:601
 msgid "Format"
 msgstr ""
 
-#: models.py:2594
+#: models.py:2651
 msgid "Scale"
 msgstr ""
 
-#: models.py:2608
+#: models.py:2665
 msgid "Item number"
 msgstr ""
 
-#: models.py:2609
+#: models.py:2666
 msgid "Ref."
 msgstr ""
 
-#: models.py:2612
+#: models.py:2669
 msgid "Internal ref."
 msgstr ""
 
-#: models.py:2667
+#: models.py:2724
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:2668 templates/sheet_ope.html:46 templates/sheet_ope.html:107
+#: models.py:2725 templates/sheet_ope.html:46 templates/sheet_ope.html:107
 msgid "Localisation"
 msgstr ""
 
-#: models.py:2676
-#| msgid "Person modification"
+#: models.py:2733
 msgid "Year of creation"
 msgstr ""
 
-#: models.py:2677
-msgid "Filling this field is relevant to distinguish old towns to new towns."
+#: models.py:2734
+msgid "Filling this field is relevant to distinguish old towns from new towns."
 msgstr ""
 
-#: models.py:2682
-#| msgid "Field name"
+#: models.py:2739
 msgid "Cached name"
 msgstr ""
 
-#: models.py:2788
+#: models.py:2845
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:2791 models_imports.py:602
+#: models.py:2848 models_imports.py:602
 msgid "Operation type"
 msgstr ""
 
-#: models.py:2792
+#: models.py:2849
 msgid "Operation types"
 msgstr ""
 
-#: models.py:2822
+#: models.py:2879
 msgid "Preventive"
 msgstr ""
 
-#: models.py:2823
+#: models.py:2880
 msgid "Research"
 msgstr ""
 
-#: models.py:2846
+#: models.py:2903
 msgid "Authority name"
 msgstr ""
 
-#: models.py:2847
+#: models.py:2904
 msgid "Authority SRID"
 msgstr ""
 
-#: models.py:2850 models_imports.py:630
+#: models.py:2907 models_imports.py:630
 msgid "Spatial reference system"
 msgstr ""
 
-#: models.py:2851
+#: models.py:2908
 msgid "Spatial reference systems"
 msgstr ""
 
-#: models.py:2858
+#: models.py:2915
 msgid "Filename"
 msgstr ""
 
-#: models.py:2863
+#: models.py:2920
 msgid "Administration script"
 msgstr ""
 
-#: models.py:2864
+#: models.py:2921
 msgid "Administration scripts"
 msgstr ""
 
-#: models.py:2871
+#: models.py:2928
 msgid "Scheduled"
 msgstr ""
 
-#: models.py:2872
+#: models.py:2929
 msgid "In progress"
 msgstr ""
 
-#: models.py:2873 models_imports.py:747
+#: models.py:2930 models_imports.py:747
 msgid "Finished with errors"
 msgstr ""
 
-#: models.py:2874 models_imports.py:748
+#: models.py:2931 models_imports.py:748
 msgid "Finished"
 msgstr ""
 
-#: models.py:2887
+#: models.py:2944
 msgid "Result"
 msgstr ""
 
-#: models.py:2890
+#: models.py:2947
 msgid "Administration task"
 msgstr ""
 
-#: models.py:2891
+#: models.py:2948
 msgid "Administration tasks"
 msgstr ""
 
-#: models.py:2895
+#: models.py:2952
 msgid "Unknown"
 msgstr ""
 
-#: models.py:2910
+#: models.py:2967
 msgid ""
 "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your "
 "administrator."
 msgstr ""
 
-#: models.py:2919
+#: models.py:2976
 msgid ""
 "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to "
 "relative paths, it can be a security issue and this is not allowed. Only put "
 "a full path."
 msgstr ""
 
-#: models.py:2930
+#: models.py:2987
 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory."
 msgstr ""
 
-#: models.py:2946
+#: models.py:3003
 msgid ""
 "Script \"{}\" is not available in your script directory. Check your "
 "configuration."
@@ -1431,11 +1424,13 @@ msgid "False"
 msgstr ""
 
 #: models_imports.py:505
-msgid "All user can user it"
+#| msgid "All user can use it"
+msgid "All users can use it"
 msgstr ""
 
 #: models_imports.py:507
-msgid "All user can modify it"
+#| msgid "All user can modify it"
+msgid "All users can modify it"
 msgstr ""
 
 #: models_imports.py:512
@@ -1499,7 +1494,6 @@ msgid "Treatment type"
 msgstr ""
 
 #: models_imports.py:617
-#| msgid "Treatment type"
 msgid "Treatment emergency type"
 msgstr ""
 
@@ -1516,12 +1510,10 @@ msgid "Remarkability type"
 msgstr ""
 
 #: models_imports.py:622
-#| msgid "Operation type"
 msgid "Alteration type"
 msgstr ""
 
 #: models_imports.py:624
-#| msgid "Operation type"
 msgid "Alteration cause type"
 msgstr ""
 
@@ -2381,6 +2373,11 @@ msgstr ""
 msgid "Adminact: operator of archaeological operations"
 msgstr ""
 
+#: templates/ishtar/wizard/wizard_person.html:20
+msgctxt "phone number"
+msgid "Number"
+msgstr ""
+
 #: templates/ishtar/wizard/wizard_person_deletion.html:33
 msgid "Scientist in charge of archaeological files"
 msgstr ""
@@ -2813,13 +2810,13 @@ msgstr ""
 
 #: views.py:99
 msgid ""
-"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask "
+"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
 "your admin to do it)."
 msgstr ""
 
 #: views.py:104
 msgid ""
-"The slug of your current profile is set to \"default\" change it on the "
+"The slug of your current profile is set to \"default\". Change it on the "
 "administration page (or ask your admin to do it)."
 msgstr ""
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index aab532cfc..12dbf9069 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -934,9 +934,9 @@ class JsonDataField(models.Model):
     key = models.CharField(
         _(u"Key"), max_length=200,
         help_text=_(u"Value of the key in the JSON schema. For hierarchical "
-                    u"key use \"__\" to explain it. For instance the key "
+                    u"key use \"__\" to explain it. For instance for the key "
                     u"'my_subkey' with data such as {'my_key': {'my_subkey': "
-                    u"'value'}} will be reached with my_key__my_subkey."))
+                    u"'value'}}, its value will be reached with my_key__my_subkey."))
     display = models.BooleanField(_(u"Display"), default=True)
     order = models.IntegerField(_(u"Order"), default=10)
     section = models.ForeignKey(JsonDataSection, blank=True, null=True)
@@ -954,7 +954,7 @@ class JsonDataField(models.Model):
             return
         if self.section.content_type != self.content_type:
             raise ValidationError(
-                _(u"Content type of the field and of the menu do not match"))
+                _(u"Content types of the field and of the menu do not match"))
 
 
 class JsonData(models.Model):
@@ -2859,7 +2859,7 @@ class Town(Imported, models.Model):
     year = models.IntegerField(
         _("Year of creation"), null=True, blank=True,
         help_text=_(u"Filling this field is relevant to distinguish old towns "
-                    u"to new towns."))
+                    u"from new towns."))
     children = models.ManyToManyField(
         'Town', verbose_name=_(u"Town children"), blank=True,
         related_name='parents')
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 01a64da22..012472b8d 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -502,9 +502,9 @@ class TargetKeyGroup(models.Model):
     Group of target keys for imports.
     """
     name = models.TextField(_(u"Name"), unique=True)
-    all_user_can_use = models.BooleanField(_(u"All user can user it"),
+    all_user_can_use = models.BooleanField(_(u"All users can use it"),
                                            default=False)
-    all_user_can_modify = models.BooleanField(_(u"All user can modify it"),
+    all_user_can_modify = models.BooleanField(_(u"All users can modify it"),
                                               default=False)
     available = models.BooleanField(_(u"Available"), default=True)
 
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person.html b/ishtar_common/templates/ishtar/wizard/wizard_person.html
index 85bbfc75e..e518ecc3d 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_person.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person.html
@@ -17,7 +17,7 @@
   <caption>{% trans "Phone" %}</caption>
   <tr>
     <th>{% trans "Phone type" %}</th>
-    <th>{% trans "Number" %}</th>
+    <th>{% trans "Number" context "phone number" %}</th>
   </tr>
   <tr>
     <td>{{ wizard.form.phone_desc.errors }}{{wizard.form.phone_desc|safe}}</td>
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index d8c5b1997..613e02a61 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -96,12 +96,12 @@ def index(request):
     dct = {'warnings': []}
     if settings.PROJECT_SLUG == 'default':
         dct['warnings'].append(_(
-            u"PROJECT_SLUG is set to \"default\" change it in your "
+            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"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: