Merge branch 'master' into master-trad

4 files changed, 132 insertions, 106 deletions

diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index cb8de7327..e281d0e4f 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -1868,7 +1868,7 @@ msgid "where the magic happens."
 msgstr ""
 
 #: templates/window.html:40 templates/blocks/JQueryJqGrid.html:28
-#: templates/ishtar/manage_basket.html:9
+#: templates/ishtar/manage_basket.html:12
 msgid "Add"
 msgstr ""
 
@@ -1995,11 +1995,11 @@ msgstr ""
 msgid "Control file"
 msgstr ""
 
-#: templates/ishtar/manage_basket.html:7
-msgid "Checking \"Select all\" only select the current page."
+#: templates/ishtar/manage_basket.html:9
+msgid "Checking \"Select all\" only selects the current page."
 msgstr ""
 
-#: templates/ishtar/manage_basket.html:10
+#: templates/ishtar/manage_basket.html:13
 msgid "Basket content"
 msgstr ""
 
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 976d7aace..58106a58b 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-01-09 05:29-0500\n"
+"PO-Revision-Date: 2017-01-09 05:41-0500\n"
 "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -21,7 +21,7 @@ msgid "Context record"
 msgstr "Unité d'Enregistrement"
 
 #: forms.py:121 ishtar_menu.py:32 models_finds.py:466 models_finds.py:791
-#: models_finds.py:800 models_treatments.py:264
+#: models_finds.py:800 models_treatments.py:265
 #: templates/ishtar/sheet_find.html:5
 msgid "Find"
 msgstr "Mobilier"
@@ -134,7 +134,7 @@ msgstr "Date de vérification"
 
 #: forms.py:180 forms_treatments.py:131 forms_treatments.py:418
 #: models_finds.py:132 models_finds.py:446 models_treatments.py:122
-#: models_treatments.py:467
+#: models_treatments.py:468
 msgid "Comment"
 msgstr "Commentaires"
 
@@ -168,13 +168,13 @@ msgid "Period"
 msgstr "Période"
 
 #: forms.py:232 forms_treatments.py:137 forms_treatments.py:420
-#: models_finds.py:805 models_treatments.py:125 models_treatments.py:275
-#: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:141
+#: models_finds.py:805 models_treatments.py:125 models_treatments.py:276
+#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142
 msgid "Start date"
 msgstr "Date de début"
 
-#: forms.py:234 models_finds.py:806 models_treatments.py:276
-#: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142
+#: forms.py:234 models_finds.py:806 models_treatments.py:277
+#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:143
 msgid "End date"
 msgstr "Date de fin"
 
@@ -200,7 +200,7 @@ msgstr "ID complet"
 
 #: forms.py:266 forms_treatments.py:53 forms_treatments.py:95
 #: forms_treatments.py:268 forms_treatments.py:340 forms_treatments.py:390
-#: forms_treatments.py:473 models_treatments.py:98 models_treatments.py:439
+#: forms_treatments.py:473 models_treatments.py:98 models_treatments.py:440
 msgid "Year"
 msgstr "Année"
 
@@ -309,7 +309,7 @@ msgid "Basket"
 msgstr "Panier"
 
 #: forms_treatments.py:51 forms_treatments.py:91 models_treatments.py:94
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136
+#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137
 msgid "Label"
 msgstr "Intitulé"
 
@@ -320,13 +320,13 @@ msgstr "Autre réf."
 #: forms_treatments.py:54 forms_treatments.py:221 forms_treatments.py:269
 #: forms_treatments.py:332 forms_treatments.py:341 forms_treatments.py:443
 #: forms_treatments.py:474 forms_treatments.py:541 models_treatments.py:100
-#: models_treatments.py:441
+#: models_treatments.py:442
 msgid "Index"
 msgstr "Index"
 
 #: forms_treatments.py:55 forms_treatments.py:100 forms_treatments.py:285
 #: forms_treatments.py:562 models_treatments.py:56 models_treatments.py:105
-#: models_treatments.py:274
+#: models_treatments.py:275
 msgid "Treatment type"
 msgstr "Type de traitement"
 
