From 4d0f2d92f4a9f8568316116cdd0a28ca18a6ac9b Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 23 Jun 2011 22:45:00 +0200
Subject: [PATCH] add can_play_all_items permission to mediaitem, use it to
 restrict playing, fix some field length, fix more image links

---
 telemeta/htdocs/css/player.css                |   1 -
 telemeta/locale/de/LC_MESSAGES/django.mo      | Bin 420 -> 420 bytes
 telemeta/locale/de/LC_MESSAGES/django.po      | 158 ++++++++---------
 telemeta/locale/fr/LC_MESSAGES/django.mo      | Bin 12993 -> 12967 bytes
 telemeta/locale/fr/LC_MESSAGES/django.po      | 163 +++++++++---------
 telemeta/models/media.py                      |   3 +
 telemeta/templates/telemeta_default/base.html |   4 +-
 .../telemeta_default/collection_detail.html   |   9 +-
 telemeta/templates/telemeta_default/home.html |   2 +-
 .../telemeta_default/mediaitem_add.html       |   4 +-
 .../telemeta_default/mediaitem_copy.html      |   2 +-
 .../telemeta_default/mediaitem_detail.html    |  22 +--
 .../telemeta_default/mediaitem_edit.html      |   4 +-
 .../mediaitem_keywords_edit.html              |   2 +-
 .../telemeta_default/mediaitem_list.html      |   2 +-
 .../mediaitem_performances_edit.html          |   2 +-
 telemeta/web/base.py                          |   4 +-
 17 files changed, 190 insertions(+), 192 deletions(-)

diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index a8d5d251..3e126a1a 100644
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -41,7 +41,6 @@
      position: relative;
     top: -1px;
     line-height: 1.5em;
-   
 }
 
 #player_maximized .embed_player_frame:hover, #player_minimized .embed_player_frame:hover {
diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 13a030f610ac53d18baea66766fc5c93fa522f39..a7c4cc287647a2794fe23b4e9b9ac1c32bffb0a1 100644
GIT binary patch
delta 16
XcmZ3&yo7neBvvCMD`T^b(|H*IET9C_

delta 16
XcmZ3&yo7neBvwOHD^t^r(|H*IEVcyJ

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index 93976d6f..6066e062 100644
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-23 15:55+0200\n"
+"POT-Creation-Date: 2011-06-23 22:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr ""
 
-#: models/enum.py:41 models/enum.py:139 models/media.py:374
+#: models/enum.py:41 models/enum.py:139 models/media.py:376
 msgid "value"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgstr ""
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:334
+#: models/enum.py:127 models/media.py:336
 msgid "keyword"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgid "population / social group"
 msgstr ""
 
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
-#: models/location.py:51 models/location.py:151 models/media.py:373
+#: models/location.py:51 models/location.py:151 models/media.py:375
 msgid "name"
 msgstr ""
 
@@ -176,8 +176,8 @@ msgstr ""
 msgid "reference"
 msgstr ""
 
-#: models/media.py:94 models/media.py:230 models/media.py:389
-#: models/media.py:404 models/media.py:438
+#: models/media.py:94 models/media.py:230 models/media.py:391
+#: models/media.py:406 models/media.py:440
 msgid "title"
 msgstr ""
 
@@ -297,7 +297,7 @@ msgstr ""
 msgid "populations / social groups"
 msgstr ""
 
-#: models/media.py:206 models/media.py:314
+#: models/media.py:206 models/media.py:316
 msgid "computed duration"
 msgstr ""
 
@@ -365,85 +365,85 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: models/media.py:278 models/media.py:471
-#: templates/telemeta_default/mediaitem_detail.html:181
+#: models/media.py:278 models/media.py:473
+#: templates/telemeta_default/mediaitem_detail.html:178
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:333 models/media.py:347 models/media.py:371
-#: models/media.py:388 models/media.py:435 models/media.py:456
+#: models/media.py:335 models/media.py:349 models/media.py:373
+#: models/media.py:390 models/media.py:437 models/media.py:458
 msgid "item"
 msgstr ""
 
-#: models/media.py:349
+#: models/media.py:351
 msgid "composition"
 msgstr ""
 
-#: models/media.py:351
+#: models/media.py:353
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:352
+#: models/media.py:354
 msgid "number"
 msgstr ""
 
-#: models/media.py:353
+#: models/media.py:355
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:372
+#: models/media.py:374
 msgid "id"
 msgstr ""
 
-#: models/media.py:375
+#: models/media.py:377
 msgid "unit"
 msgstr ""
 
-#: models/media.py:390
+#: models/media.py:392
 msgid "start"
 msgstr ""
 
-#: models/media.py:391
+#: models/media.py:393
 msgid "end"
 msgstr ""
 
-#: models/media.py:402 models/media.py:421 models/media.py:436
+#: models/media.py:404 models/media.py:423 models/media.py:438
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:405 models/media.py:440
+#: models/media.py:407 models/media.py:442
 msgid "description"
 msgstr ""
 
-#: models/media.py:422
+#: models/media.py:424
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:423
+#: models/media.py:425
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:424
+#: models/media.py:426
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:437 models/system.py:54
+#: models/media.py:439 models/system.py:54
 msgid "time"
 msgstr ""
 
-#: models/media.py:439 models/media.py:458 models/media.py:472
+#: models/media.py:441 models/media.py:460 models/media.py:474
 msgid "date"
 msgstr ""
 
-#: models/media.py:441
+#: models/media.py:443
 msgid "author"
 msgstr ""
 
-#: models/media.py:457
+#: models/media.py:459
 msgid "mime_type"
 msgstr ""
 
-#: models/media.py:459
+#: models/media.py:461
 msgid "transcoded"
 msgstr ""
 
@@ -629,7 +629,7 @@ msgid ""
 msgstr ""
 
 #: templates/telemeta_default/base.html:129
-#: templates/telemeta_default/collection_detail.html:118
+#: templates/telemeta_default/collection_detail.html:115
 msgid "Legal notices"
 msgstr ""
 
@@ -672,90 +672,90 @@ msgstr ""
 msgid "Collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:45
-#: templates/telemeta_default/mediaitem_detail.html:79
-#: templates/telemeta_default/mediaitem_detail.html:181
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/collection_detail.html:42
+#: templates/telemeta_default/mediaitem_detail.html:75
+#: templates/telemeta_default/mediaitem_detail.html:178
+#: templates/telemeta_default/mediaitem_detail.html:217
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:46
-#: templates/telemeta_default/mediaitem_detail.html:80
+#: templates/telemeta_default/collection_detail.html:43
+#: templates/telemeta_default/mediaitem_detail.html:76
 msgid "Copy"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/collection_detail.html:44
 msgid "Add item"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:50
-#: templates/telemeta_default/mediaitem_detail.html:83
+#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/mediaitem_detail.html:79
 msgid "Add to playlist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:63
+#: templates/telemeta_default/collection_detail.html:60
 msgid "Listen to this collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:96
+#: templates/telemeta_default/collection_detail.html:93
 #: templates/telemeta_default/home.html:50
 #: templates/telemeta_default/inc/collection_list.html:17
 msgid "Recording period"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:105
-#: templates/telemeta_default/mediaitem_detail.html:165
+#: templates/telemeta_default/collection_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:161
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:123
+#: templates/telemeta_default/collection_detail.html:120
 #: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:132
+#: templates/telemeta_default/collection_detail.html:129
 msgid "Bibliographic references"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:145
-#: templates/telemeta_default/mediaitem_detail.html:237
+#: templates/telemeta_default/collection_detail.html:142
+#: templates/telemeta_default/mediaitem_detail.html:234
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:151
+#: templates/telemeta_default/collection_detail.html:148
 msgid "Related documentation"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:155
+#: templates/telemeta_default/collection_detail.html:152
 msgid "Comments"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:169
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:166
+#: templates/telemeta_default/mediaitem_detail.html:250
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:174
-#: templates/telemeta_default/mediaitem_detail.html:256
+#: templates/telemeta_default/collection_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:253
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:174
-#: templates/telemeta_default/mediaitem_detail.html:256
+#: templates/telemeta_default/collection_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:253
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:179
+#: templates/telemeta_default/collection_detail.html:176
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:206
+#: templates/telemeta_default/collection_detail.html:203
 #: templates/telemeta_default/home.html:35
-#: templates/telemeta_default/mediaitem_detail.html:271
+#: templates/telemeta_default/mediaitem_detail.html:268
 msgid "Delete"
 msgstr ""
 
@@ -816,7 +816,7 @@ msgstr ""
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:125
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Value"
 msgstr ""
 
@@ -947,66 +947,66 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:85
+#: templates/telemeta_default/mediaitem_detail.html:81
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:86
+#: templates/telemeta_default/mediaitem_detail.html:82
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:114
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:116
+#: templates/telemeta_default/mediaitem_detail.html:112
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:124
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:126
+#: templates/telemeta_default/mediaitem_detail.html:122
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:134
+#: templates/telemeta_default/mediaitem_detail.html:130
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:155
+#: templates/telemeta_default/mediaitem_detail.html:151
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:163
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:173
-msgid "Comments / ethnographic context"
+#: templates/telemeta_default/mediaitem_detail.html:169
+msgid "Ethnographic context"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:186
+#: templates/telemeta_default/mediaitem_detail.html:183
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/mediaitem_detail.html:217
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:225
+#: templates/telemeta_default/mediaitem_detail.html:222
 msgid "General informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/mediaitem_detail.html:224
 msgid "Remarks"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:243
+#: templates/telemeta_default/mediaitem_detail.html:240
 msgid "Published references"
 msgstr ""
 
@@ -1031,7 +1031,7 @@ msgstr ""
 msgid "User Profile"
 msgstr ""
 
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1175
 msgid "User profile"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1206
 msgid "Last changes"
 msgstr ""
 
@@ -1330,11 +1330,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164
+#: web/base.py:327 web/base.py:463 web/base.py:705 web/base.py:1174
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166
+#: web/base.py:329 web/base.py:465 web/base.py:707 web/base.py:1176
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index e4613bafeb25a43a043f7ce3b69f7275ab244510..e81ec1ae19dc480120b5068ae138da035081f19b 100644
GIT binary patch
delta 3724
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
Db`No)

