# HG changeset patch
# User verrierj
# Date 1327078662 -3600
# Node ID e0158472f83ac7e880810026facb67178be86a59
# Parent  4328cd4a7533624ba1b5a831b037f9eedcf3eee9
Fix pluralized translations + clean-up segmentserializer

diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/projectserializer.py
--- a/src/ldt/ldt/ldt_utils/projectserializer.py	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py	Fri Jan 20 17:57:42 2012 +0100
@@ -356,7 +356,7 @@
 
         href = ""
         meta_item_value = ""
-        if content not in self.viewable_contents:
+        if "Content" in settings.USE_GROUP_PERMISSIONS and content not in self.viewable_contents:
             href = settings.FORBIDDEN_STREAM_URL
         elif content.videopath:
             href = content.videopath.rstrip('/') + "/" + content.src
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/segmentserializer.py
--- a/src/ldt/ldt/ldt_utils/segmentserializer.py	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/segmentserializer.py	Fri Jan 20 17:57:42 2012 +0100
@@ -93,9 +93,10 @@
         
         href = ""
         meta_item_value = ""
-             
-        if self.content not in self.viewable_contents:
-            href = settings.FORBIDDEN_STREAM_URL
+            
+        if "Content" in settings.USE_GROUP_PERMISSIONS and self.content:
+            if self.content not in self.viewable_contents:
+                href = settings.FORBIDDEN_STREAM_URL
         elif self.content.videopath:
             href = self.content.videopath.rstrip('/') + "/" + self.content.src
             meta_item_value = self.content.videopath.rstrip('/') + "/"
@@ -153,7 +154,7 @@
                 'begin': seg.start_ts,
                 'end': seg.start_ts + seg.duration,
                 'tags': seg.tags,
-                'id': "s_%s" % unicode(uuid.uuid1()),
+                'id': seg.element_id,
                 'color': "%s" % self.default_color,
                 'media': self.content.iri_id,
                 'content': {
@@ -163,7 +164,7 @@
                         'src': ''
                     },
                     'title': seg.title,
-                    'color': '2194379',
+                    'color': self.default_color,
                     'polemics': [ ],
                     'audio': {
                         'mimetype': 'audio/mp3',
@@ -177,7 +178,7 @@
                          "dc:contributor": seg.author,
                          "dc:created": seg.date,
                          "dc:modified": seg.date,
-                         "id-ref": seg.iri_id,
+                         "id-ref": seg.cutting_id,
                          "project": seg.project_id
                 },
                 'tags': segment_tags                       
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html
--- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html	Fri Jan 20 17:57:42 2012 +0100
@@ -73,7 +73,7 @@
     <li class="li_media">
         <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
         <span class="graph_annotation"></span></a>
-        <div class="bulle_annot" title="{% blocktrans with nb=content.nb_annotation%}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
+        <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
         <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
         <p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
     </li>
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/templates/front/front_group.html
--- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html	Fri Jan 20 17:57:42 2012 +0100
@@ -20,7 +20,7 @@
     {% for content in content_list %}
     <li class="li_media">
         <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
-        <div class="bulle_annot" title="{% blocktrans with nb=content.nb_annotation%}{{nb}} annotations on this media{% endblocktrans %}">{{content.nb_annotation}}</div>
+        <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{content.nb_annotation}}</div>
         <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
         <p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
     </li>
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/templates/front/front_home.html
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html	Fri Jan 20 17:57:42 2012 +0100
@@ -27,9 +27,10 @@
     {% for content in last_contents %}
     <li class="li_media">
         <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
-        <div class="bulle_annot" title="{% blocktrans with nb=content.nb_annotation%}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
+        <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
         <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{{content.title}}</b></a></p>
         <p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
+        
     </li>
     {% endfor %}
 </ul>
@@ -46,7 +47,7 @@
     {% for content in most_contents %}
     <li class="li_media">
         <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
-        <div class="bulle_annot" title="{% blocktrans with nb=content.nb_annotation%}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
+        <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
         <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
         <p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
     </li>
@@ -63,7 +64,7 @@
             <a href="{% url ldt.ldt_utils.views.front.group_info group.id %}">{% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'group picture' %}" title="{% trans 'view more infos on this group'%}">{% endthumbnail %}</a>
         </div>
         <div class="txt_groupes_actifs">