@@ -354,7 +354,7 @@ msgstr "Responsable"
 msgid "Organization"
 msgstr "Organisation"
 
-#: forms_treatments.py:118 models_treatments.py:110 models_treatments.py:277
+#: forms_treatments.py:118 models_treatments.py:110 models_treatments.py:278
 msgid "Location"
 msgstr "Lieu"
 
@@ -371,7 +371,7 @@ msgid "Goal"
 msgstr "But"
 
 #: forms_treatments.py:139 forms_treatments.py:426 models_treatments.py:126
-#: models_treatments.py:461
+#: models_treatments.py:462
 msgid "Closing date"
 msgstr "Date de clôture"
 
@@ -405,7 +405,7 @@ msgid "Associated request"
 msgstr "Demande associée"
 
 #: forms_treatments.py:250 forms_treatments.py:381 ishtar_menu.py:107
-#: models_treatments.py:472 models_treatments.py:494 models_treatments.py:555
+#: models_treatments.py:473 models_treatments.py:495 models_treatments.py:556
 #: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5
 msgid "Treatment request"
 msgstr "Demande de traitement"
@@ -464,7 +464,7 @@ msgstr "Référence interne du traitement"
 msgid "Modified by"
 msgstr "Modifié par"
 
-#: forms_treatments.py:338 forms_treatments.py:388 models_treatments.py:446
+#: forms_treatments.py:338 forms_treatments.py:388 models_treatments.py:447
 msgid "Name"
 msgstr "Nom"
 
@@ -473,8 +473,8 @@ msgid "Internal ref."
 msgstr "Réf. interne"
 
 #: forms_treatments.py:342 forms_treatments.py:399
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137
-#: templates/ishtar/sheet_find.html:215
+#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:216
 msgid "Type"
 msgstr "Type"
 
@@ -482,12 +482,12 @@ msgstr "Type"
 msgid "In charge"
 msgstr "Responsable"
 
-#: forms_treatments.py:350 forms_treatments.py:407 models_treatments.py:455
+#: forms_treatments.py:350 forms_treatments.py:407 models_treatments.py:456
 #: templates/ishtar/sheet_treatmentfile.html:31
 msgid "Applicant"
 msgstr "Demandeur"
 
-#: forms_treatments.py:356 forms_treatments.py:413 models_treatments.py:459
+#: forms_treatments.py:356 forms_treatments.py:413 models_treatments.py:460
 #: templates/ishtar/sheet_treatmentfile.html:38
 msgid "Applicant organisation"
 msgstr "Organisation du demandeur"
@@ -496,7 +496,7 @@ msgstr "Organisation du demandeur"
 msgid "Treatment request search"
 msgstr "Rechercher une demande de traitement"
 
-#: forms_treatments.py:423 models_treatments.py:465
+#: forms_treatments.py:423 models_treatments.py:466
 msgid "Reception date"
 msgstr "Date de réception"
 
@@ -528,8 +528,8 @@ msgstr "Index de la demande de traitement"
 msgid "Treatment request internal reference"
 msgstr "Référence interne de la demande de traitement"
 
-#: forms_treatments.py:492 forms_treatments.py:588 models_treatments.py:424
-#: models_treatments.py:447
+#: forms_treatments.py:492 forms_treatments.py:588 models_treatments.py:425
+#: models_treatments.py:449
 msgid "Treatment request type"
 msgstr "Type de demande de traitement"
 
@@ -575,8 +575,8 @@ msgstr "Documentation"
 msgid "Administrative act"
 msgstr "Acte administratif"
 
-#: ishtar_menu.py:149 ishtar_menu.py:230 templates/ishtar/sheet_find.html:210
-#: templates/ishtar/sheet_find.html:212
+#: ishtar_menu.py:149 ishtar_menu.py:230 templates/ishtar/sheet_find.html:211
+#: templates/ishtar/sheet_find.html:213
 msgid "Documents"
 msgstr "Documents"
 
@@ -584,8 +584,8 @@ msgstr "Documents"
 msgid "Source"
 msgstr "Documentation"
 