delta 3730
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
Lt9NHjMe+Xtu~~HN

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 785d882a..e303f2fb 100644
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-23 15:55+0200\n"
+"POT-Creation-Date: 2011-06-23 22:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr "Durée"
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr "Entrez une durée valide au format HH:MM[:ss]"
 
-#: models/enum.py:41 models/enum.py:139 models/media.py:374
+#: models/enum.py:41 models/enum.py:139 models/media.py:376
 msgid "value"
 msgstr "valeur"
 
@@ -69,7 +69,7 @@ msgstr "style vernaculaire"
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:334
+#: models/enum.py:127 models/media.py:336
 #, fuzzy
 msgid "keyword"
 msgstr "Mot-clé"
@@ -87,7 +87,7 @@ msgid "population / social group"
 msgstr "population / groupe social"
 
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
-#: models/location.py:51 models/location.py:151 models/media.py:373
+#: models/location.py:51 models/location.py:151 models/media.py:375
 msgid "name"
 msgstr "nom"
 
@@ -176,8 +176,8 @@ msgstr "accès public"
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:94 models/media.py:230 models/media.py:389
-#: models/media.py:404 models/media.py:438
+#: models/media.py:94 models/media.py:230 models/media.py:391
+#: models/media.py:406 models/media.py:440
 msgid "title"
 msgstr "titre"
 
@@ -297,7 +297,7 @@ msgstr "états / nations"
 msgid "populations / social groups"
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:206 models/media.py:314
+#: models/media.py:206 models/media.py:316
 msgid "computed duration"
 msgstr "durée calculée"
 
@@ -365,90 +365,90 @@ msgstr "copie de"
 msgid "file"
 msgstr "fichier"
 
-#: models/media.py:278 models/media.py:471
-#: templates/telemeta_default/mediaitem_detail.html:181
+#: models/media.py:278 models/media.py:473
+#: templates/telemeta_default/mediaitem_detail.html:178
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:333 models/media.py:347 models/media.py:371
-#: models/media.py:388 models/media.py:435 models/media.py:456
+#: models/media.py:335 models/media.py:349 models/media.py:373
+#: models/media.py:390 models/media.py:437 models/media.py:458
 msgid "item"
 msgstr "item"
 
-#: models/media.py:349
+#: models/media.py:351
 msgid "composition"
 msgstr "Voix / Instruments"
 
-#: models/media.py:351
+#: models/media.py:353
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:352
+#: models/media.py:354
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:353
+#: models/media.py:355
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:372
+#: models/media.py:374
 msgid "id"
 msgstr ""
 