-            <div class="bulle_people" title="{% blocktrans with count=group.user_set.count%}{{count}} users in this group{% endblocktrans %}">{{ group.user_set.count }}</div>
+            <div class="bulle_people" title="{% blocktrans count nb=group.user_set.count %}{{nb}} user in this group{% plural %}{{nb}} users in this group{% endblocktrans %}">{{ group.user_set.count }}</div>
             <p><a href="{% url ldt.ldt_utils.views.front.group_info group.id %}" class="under" title="{% trans 'view more infos on this group'%}"><b>{{group.name}}</b></a></p>
             <p>{% if group.get_profile.description|length > 69 %}{{group.get_profile.description|safe|slice:":69"}}...{% else %}{{group.get_profile.description|safe}}{% endif %}</p>
         </div>
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Fri Jan 20 17:57:42 2012 +0100
@@ -64,7 +64,8 @@
 
 		
 		var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
-	
+		resize_modal_window($("#add_group"));
+		
 	});
 	</script>
 
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/locale/en/LC_MESSAGES/django.mo
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/locale/en/LC_MESSAGES/django.po
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Fri Jan 20 17:57:42 2012 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 15:02+0100\n"
+"POT-Creation-Date: 2012-01-20 17:24+0100\n"
 "PO-Revision-Date: 2010-02-17 03:53+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,7 +211,7 @@
 #: .\ldt_utils\templates\front\front_all_contents.html.py:69
 #: .\ldt_utils\templates\front\front_all_contents.html.py:70
 #: .\ldt_utils\templates\front\front_home.html.py:23
-#: .\ldt_utils\templates\front\front_home.html.py:42
+#: .\ldt_utils\templates\front\front_home.html.py:43
 msgid "All medias"
 msgstr "All medias"
 
@@ -220,23 +220,25 @@
 #: .\ldt_utils\templates\front\front_group.html.py:24
 #: .\ldt_utils\templates\front\front_home.html.py:29
 #: .\ldt_utils\templates\front\front_home.html.py:31
-#: .\ldt_utils\templates\front\front_home.html.py:48
-#: .\ldt_utils\templates\front\front_home.html.py:50
+#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:51
 msgid "open this media"
 msgstr "Play this media"
 
 #: .\ldt_utils\templates\front\front_all_contents.html.py:76
 #: .\ldt_utils\templates\front\front_group.html.py:23
 #: .\ldt_utils\templates\front\front_home.html.py:30
-#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:50
 #, python-format
-msgid "%(nb)s annotations on this media"
-msgstr "%(nb)s annotations on this media"
+msgid "%(nb)s annotation on this media"
+msgid_plural "%(nb)s annotations on this media"
+msgstr[0] "%(nb)s annotation on this media"
+msgstr[1] "%(nb)s annotations on this media"
 
 #: .\ldt_utils\templates\front\front_all_contents.html.py:78
 #: .\ldt_utils\templates\front\front_group.html.py:25
 #: .\ldt_utils\templates\front\front_home.html.py:32
-#: .\ldt_utils\templates\front\front_home.html.py:51
+#: .\ldt_utils\templates\front\front_home.html.py:52
 msgid "by"
 msgstr "by"
 
@@ -300,31 +302,33 @@
 msgstr "Last annotated medias"
 
 #: .\ldt_utils\templates\front\front_home.html.py:23
-#: .\ldt_utils\templates\front\front_home.html.py:42
+#: .\ldt_utils\templates\front\front_home.html.py:43
 msgid "view all medias"
 msgstr "view all medias"
 
-#: .\ldt_utils\templates\front\front_home.html.py:40
+#: .\ldt_utils\templates\front\front_home.html.py:41
 msgid "Most annotated medias"
 msgstr "Most annotated medias"
 
-#: .\ldt_utils\templates\front\front_home.html.py:58
+#: .\ldt_utils\templates\front\front_home.html.py:59
 msgid "Active groups"
 msgstr "Active groups"
 