-#: ishtar_menu.py:183 models_treatments.py:134 models_treatments.py:266
-#: models_treatments.py:539 templates/ishtar/sheet_treatment.html:5
+#: ishtar_menu.py:183 models_treatments.py:135 models_treatments.py:267
+#: models_treatments.py:540 templates/ishtar/sheet_treatment.html:5
 msgid "Treatment"
 msgstr "Traitement"
 
@@ -650,7 +650,7 @@ msgid "Batch"
 msgstr "Lot"
 
 #: models_finds.py:128 models_finds.py:390 models_treatments.py:120
-#: models_treatments.py:444
+#: models_treatments.py:445
 msgid "External ID"
 msgstr "ID externe"
 
@@ -747,8 +747,8 @@ msgid "Periods"
 msgstr "Périodes"
 
 #: models_finds.py:316 models_finds.py:421 models_treatments.py:127
-#: models_treatments.py:278 templates/ishtar/sheet_find.html:100
-#: templates/ishtar/sheet_find.html:140
+#: models_treatments.py:279 templates/ishtar/sheet_find.html:101
+#: templates/ishtar/sheet_find.html:141
 msgid "Container"
 msgstr "Contenant"
 
@@ -780,7 +780,7 @@ msgstr "Mobilier de base - Intérêt spécifique"
 msgid "Base find - Discovery date"
 msgstr "Mobilier de base - Date de découverte"
 
-#: models_finds.py:393 models_treatments.py:40 models_treatments.py:270
+#: models_finds.py:393 models_treatments.py:40 models_treatments.py:271
 msgid "Order"
 msgstr "Ordre"
 
@@ -792,11 +792,11 @@ msgstr "Mesures de conservation à envisager"
 msgid "Weight unit"
 msgstr "Unité de poids"
 
-#: models_finds.py:414 templates/ishtar/sheet_find.html:89
+#: models_finds.py:414 templates/ishtar/sheet_find.html:90
 msgid "Upstream treatment"
 msgstr "Traitement amont"
 
-#: models_finds.py:417 templates/ishtar/sheet_find.html:129
+#: models_finds.py:417 templates/ishtar/sheet_find.html:130
 msgid "Downstream treatment"
 msgstr "Traitement aval"
 
@@ -804,7 +804,7 @@ msgstr "Traitement aval"
 msgid "Collection"
 msgstr "Collection"
 
-#: models_finds.py:460 models_treatments.py:130 models_treatments.py:468
+#: models_finds.py:460 models_treatments.py:131 models_treatments.py:469
 msgid "Cached name"
 msgstr "Nom en cache"
 
@@ -906,102 +906,102 @@ msgstr ""
 msgid "Target a basket"
 msgstr "Cibler un panier"
 
-#: models_treatments.py:135 templates/ishtar/sheet_find.html:86
+#: models_treatments.py:136 templates/ishtar/sheet_find.html:87
 #: templates/ishtar/sheet_treatmentfile.html:45
 msgid "Treatments"
 msgstr "Traitements"
 
-#: models_treatments.py:138
+#: models_treatments.py:139
 msgid "Can view all Treatments"
 msgstr "Peut voir tous les Traitements"
 
-#: models_treatments.py:139
+#: models_treatments.py:140
 msgid "Can view own Treatment"
 msgstr "Peut voir son propre Traitement"
 
-#: models_treatments.py:140
+#: models_treatments.py:141
 msgid "Can add own Treatment"
 msgstr "Peut ajouter son propre Traitement"
 
-#: models_treatments.py:141
+#: models_treatments.py:142
 msgid "Can change own Treatment"
 msgstr "Peut modifier son propre Traitement"
 
-#: models_treatments.py:142
+#: models_treatments.py:143
 msgid "Can delete own Treatment"
 msgstr "Peut supprimer son propre Traitement"
 
-#: models_treatments.py:154
+#: models_treatments.py:155
 msgid "TREATMENT"
 msgstr "TRAITEMENT"
 