-#: models/media.py:375
+#: models/media.py:377
 msgid "unit"
 msgstr "unité"
 
-#: models/media.py:390
+#: models/media.py:392
 msgid "start"
 msgstr "début"
 
-#: models/media.py:391
+#: models/media.py:393
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:402 models/media.py:421 models/media.py:436
+#: models/media.py:404 models/media.py:423 models/media.py:438
 #, fuzzy
 msgid "public_id"
 msgstr "édité"
 
-#: models/media.py:405 models/media.py:440
+#: models/media.py:407 models/media.py:442
 msgid "description"
 msgstr ""
 
-#: models/media.py:422
+#: models/media.py:424
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:423
+#: models/media.py:425
 #, fuzzy
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:424
+#: models/media.py:426
 #, fuzzy
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:437 models/system.py:54
+#: models/media.py:439 models/system.py:54
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:439 models/media.py:458 models/media.py:472
+#: models/media.py:441 models/media.py:460 models/media.py:474
 msgid "date"
 msgstr ""
 
-#: models/media.py:441
+#: models/media.py:443
 #, fuzzy
 msgid "author"
 msgstr "rédacteur fiche"
 
-#: models/media.py:457
+#: models/media.py:459
 #, fuzzy
 msgid "mime_type"
 msgstr "type"
 
-#: models/media.py:459
+#: models/media.py:461
 msgid "transcoded"
 msgstr ""
 
@@ -637,7 +637,7 @@ msgstr ""
 "communautés d'origine."
 
 #: templates/telemeta_default/base.html:129
-#: templates/telemeta_default/collection_detail.html:118
+#: templates/telemeta_default/collection_detail.html:115
 msgid "Legal notices"
 msgstr "Mentions légales"
 
@@ -680,90 +680,90 @@ msgstr "Enregistrer"
 msgid "Collection"
 msgstr "Collection"
 
-#: templates/telemeta_default/collection_detail.html:45
-#: templates/telemeta_default/mediaitem_detail.html:79
-#: templates/telemeta_default/mediaitem_detail.html:181
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/collection_detail.html:42
+#: templates/telemeta_default/mediaitem_detail.html:75
+#: templates/telemeta_default/mediaitem_detail.html:178
+#: templates/telemeta_default/mediaitem_detail.html:217
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr "Editer"
 
-#: templates/telemeta_default/collection_detail.html:46
-#: templates/telemeta_default/mediaitem_detail.html:80
+#: templates/telemeta_default/collection_detail.html:43
+#: templates/telemeta_default/mediaitem_detail.html:76
 msgid "Copy"
 msgstr "Copier"
 
-#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/collection_detail.html:44
 msgid "Add item"
 msgstr "Ajouter item"
 
-#: templates/telemeta_default/collection_detail.html:50
-#: templates/telemeta_default/mediaitem_detail.html:83
+#: templates/telemeta_default/collection_detail.html:47
+#: templates/telemeta_default/mediaitem_detail.html:79
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
-#: templates/telemeta_default/collection_detail.html:63
+#: templates/telemeta_default/collection_detail.html:60
 msgid "Listen to this collection"
 msgstr "Écouter la collection"
 
-#: templates/telemeta_default/collection_detail.html:96
+#: templates/telemeta_default/collection_detail.html:93
 #: templates/telemeta_default/home.html:50
 #: templates/telemeta_default/inc/collection_list.html:17
 msgid "Recording period"
 msgstr "Période d'enregistrement"
 
-#: templates/telemeta_default/collection_detail.html:105
-#: templates/telemeta_default/mediaitem_detail.html:165
+#: templates/telemeta_default/collection_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:161
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta_default/collection_detail.html:123
+#: templates/telemeta_default/collection_detail.html:120
 #: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta_default/collection_detail.html:132
+#: templates/telemeta_default/collection_detail.html:129
 msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
-#: templates/telemeta_default/collection_detail.html:145
-#: templates/telemeta_default/mediaitem_detail.html:237
+#: templates/telemeta_default/collection_detail.html:142
+#: templates/telemeta_default/mediaitem_detail.html:234
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:151
+#: templates/telemeta_default/collection_detail.html:148
 msgid "Related documentation"
 msgstr "Documentation associée"
 
-#: templates/telemeta_default/collection_detail.html:155
+#: templates/telemeta_default/collection_detail.html:152
 msgid "Comments"
 msgstr "Commentaires"
 