-#: .\ldt_utils\templates\front\front_home.html.py:63
+#: .\ldt_utils\templates\front\front_home.html.py:64
 msgid "group picture"
 msgstr "group picture"
 
-#: .\ldt_utils\templates\front\front_home.html.py:63
-#: .\ldt_utils\templates\front\front_home.html.py:67
+#: .\ldt_utils\templates\front\front_home.html.py:64
+#: .\ldt_utils\templates\front\front_home.html.py:68
 msgid "view more infos on this group"
 msgstr "View more information on this group"
 
-#: .\ldt_utils\templates\front\front_home.html.py:66
-#, python-format
-msgid "%(count)s users in this group"
-msgstr "%(count)s users in this group"
+#: .\ldt_utils\templates\front\front_home.html.py:67
+#, fuzzy, python-format
+msgid "%(nb)s user in this group"
+msgid_plural "%(nb)s users in this group"
+msgstr[0] "%(count)s user in this group"
+msgstr[1] "%(count)s users in this group"
 
 #: .\ldt_utils\templates\front\front_player.html.py:87
 msgid "All annotations on the media"
@@ -337,7 +341,7 @@
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:122
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
 #: .\templates\ldt\ldt_base.html.py:126
 msgid "search"
 msgstr "search"
@@ -445,7 +449,17 @@
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:69
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:57
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "hide"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:71
 msgid ""
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
@@ -453,32 +467,32 @@
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:85
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
 msgid "Create content"
 msgstr "Create content"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:126
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:127
 msgid "More options"
 msgstr "More options"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:141
 msgid "media file is being processed please wait."
 msgstr "media file is being processed please wait."
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:143
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:99
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:100
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:136
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Close"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:144
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:146
 msgid "delete"
 msgstr "Approve delete"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:147
 msgid "write"
 msgstr "Write"
 
@@ -486,43 +500,35 @@
 msgid "Do you really want to delete this group ?"
 msgstr "Do you really want to delete this group ?"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
 msgid "Update a group"
 msgstr "Update a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
 msgid "Create a group"
 msgstr "Create a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
 #: .\user\templates\ldt\user\change_profile.html.py:62
 msgid "Name"
 msgstr "Name"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:89
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
 msgid "Description"
 msgstr "Description"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:101
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
 msgid "update_group"
 msgstr "update the group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:103
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
 msgid "delete_group"
 msgstr "delete project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:107
 msgid "create_group"
 msgstr "Create a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
-msgid "more options"
-msgstr ""
-
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
-msgid "hide"
-msgstr "hide"
-
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
 msgid "Update your project"
 msgstr "Create your project"
@@ -704,56 +710,56 @@
 msgid "Projects shared with me only"
 msgstr "Projects shared with me only"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:48
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:75
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:47
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:163
 msgid "share.eye"
 msgstr "click to give to permission to edit this object"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:56
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:162
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:55
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:161
 msgid "share.pencil"
 msgstr "click to remove the right to edit this project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:105
 msgid "share"
 msgstr "share with other users"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:115
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:114
 msgid "publish for everyone"
 msgstr "publish for everyone"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:120
 msgid "User and group list"
 msgstr "Users and groups list"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:132
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:131
 msgid "select all displayed elements"
 msgstr "add all displayed elements"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:136
 msgid "select users"
 msgstr "select users"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:138
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
 msgid "remove users"
 msgstr "remove users"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:143
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:142
 msgid "Members list"
 msgstr "Members list"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:153
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:152
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:7
 msgid "user"
 msgstr "user"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:155
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:9
 msgid "group"
 msgstr "group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:175
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:174
 msgid "remove all"
 msgstr "remove all"
 
@@ -1524,20 +1530,3 @@
 msgstr ""
 "We've e-mailed you instructions for activate your account to the e-mail "
 "address you submitted. You should be receiving it shortly."