-#: models_treatments.py:279 templates/ishtar/sheet_find.html:99
-#: templates/ishtar/sheet_find.html:139
+#: models_treatments.py:280 templates/ishtar/sheet_find.html:100
+#: templates/ishtar/sheet_find.html:140
 msgid "Doer"
 msgstr "Opérateur"
 
-#: models_treatments.py:280 models_treatments.py:281
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138
+#: models_treatments.py:281 models_treatments.py:282
+#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:139
 msgid "Related finds"
 msgstr "Mobilier associé"
 
-#: models_treatments.py:413
+#: models_treatments.py:414
 msgid "Is upstream"
 msgstr "Est en amont"
 
-#: models_treatments.py:425
+#: models_treatments.py:426
 msgid "Treatment request types"
 msgstr "Types de demande de traitement"
 
-#: models_treatments.py:442
+#: models_treatments.py:443
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: models_treatments.py:451
+#: models_treatments.py:452
 msgid "Person in charge"
 msgstr "Personne responsable"
 
-#: models_treatments.py:463
+#: models_treatments.py:464
 msgid "Creation date"
 msgstr "Date de création"
 
-#: models_treatments.py:473
+#: models_treatments.py:474
 msgid "Treatment requests"
 msgstr "Demandes de traitement"
 
-#: models_treatments.py:477
+#: models_treatments.py:478
 msgid "Can view all Treatment requests"
 msgstr "Peut voir toutes les Demandes de traitement"
 
-#: models_treatments.py:479
+#: models_treatments.py:480
 msgid "Can view own Treatment request"
 msgstr "Peut voir sa propre Demande de traitement"
 
-#: models_treatments.py:481
+#: models_treatments.py:482
 msgid "Can add own Treatment request"
 msgstr "Peut ajouter sa propre Demande de traitement"
 
-#: models_treatments.py:483
+#: models_treatments.py:484
 msgid "Can change own Treatment request"
 msgstr "Peut modifier sa propre Demande de traitement"
 
-#: models_treatments.py:485
+#: models_treatments.py:486
 msgid "Can delete own Treatment request"
 msgstr "Peut supprimer sa propre Demande de traitement"
 
-#: models_treatments.py:545
+#: models_treatments.py:546
 msgid "Treatment documentation"
 msgstr "Documentation de traitement"
 
-#: models_treatments.py:546
+#: models_treatments.py:547
 msgid "Treament documentations"
 msgstr "Documentations de traitement"
 
-#: models_treatments.py:562
+#: models_treatments.py:563
 msgid "Treatment request documentation"
 msgstr "Documentation de demande de traitement"
 
-#: models_treatments.py:563
+#: models_treatments.py:564
 msgid "Treatment request documentations"
 msgstr "Documentations de demande de traitement"
 
@@ -1130,34 +1130,34 @@ msgid "Operation"
 msgstr "Opération"
 
 #: templates/ishtar/sheet_find.html:79
-msgid "Localisation"
-msgstr "Localisation"
+msgid "Warehouse"
+msgstr "Dépôt"
 
-#: templates/ishtar/sheet_find.html:95 templates/ishtar/sheet_find.html:135
+#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136
 msgid "Year - index"
 msgstr "Année - index"
 
-#: templates/ishtar/sheet_find.html:125
+#: templates/ishtar/sheet_find.html:126
 msgid "Export as CSV"
 msgstr "Export en CSV"
 
-#: templates/ishtar/sheet_find.html:125 templates/ishtar/sheet_find.html:166
+#: templates/ishtar/sheet_find.html:126 templates/ishtar/sheet_find.html:167
 msgid "CSV"
 msgstr "CSV"
 
-#: templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:172
 msgid "Associated base finds"
 msgstr "Mobilier de base associé"
 
-#: templates/ishtar/sheet_find.html:214
+#: templates/ishtar/sheet_find.html:215
 msgid "Title"
 msgstr "Titre"
 
-#: templates/ishtar/sheet_find.html:216
+#: templates/ishtar/sheet_find.html:217
 msgid "Authors"
 msgstr "Auteurs"
 
-#: templates/ishtar/sheet_find.html:217
+#: templates/ishtar/sheet_find.html:218
 msgid "Link"
 msgstr "Lien"
 