-#: templates/telemeta_default/collection_detail.html:169
-#: templates/telemeta_default/mediaitem_detail.html:253
+#: templates/telemeta_default/collection_detail.html:166
+#: templates/telemeta_default/mediaitem_detail.html:250
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:174
-#: templates/telemeta_default/mediaitem_detail.html:256
+#: templates/telemeta_default/collection_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:253
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:174
-#: templates/telemeta_default/mediaitem_detail.html:256
+#: templates/telemeta_default/collection_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:253
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:179
+#: templates/telemeta_default/collection_detail.html:176
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
 
-#: templates/telemeta_default/collection_detail.html:206
+#: templates/telemeta_default/collection_detail.html:203
 #: templates/telemeta_default/home.html:35
-#: templates/telemeta_default/mediaitem_detail.html:271
+#: templates/telemeta_default/mediaitem_detail.html:268
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -824,7 +824,7 @@ msgstr "Ajouter une entrée"
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:125
+#: templates/telemeta_default/mediaitem_detail.html:121
 msgid "Value"
 msgstr "Valeur"
 
@@ -956,66 +956,66 @@ msgstr "Mot de passe oublié"
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta_default/mediaitem_detail.html:85
+#: templates/telemeta_default/mediaitem_detail.html:81
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/telemeta_default/mediaitem_detail.html:86
+#: templates/telemeta_default/mediaitem_detail.html:82
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/telemeta_default/mediaitem_detail.html:114
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta_default/mediaitem_detail.html:116
+#: templates/telemeta_default/mediaitem_detail.html:112
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta_default/mediaitem_detail.html:124
+#: templates/telemeta_default/mediaitem_detail.html:120
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta_default/mediaitem_detail.html:126
+#: templates/telemeta_default/mediaitem_detail.html:122
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta_default/mediaitem_detail.html:134
+#: templates/telemeta_default/mediaitem_detail.html:130
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta_default/mediaitem_detail.html:155
+#: templates/telemeta_default/mediaitem_detail.html:151
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:163
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:173
-msgid "Comments / ethnographic context"
-msgstr "Commentaires / contexte ethnographique"
+#: templates/telemeta_default/mediaitem_detail.html:169
+msgid "Ethnographic context"
+msgstr "Contexte ethnographique"
 
-#: templates/telemeta_default/mediaitem_detail.html:186
+#: templates/telemeta_default/mediaitem_detail.html:183
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/mediaitem_detail.html:217
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta_default/mediaitem_detail.html:225
+#: templates/telemeta_default/mediaitem_detail.html:222
 msgid "General informations"
 msgstr "Informations générales"
 
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/mediaitem_detail.html:224
 msgid "Remarks"
 msgstr "Remarques"
 
-#: templates/telemeta_default/mediaitem_detail.html:243
+#: templates/telemeta_default/mediaitem_detail.html:240
 msgid "Published references"
 msgstr "Références éditées"
 
@@ -1040,7 +1040,7 @@ msgstr "Formation"
 msgid "User Profile"
 msgstr "Profil utilisateur"
 
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1175
 msgid "User profile"
 msgstr "Profil utilisateur"
 
@@ -1152,7 +1152,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1206
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1345,17 +1345,20 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164
+#: web/base.py:327 web/base.py:463 web/base.py:705 web/base.py:1174
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166
+#: web/base.py:329 web/base.py:465 web/base.py:707 web/base.py:1176
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
+#~ msgid "Comments / ethnographic context"
+#~ msgstr "Commentaires / contexte ethnographique"
+
 #~ msgid "comments"
 #~ msgstr "commentaires"
 
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 31164937..d232bf51 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -285,6 +285,9 @@ class MediaItem(MediaResource):
 
     class Meta(MetaCore):
         db_table = 'media_items'
+        permissions = (
+                       ("can_play_all_items", "Can play all media items"), 
+                       )
 
     def is_valid_code(self, code):
         "Check if the item code is well formed"
diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index 66a79c94..48f1d9cd 100644
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -49,7 +49,7 @@
 
 <div id="auth_info">
 {% if user.is_authenticated %}
-<img src="images/user.png" alt="user" style="vertical-align:middle" />
+<img src="{% url telemeta-images "user.png" %}" alt="user" style="vertical-align:middle" />
 {% trans "Welcome" %}, 
 {% if user.first_name and user.last_name %}
 {{ user.first_name }} {{ user.last_name }} |