-
-#~ msgid "share this project"
-#~ msgstr "share this project"
-
-#~ msgid "do not share"
-#~ msgstr "do not share"
-
-#, fuzzy
-#~ msgid "annotations on this media"
-#~ msgstr "title"
-
-#, fuzzy
-#~ msgid "User list"
-#~ msgstr "User details"
-
-#~ msgid "List of members"
-#~ msgstr "Members list"
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 4328cd4a7533 -r e0158472f83a src/ldt/ldt/locale/fr/LC_MESSAGES/django.po
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Fri Jan 20 15:36:37 2012 +0100
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Fri Jan 20 17:57:42 2012 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 15:01+0100\n"
+"POT-Creation-Date: 2012-01-20 17:24+0100\n"
 "PO-Revision-Date: 2010-03-09 15:52+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,7 +211,7 @@
 #: .\ldt_utils\templates\front\front_all_contents.html.py:69
 #: .\ldt_utils\templates\front\front_all_contents.html.py:70
 #: .\ldt_utils\templates\front\front_home.html.py:23
-#: .\ldt_utils\templates\front\front_home.html.py:42
+#: .\ldt_utils\templates\front\front_home.html.py:43
 msgid "All medias"
 msgstr "Tous les médias"
 
@@ -220,23 +220,25 @@
 #: .\ldt_utils\templates\front\front_group.html.py:24
 #: .\ldt_utils\templates\front\front_home.html.py:29
 #: .\ldt_utils\templates\front\front_home.html.py:31
-#: .\ldt_utils\templates\front\front_home.html.py:48
-#: .\ldt_utils\templates\front\front_home.html.py:50
+#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:51
 msgid "open this media"
 msgstr "voir ce média"
 
 #: .\ldt_utils\templates\front\front_all_contents.html.py:76
 #: .\ldt_utils\templates\front\front_group.html.py:23
 #: .\ldt_utils\templates\front\front_home.html.py:30
-#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:50
 #, python-format
-msgid "%(nb)s annotations on this media"
-msgstr "%(nb)s annotations sur ce média"
+msgid "%(nb)s annotation on this media"
+msgid_plural "%(nb)s annotations on this media"
+msgstr[0] "%(nb)s annotation sur ce média"
+msgstr[1] "%(nb)s annotations sur ce média"
 
 #: .\ldt_utils\templates\front\front_all_contents.html.py:78
 #: .\ldt_utils\templates\front\front_group.html.py:25
 #: .\ldt_utils\templates\front\front_home.html.py:32
-#: .\ldt_utils\templates\front\front_home.html.py:51
+#: .\ldt_utils\templates\front\front_home.html.py:52
 msgid "by"
 msgstr "par"
 
@@ -300,31 +302,33 @@
 msgstr "Derniers médias annotés"
 
 #: .\ldt_utils\templates\front\front_home.html.py:23
-#: .\ldt_utils\templates\front\front_home.html.py:42
+#: .\ldt_utils\templates\front\front_home.html.py:43
 msgid "view all medias"
 msgstr "Voir tous les médias"
 
-#: .\ldt_utils\templates\front\front_home.html.py:40
+#: .\ldt_utils\templates\front\front_home.html.py:41
 msgid "Most annotated medias"
 msgstr "Médias les plus annotés"
 
-#: .\ldt_utils\templates\front\front_home.html.py:58
+#: .\ldt_utils\templates\front\front_home.html.py:59
 msgid "Active groups"
 msgstr "Groupes actifs"
 
-#: .\ldt_utils\templates\front\front_home.html.py:63
+#: .\ldt_utils\templates\front\front_home.html.py:64
 msgid "group picture"
 msgstr "image du groupe"
 
-#: .\ldt_utils\templates\front\front_home.html.py:63
-#: .\ldt_utils\templates\front\front_home.html.py:67
+#: .\ldt_utils\templates\front\front_home.html.py:64
+#: .\ldt_utils\templates\front\front_home.html.py:68
 msgid "view more infos on this group"
 msgstr "Voir plus d'informations sur ce groupe"
 
-#: .\ldt_utils\templates\front\front_home.html.py:66
+#: .\ldt_utils\templates\front\front_home.html.py:67
 #, python-format
-msgid "%(count)s users in this group"
-msgstr "%(count)s utilisateurs dans ce groupe"
+msgid "%(nb)s user in this group"
+msgid_plural "%(nb)s users in this group"
+msgstr[0] "%(nb)s utilisateur dans ce groupe"
+msgstr[1] "%(nb)s utilisateurs dans ce groupe"
 
 #: .\ldt_utils\templates\front\front_player.html.py:87
 msgid "All annotations on the media"