@@ -1170,12 +1170,12 @@ msgid "Find source"
 msgstr "Documentation associée au mobilier"
 
 #: templates/ishtar/sheet_treatment.html:20
-#: templates/ishtar/sheet_treatmentfile.html:16
+msgctxt "Treatment"
 msgid "Closed"
 msgstr "Clôturé"
 
 #: templates/ishtar/sheet_treatment.html:22
-#: templates/ishtar/sheet_treatmentfile.html:18
+msgctxt "Treatment"
 msgid "Active"
 msgstr "Actif"
 
@@ -1183,6 +1183,16 @@ msgstr "Actif"
 msgid "Downstream finds"
 msgstr "Mobilier  aval"
 
+#: templates/ishtar/sheet_treatmentfile.html:16
+msgctxt "Treatment request"
+msgid "Closed"
+msgstr "Clôturée"
+
+#: templates/ishtar/sheet_treatmentfile.html:18
+msgctxt "Treatment request"
+msgid "Active"
+msgstr "Active"
+
 #: templates/ishtar/sheet_treatmentfilesource.html:4
 msgid "Treatment request source"
 msgstr "Documentation de demande de traitement"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index ed1e8e1ec..4f32658d1 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -9,19 +9,19 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-01-09 05:29-0500\n"
+"PO-Revision-Date: 2017-01-09 05:42-0500\n"
 "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Zanata 3.9.6\n"
 
-#: forms.py:35 forms.py:91 forms.py:156 ishtar_menu.py:39 models.py:60
-#: models.py:88 models.py:156 templates/ishtar/sheet_warehouse.html:4
+#: forms.py:35 forms.py:91 ishtar_menu.py:39 models.py:60 models.py:88
+#: templates/ishtar/sheet_warehouse.html:4
 msgid "Warehouse"
 msgstr "Dépôt"
 
-#: forms.py:44 forms.py:49 models.py:230
+#: forms.py:44 forms.py:49 models.py:234
 msgid "Division"
 msgstr "Division"
 
@@ -53,7 +53,7 @@ msgstr "Rechercher un dépôt"
 msgid "Person in charge"
 msgstr "Responsable"
 
-#: forms.py:106 forms.py:161 models.py:51 models.py:161
+#: forms.py:106 forms.py:168 models.py:51 models.py:165
 msgid "Comment"
 msgstr "Commentaires"
 
@@ -85,60 +85,68 @@ msgstr "Téléphone mobile"
 msgid "Would you like to delete this warehouse?"
 msgstr "Voulez-vous supprimer ce dépôt ?"
 
-#: forms.py:150 models.py:169 models.py:228
+#: forms.py:150 models.py:173 models.py:232
 #: templates/ishtar/sheet_container.html:4
 msgid "Container"
 msgstr "Contenant"
 
-#: forms.py:153 forms.py:213 models.py:127
+#: forms.py:154 forms.py:220 models.py:127
 msgid "Ref."
 msgstr "Réf."
 
-#: forms.py:154 forms.py:212 models.py:130 models.py:159
+#: forms.py:155 forms.py:219 models.py:130 models.py:163
 msgid "Container type"
 msgstr "Type de contenant"
 
-#: forms.py:187
+#: forms.py:157
+msgid "Current location (warehouse)"
+msgstr "Lieu actuel (dépôt)"
+
+#: forms.py:163 models.py:160
+msgid "Responsible warehouse"
+msgstr "Dépôt responsable"
+
+#: forms.py:194
 msgid "Index"
 msgstr "Index"
 
-#: forms.py:205
+#: forms.py:212
 msgid "This ID already exists for this warehouse."
 msgstr "Cet identifiant existe déjà pour ce dépôt."
 
-#: forms.py:223 forms.py:229 views.py:127
+#: forms.py:230 forms.py:236 views.py:127
 msgid "Container search"
 msgstr "Rechercher un contenant"
 
-#: forms.py:225 forms.py:231
+#: forms.py:232 forms.py:238
 msgid "You should select a container."
 msgstr "Vous devez sélectionner un contenant."
 
