--- a/server/src/remie/static/remie/metadataplayer/AnnotationsController.js	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/AnnotationsController.js	Wed Sep 09 18:10:04 2015 +0200
@@ -21,8 +21,8 @@
 IriSP.Widgets.AnnotationsController.prototype.template = 
     "<div class='Ldt-AnnotationsController'>"
     + "<div class='Ldt-AnnotationsController-ButtonsContainer'>"
+    + "    <div class='Ldt-AnnotationsController-Button Ldt-AnnotationsController-ShowCreateAnnotationButton'>{{l10n.write}}</div>"
     + "    <div class='Ldt-AnnotationsController-Button Ldt-AnnotationsController-ShowAnnotationsListButton'>{{l10n.display}}</div>"
-    + "    <div class='Ldt-AnnotationsController-Button Ldt-AnnotationsController-ShowCreateAnnotationButton'>{{l10n.write}}</div>"
     + "</div>"
     + "</div>"
 

--- a/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js	Wed Sep 09 18:10:04 2015 +0200
@@ -53,6 +53,8 @@
     close_after_send: false,
     tag_prefix: "#",
     pause_when_displaying: false,
+    custom_send_button: false,
+    custom_cancel_button: false,
 };
 
 IriSP.Widgets.CreateAnnotation.prototype.messages = {
@@ -114,8 +116,8 @@
     + '{{#show_creator_field}}{{l10n.your_name_}} <input class="Ldt-CreateAnnotation-Creator empty" value="{{creator_name}}" {{#creator_field_readonly}}readonly{{/creator_field_readonly}}/>{{/show_creator_field}}</h3>'
     + '<textarea class="Ldt-CreateAnnotation-Description empty" placeholder="{{l10n.type_description}}"></textarea>'
     + '<div class="Ldt-CreateAnnotation-Avatar"><img src="{{creator_avatar}}" title="{{creator_name}}"></img></div>'
-    + '<input type="submit" class="Ldt-CreateAnnotation-Submit" value="{{l10n.submit}}" />'
-    + '<input type="button" class="Ldt-CreateAnnotation-Cancel" value="{{l10n.cancel}}" />'
+    + '<input type="submit" class="Ldt-CreateAnnotation-Submit" value="{{#custom_send_button}}{{custom_send_button}}{{/custom_send_button}}{{^custom_send_button}}{{l10n.submit}}{{/custom_send_button}}" />'
+    + '<input type="button" class="Ldt-CreateAnnotation-Cancel" value="{{#custom_cancel_button}}{{custom_cancel_button}}{{/custom_cancel_button}}{{^custom_cancel_button}}{{l10n.cancel}}{{/custom_cancel_button}}" />'
     + '{{#show_mic_record}}<div class="Ldt-CreateAnnotation-RecBlock"><div class="Ldt-CreateAnnotation-RecLabel">Add voice annotation</div>'
     + '    <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="220" height="160">'
     + '        <param name="movie" value="{{record_swf}}" />'

--- a/server/src/remie/templates/remie/iframe_markers.html	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_markers.html	Wed Sep 09 18:10:04 2015 +0200
@@ -80,7 +80,8 @@
             api_endpoint_template_edit: "{% url 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}{% templatetag openvariable %}annotation_id{% templatetag closevariable %}/",
             api_endpoint_template_delete: "{% url 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}{% templatetag openvariable %}annotation_id{% templatetag closevariable %}/",
             creator_name : "{{current_user}}",
-            project_id: "{{project_id}}"
+            project_id: "{{project_id}}",
+            custom_send_button: "Sauver",
         }
       ]
     }

--- a/server/src/remie/templates/remie/iframe_segments_group.html	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_segments_group.html	Wed Sep 09 18:10:04 2015 +0200
@@ -121,6 +121,7 @@
             // Change id to a given project id
             project_id: "{{project_id}}",
             pause_when_displaying: true,
+            custom_send_button: "Sauver",
         },{
             type: "AnnotationsList",
             container: "AnnotationsList_container",
@@ -132,7 +133,7 @@
             show_timecode: false,
             show_filters: true,
             show_header: true,
-            custom_header: "Contributions",
+            custom_header: "Travail du groupe",
             limit_count: false,
             start_visible: false,
             newest_first: true,
@@ -147,8 +148,7 @@
            	segments_annotation_type: "découpage",
            	selectable_annotations: true,
            	copy_and_edit_button: true,
-           	show_header: true,
-           	custom_header: "Dernière contribution"
+           	show_header: false,
         },{
          	type: "CurrentSegmentInfobox",
          	annotation_type: "découpage",

--- a/server/src/remie/templates/remie/iframe_segments_single.html	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_segments_single.html	Wed Sep 09 18:10:04 2015 +0200
@@ -120,6 +120,7 @@
             // Change id to a given project id
             project_id: "{{project_id}}",
             pause_when_displaying: true,
+            custom_send_button: "Sauver",
         },{
             type: "AnnotationsList",
             container: "AnnotationsList_container",
@@ -129,9 +130,9 @@
             show_creation_date: true,
             show_only_annotation_from_user: false,
             show_timecode: false,
-            show_filters: true,
+            show_filters: false,
             show_header: true,
-            custom_header: "Mes contributions",
+            custom_header: "Ce que j'ai écrit",
             limit_count: false,
             start_visible: false,
             newest_first: true,
@@ -146,8 +147,7 @@
             segments_annotation_type: "découpage",
             selectable_annotations: true,
             copy_and_edit_button: true,
-            show_header: true,
-            custom_header: "Ma dernière contribution"
+            show_header: false,
         },{
           type: "CurrentSegmentInfobox",
           annotation_type: "découpage",

--- a/server/src/remie/templates/remie/iframe_teacher.html	Wed Sep 09 18:08:32 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_teacher.html	Wed Sep 09 18:10:04 2015 +0200
@@ -132,7 +132,7 @@
             show_timecode: false,
             show_filters: true,
             show_header: true,
-            custom_header: "Contribution",
+            custom_header: "Travail du groupe",
             limit_count: false,
             start_visible: false,
             newest_first: true,
@@ -148,7 +148,6 @@
             selectable_annotations: true,
             copy_and_edit_button: true,
             show_header: true,
-            custom_header: "Dernière contributions"
         },{
           type: "CurrentSegmentInfobox",
           annotation_type: "découpage",