@@ -337,7 +341,7 @@
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:122
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
 #: .\templates\ldt\ldt_base.html.py:126
 msgid "search"
 msgstr "Recherche"
@@ -445,7 +449,17 @@
 msgid "Cancel upload"
 msgstr "Annuler le téléversement"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:69
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:57
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "Réduire"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:71
 msgid ""
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
@@ -453,32 +467,32 @@
 "opération impossible à cause d'une ou plusieurs erreurs.<br />Veuillez "
 "resoumettre le formulaire media après avoir fait les changements suivants:"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:85
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
 msgid "Create content"
 msgstr "Créer un contenu"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:126
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:127
 msgid "More options"
 msgstr "Plus d'options"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:141
 msgid "media file is being processed please wait."
 msgstr "Le fichier média est en cours de traitement. Veuillez patienter."
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:143
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:99
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:100
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:136
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Fermer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:144
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:146
 msgid "delete"
 msgstr "Effacer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:147
 msgid "write"
 msgstr "Enregistrer"
 
@@ -486,44 +500,36 @@
 msgid "Do you really want to delete this group ?"
 msgstr "Voulez-vous quitter ce groupe ?"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
 msgid "Update a group"
 msgstr "Mettre à jour votre groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
 msgid "Create a group"
 msgstr "Créer un groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
 #: .\user\templates\ldt\user\change_profile.html.py:62
 msgid "Name"
 msgstr "Nom"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:89
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
 #, fuzzy
 msgid "Description"
 msgstr "Description :"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:101
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
 msgid "update_group"
 msgstr "Mettre à jour le groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:103
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
 msgid "delete_group"
 msgstr "Effacer le groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:107
 msgid "create_group"
 msgstr "Créer un nouveau groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
-msgid "more options"
-msgstr ""
-
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
-msgid "hide"
-msgstr "Réduire"
-
 #: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
 msgid "Update your project"
 msgstr "Mettre à jour votre projet Lignes de Temps"
@@ -706,56 +712,56 @@
 msgid "Projects shared with me only"
 msgstr "Projets partagés avec moi uniquement"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:48
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:75
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:47
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:163
 msgid "share.eye"
 msgstr "Cet utilisateur ou ce groupe a le droit de voir cet élement"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:56
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:162
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:55
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:161
 msgid "share.pencil"
 msgstr "cet utilisateur ou ce groupe a le droit de modifier cet élement"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:105
 msgid "share"
 msgstr "partager avec d'autres utilisateurs"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:115
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:114
 msgid "publish for everyone"
 msgstr "publier pour tout le monde"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:120
 msgid "User and group list"
 msgstr "Liste des groupes et des utilisateurs"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:132
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:131
 msgid "select all displayed elements"
 msgstr "ajouter tous les élements affichés"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:136
 msgid "select users"
 msgstr "choisir des utilisateurs"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:138
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
 msgid "remove users"
 msgstr "enlever des utilisateurs"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:143
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:142
 msgid "Members list"
 msgstr "liste des membres"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:153
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:152
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:7
 msgid "user"
 msgstr "utilisateur"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:155
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:9
 msgid "group"
 msgstr "groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:175
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:174
 msgid "remove all"
 msgstr "tout enlever"
 
@@ -1533,27 +1539,3 @@
 msgstr ""
 "Nous vous avons envoyé par courriel les instructions pour activer le compte "
 "à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement."
-
-#~ msgid "share this project"
-#~ msgstr "partager ce projet"
-
-#~ msgid "do not share"
-#~ msgstr "ne pas partager"
-
-#~ msgid "annotations on this media"
-#~ msgstr "annotations sur ce média"
-
-#~ msgid "User list"
-#~ msgstr "Liste des utilisateurs"
-
-#~ msgid "select all"
-#~ msgstr "Tout choisir"
-
-#~ msgid "contents"
-#~ msgstr "Liste des contenus"
-
-#~ msgid "indexation projects"
-#~ msgstr "Projets d'indexation"
-
-#~ msgid "nom"
-#~ msgstr "nom"