-#: forms.py:226
+#: forms.py:233
 msgid "Add a new container"
 msgstr "Ajouter un nouveau contenant"
 
-#: forms.py:236 ishtar_menu.py:35 views.py:93
+#: forms.py:243 ishtar_menu.py:35 views.py:93
 msgid "Packaging"
 msgstr "Conditionnement"
 
-#: forms.py:242
+#: forms.py:249
 msgid "Packager"
 msgstr "Personne assurant le conditionnement"
 
-#: forms.py:248
+#: forms.py:255
 msgid "Date"
 msgstr "Date"
 
-#: forms.py:252
+#: forms.py:259
 msgid "Packaged finds"
 msgstr "Mobilier conditionné"
 
-#: forms.py:256 models.py:162
+#: forms.py:263 models.py:166
 msgid "Localisation"
 msgstr "Localisation"
 
-#: forms.py:280 forms.py:281
+#: forms.py:287 forms.py:288
 msgid "Would you like to delete this container?"
 msgstr "Voulez-vous supprimer ce contenant ?"
 
@@ -162,7 +170,7 @@ msgstr "Modification"
 msgid "Deletion"
 msgstr "Suppression"
 
-#: ishtar_menu.py:55 models.py:170 templates/ishtar/sheet_warehouse.html:17
+#: ishtar_menu.py:55 models.py:174 templates/ishtar/sheet_warehouse.html:17
 msgid "Containers"
 msgstr "Contenants"
 
@@ -242,23 +250,27 @@ msgstr "Localisation précise"
 msgid "Type"
 msgstr "Type"
 
-#: models.py:160
+#: models.py:157
+msgid "Location (warehouse)"
+msgstr "Lieu (dépôt)"
+
+#: models.py:164
 msgid "Container ref."
 msgstr "Réf. du contenant"
 
-#: models.py:164
+#: models.py:168
 msgid "Cached location"
 msgstr "Lieu - en cache"
 
-#: models.py:231
+#: models.py:235
 msgid "Reference"
 msgstr "Référence"
 
-#: models.py:234
+#: models.py:238
 msgid "Container localisation"
 msgstr "Localisation de contenant"
 
-#: models.py:235
+#: models.py:239
 msgid "Container localisations"
 msgstr "Localisations de contenant"
 
@@ -286,10 +298,14 @@ msgstr "Modifier un contenant"
 msgid "Container deletion"
 msgstr "Supprimer un contenant"
 
-#: templates/ishtar/sheet_container.html:17
+#: templates/ishtar/sheet_container.html:19
 msgid "Content"
 msgstr "Contenu"
 
+#: templates/ishtar/sheet_warehouse.html:22
+msgid "Attached containers"
+msgstr "Contenants associés"
+
 #: templates/ishtar/wizard/wizard_containerlocalisation.html:5
 msgid ""
 "No division set for this warehouse. Define it to localise container in this "
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index 82736e41b..269ddb6eb 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -11,8 +11,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-01-09 05:34-0500\n"
-"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
+"PO-Revision-Date: 2017-01-09 05:43-0500\n"
+"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -1920,7 +1920,7 @@ msgid "where the magic happens."
 msgstr "c'est là que la magie opère."
 
 #: templates/window.html:40 templates/blocks/JQueryJqGrid.html:28
-#: templates/ishtar/manage_basket.html:9
+#: templates/ishtar/manage_basket.html:12
 msgid "Add"
 msgstr "Ajouter"
 
@@ -2049,11 +2049,11 @@ msgstr "Fichier source"
 msgid "Control file"
 msgstr "Fichier de contrôle"
 
-#: templates/ishtar/manage_basket.html:7
-msgid "Checking \"Select all\" only select the current page."
+#: templates/ishtar/manage_basket.html:9
+msgid "Checking \"Select all\" only selects the current page."
 msgstr "Cocher « Tout sélectionner » sélectionne seulement la page courante."
 
-#: templates/ishtar/manage_basket.html:10
+#: templates/ishtar/manage_basket.html:13
 msgid "Basket content"
 msgstr "Contenu du panier"