@@ -59,7 +59,7 @@
 <a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a> |
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
-<img src="images/logout.png" alt="logout" style="vertical-align:middle" /></a>
+<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 698e0203..5d2401f0 100644
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -11,8 +11,8 @@
 <script>
     {% if user.is_authenticated %}
     jQuery(document).ready(function(){
-
         var p = playlistUtils;
+        
         {% for playlist in playlists %}
         p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
         {% endfor %}
@@ -25,11 +25,8 @@
         });
         }
         {% endif %}
-    
     });
-
         {% endif %}
-
 </script>
 {% endblock %}
 
@@ -54,9 +51,9 @@
 {% endblock %}
 
 {% block content %}
-    <div class="{% if collection.has_mediafile %}{% if public_access or user.is_staff or user.is_superuser %}with-rightcol{% endif %}{% endif %}">
+    <div class="{% if collection.has_mediafile %}{% if public_access or perms.telemeta.can_play_all_items %}with-rightcol{% endif %}{% endif %}">
         {% if collection.has_mediafile %}
-        {% if public_access or user.is_staff or user.is_superuser %}
+        {% if public_access or perms.telemeta.can_play_all_items %}
         <div id="rightcol">
             <div id="collection_player">
              <div class="title">
diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 8cc68f8b..735ce7e2 100644
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -81,7 +81,7 @@
             </td>
             <td align="center" style="vertical-align:middle">
                 {% if resource.element.file or resource.element.has_mediafile %}
-                <img src="images/ok.png" alt="yes" style="vertical-align:middle" /></a>
+                <img src="{% url telemeta-images "ok.png" %}" alt="yes" style="vertical-align:middle" /></a>
                 {% endif %}
             </td>
             <td style="vertical-align:middle">
diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index be3eb1a7..005aee31 100644
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -6,7 +6,7 @@
 
 {% if item %}
 {% block title %}
-    <img src="images/item.png" alt="item" style="vertical-align:middle" /> Item : NEW
+    <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> Item : NEW
 {% endblock %}
 
 {% block title_buttons %}
@@ -36,7 +36,7 @@
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save"
    onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="/images/wait.gif"/>
+           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images "wait.gif" %}" />
        </div>
      </form>
     </div>
diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index 5fee7118..cfdbe6fe 100644
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block title %}
- <img src="images/item.png" alt="item" style="vertical-align:middle" /> Item : NEW
+ <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> Item : NEW
 {% endblock %}
 
 {% block title_buttons %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 81da4300..8ae24e34 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -12,17 +12,13 @@
 
 {% block extra_javascript %}
 {% if item %}
-
-
 <script src="{% url telemeta-timeside "js/libs/soundmanager2-nodebug-jsmin.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-timeside "js/timeside.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "popupdiv-min.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "playerLoader.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "divmarker.js" %}" type="text/javascript"></script>
-
 <script type="text/javascript">
-    //soundManager.url = '{% url telemeta-swf "./" %}';
     soundManager.url = "{% url telemeta-timeside "swf/" %}";
     soundManager.flashVersion = 9;
     soundManager.useMovieStar = true; // enable MP4/M4A/AAC
@@ -52,10 +48,10 @@
     {% endfor %}
     
 
-//loadPlayer(analizerUrl, soundUrl, itemId, visualizers, currentUserName, isStaffOrSuperuser)
- //  django before was: if user.is_staff or user.is_superuser 
+ // loadPlayer(analizerUrl, soundUrl, itemId, visualizers, currentUserName, isStaffOrSuperuser)
+ // django before was: if user.is_staff or user.is_superuser 
 
-   {% if user.is_superuser %}
+   {% if perms.can_play_all_items %}
     var superuser = true;
    {% else %}
     var superuser = false;
@@ -70,7 +66,7 @@
 {% if item %}
 
 {% block title %}
-<img src="images/item.png" alt="item" style="vertical-align:middle" /> Item : {{ item }}
+<img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -89,9 +85,9 @@
 {% endblock %}
 
 {% block content %}
-<div class="{% if item.file %}{% if public_access or user.is_staff or user.is_superuser %}with-rightcol{% endif %}{% endif %}">
+<div class="{% if item.file %}{% if public_access or perms.telemeta.can_play_all_items %}with-rightcol{% endif %}{% endif %}">
     {% if item.file %}
-    {% if public_access or user.is_staff or user.is_superuser %}
+    {% if public_access or perms.telemeta.can_play_all_items %}
     <div id="player_maximized" class="ts-skin-lab">
         <a href="#" class="toggle">Minimize</a>
         <a href="#" class="embed_player_frame">&lt;/&gt;</a>
@@ -109,7 +105,7 @@
         <!-- </div> -->
         <div id="tabs_container">
             <!-- this div will be hidden when everything is fully loaded-->
-            <span id="loading_span" href="#"><img style="vertical-align:middle" alt="wait" src="/images/wait.gif"/>&nbsp;
+            <span id="loading_span" href="#"><img style="vertical-align:middle" alt="wait" src="{% url telemeta-images "wait.gif" %}" />&nbsp;
                 <span id="loading_span_text">Loading...</span></span>
             <a id="tab_analysis" style="display:none" class ="tab" href="#">{% trans "Analysis" %}</a><!--
              do not let space here as it appears in the document!!!!!
@@ -131,7 +127,7 @@
 
         {% if audio_export_enabled or user.is_staff or user.is_superuser %}
         <div class="exporter">
-            <p><img src="images/download.png" alt="download" style="vertical-align:middle" /> {% trans "Download:" %}
+            <p><img src="{% url telemeta-images "download.png" %}" alt="download" style="vertical-align:middle" /> {% trans "Download:" %}
                 {% for format in export_formats %}
                 <a href="{% url telemeta-item-export item.public_id,format.extension %}">
                     <img src="images/{{ format.extension }}.png" style="vertical-align:middle" alt="{{ format.extension }}" /></a>
@@ -170,7 +166,7 @@
                 {% dl_field item "cultural_area" %}
                 {% dl_field item "language" %}
                 {% dl_field item "ethnic_group" placeholder %}
-                <dt>{% trans "Comments / ethnographic context" %}</dt>
+                <dt>{% trans "Ethnographic context" %}</dt>
                 <dd>{{ item.context_comment|html_line_break|safe }}</dd>
                 {% dl_field item "keywords" join with ", " %}
             </dl>
diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index 77b151c4..740620d0 100644
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-<img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+<img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -42,7 +42,7 @@
         class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     <a href="#" class="component_icon button icon_save" 
 onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="/images/wait.gif"/>
+           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images  "wait.gif" %}" />
     </div>
     </form>
 </div>
diff --git a/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html b/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html
index b357f051..7b63cc74 100644
--- a/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_keywords_edit.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
   {% block title %}
-    <img src="images/item.png" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
+    <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index b1563648..237c2af7 100644
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="images/item.png" alt="item" style="vertical-align:middle" /> {% trans "Media Items" %}
+ <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> {% trans "Media Items" %}
 {% endblock %}
 
 {% block title_buttons %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html b/telemeta/templates/telemeta_default/mediaitem_performances_edit.html
index 84547a2c..778df3aa 100644
--- a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_performances_edit.html
@@ -5,7 +5,7 @@
 {% block extra_javascript %}{% endblock %}
 
 {% block title %}
- <img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+ <img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index ee5a7a9a..d0594209 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -459,7 +459,7 @@ class ItemView(object):
             item = MediaItem.objects.get(public_id=public_id)
         
         item_public_access = item.public_access == 'none' or item.collection.public_access == 'none'
-        if item_public_access and not (request.user.is_staff or request.user.is_superuser):
+        if not item_public_access and not (request.user.is_staff or request.user.is_superuser):
             mess = ugettext('Access not allowed') 
             title = ugettext('Item') + ' : ' + public_id + ' : ' + mess
             description = ugettext('Please login or contact the website administator to get a private access.')
@@ -701,7 +701,7 @@ class ItemView(object):
                                                 str(item.recorded_to_date).split('-')[0])
         
         if (not public_access or not extension in settings.TELEMETA_STREAMING_FORMATS) and \
-                    not (request.user.is_staff or request.user.is_superuser):
+                    not (request.user.has_perm('telemeta.can_play_all_items') or request.user.is_superuser):
             mess = ugettext('Access not allowed') 
             title = 'Item file : ' + public_id + '.' + extension + ' : ' + mess
             description = ugettext('Please login or contact the website administator to get a private access.')
-- 
2.39.5