more translations, add buttons

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index a064299f74b295949e20ce140178a422fc0394cc..e1f2f0b7141b12cc940dd5b8257605e034f1019b 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -89,7 +89,7 @@
 
     <div style="float: right; font-size: 0.9em;">
         {% if topic.file %}
-        <a id="topic" href="{% url teleforma-document-download topic.id %}" class="component_icon button icon_download">{% trans "Topic" %}</a>
+        <a id="topic" href="{% url teleforma-document-download topic.id %}" class="component_icon button icon_download">&nbsp;{% trans "Topic" %}</a>
         {% endif %}
         {% if script.score %}
         <a id="score" href="#" class="component_icon button icon_ok">{% trans "Score" %} : {{ script.score|floatformat }}/20</a>
@@ -135,7 +135,7 @@
     </form>
     <br />
     <center>
-    <a href="#" id="validate_button" class="component_icon button icon_ok">{% trans "Validate" %}</a>
+    <a href="#" id="validate_button" class="component_icon button icon_ok">{% trans "Send" %}</a>
     </center>
     <br /><br />
 </div>

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index 1db424877728144d5e07b3bb955fe0dfae21a5f0..916243ac8093874b5143de59433c5b6aa603b188 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -25,6 +25,11 @@
 
 <div class="course_title">
 {% trans "New script" %}
+
+    <div style="float: right; font-size: 0.9em;">
+        <a id="blank_script" href="#" class="component_icon button icon_download">&nbsp;{% trans "Blank script" %}</a>
+    </div>
+
 </div>
 
 <div class="course_content" id="media_infos" style="font-size: 115%;">

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 51df99e1df7886378d723ca7627c8659e52da8cf..e99960247f7ce497edcbf1222a69c60f38e7ddb5 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 0049d48d91d576132f06b68169c71e27fd7512e1..e3864c771a98d7e4f6f00316a5d6301270406128 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-13 10:47+0200\n"
+"POT-Creation-Date: 2014-06-25 16:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: exam/models.py:60 exam/models.py:313
+#: exam/models.py:60 exam/models.py:306
 msgid "rejected"
 msgstr "rejeté"
 
@@ -32,7 +32,7 @@ msgstr "soumise"
 msgid "pending"
 msgstr "en attente"
 
-#: exam/models.py:61 exam/models.py:300
+#: exam/models.py:61 exam/models.py:293
 msgid "marked"
 msgstr "corrigée"
 
@@ -52,241 +52,232 @@ msgstr "mauvais cadrage"
 msgid "incomplete"
 msgstr "incomplet"
 
-#: exam/models.py:106 models/ae.py:46 models/core.py:205 models/crfpa.py:108
-#: models/crfpa.py:149 models/pro.py:101 models/pro.py:140
-msgid "user"
-msgstr "utilisateur"
-
-#: exam/models.py:109
-msgid "Corrector"
-msgstr "Correcteur"
-
-#: exam/models.py:110
-msgid "Correctors"
-msgstr "Correcteurs"
-
-#: exam/models.py:118 exam/models.py:191 models/core.py:198 models/core.py:252
-#: models/core.py:492 models/core.py:578 models/pro.py:45
+#: exam/models.py:106 exam/models.py:180 models/core.py:198 models/core.py:252
+#: models/core.py:492 models/core.py:579 models/pro.py:45
 msgid "course"
 msgstr "matière"
 
-#: exam/models.py:119 exam/models.py:200
+#: exam/models.py:107 exam/models.py:187
 msgid "corrector"
 msgstr "correcteur"
 
-#: exam/models.py:120
+#: exam/models.py:108 exam/models.py:181 models/ae.py:47 models/core.py:111
+#: models/core.py:136 models/core.py:250 models/core.py:497 models/core.py:542
+#: models/core.py:583 models/crfpa.py:64
+msgid "period"
+msgstr "période"
+
+#: exam/models.py:110
 msgid "value"
 msgstr "valeur"
 
-#: exam/models.py:121
+#: exam/models.py:111
 msgid "date start"
 msgstr "date de début"
 
-#: exam/models.py:122
+#: exam/models.py:112
 msgid "date end"
 msgstr "date de fin"
 
-#: exam/models.py:125
+#: exam/models.py:115
 msgid "Quota"
 msgstr ""
 
-#: exam/models.py:126
+#: exam/models.py:116
 msgid "Quotas"
 msgstr ""
 
-#: exam/models.py:147 models/core.py:458 models/pro.py:67
+#: exam/models.py:136 models/core.py:458 models/pro.py:67
 msgid "date added"
 msgstr "date d'ajout"
 
-#: exam/models.py:148 models/core.py:159 models/core.py:459 models/pro.py:68
+#: exam/models.py:137 models/core.py:159 models/core.py:459 models/pro.py:68
 msgid "date modified"
 msgstr "date de modification"
 
-#: exam/models.py:149
+#: exam/models.py:138
 msgid "UUID"
 msgstr ""
 
-#: exam/models.py:150
-#, fuzzy
+#: exam/models.py:139
 msgid "MIME type"
-msgstr "Type mime"
+msgstr "Type MIME"
 
-#: exam/models.py:151
+#: exam/models.py:140
 msgid "sha1"
 msgstr ""
 
-#: exam/models.py:167 exam/models.py:299 exam/models.py:312
+#: exam/models.py:156 exam/models.py:292 exam/models.py:305
 msgid "script"
 msgstr "copie"
 
-#: exam/models.py:168
+#: exam/models.py:157
 msgid "Page file"
 msgstr "Fichier de page"
 
-#: exam/models.py:169
+#: exam/models.py:158
 msgid "Image file"
 msgstr "Fichier image"
 
-#: exam/models.py:170 models/pro.py:49 models/pro.py:85
+#: exam/models.py:159 models/pro.py:49 models/pro.py:85
 msgid "rank"
 msgstr "rang"
 
-#: exam/models.py:173
+#: exam/models.py:162
 msgid "Page"
 msgstr "Page"
 
-#: exam/models.py:174
+#: exam/models.py:163
 msgid "Pages"
 msgstr "Pages"
 
-#: exam/models.py:179 models/core.py:93 models/core.py:106 models/core.py:128
+#: exam/models.py:168 models/core.py:93 models/core.py:106 models/core.py:128
 #: models/core.py:140 models/core.py:234 models/core.py:475 models/crfpa.py:47
 #: models/crfpa.py:63
 msgid "name"
 msgstr "nom"
 
-#: exam/models.py:182
+#: exam/models.py:171
 msgid "ScriptType"
-msgstr ""
+msgstr "Type de copie"
 
-#: exam/models.py:183
-#, fuzzy
+#: exam/models.py:172
 msgid "ScriptTypes"
-msgstr "type"
+msgstr "Types de copies"
 
-#: exam/models.py:192 models/ae.py:47 models/core.py:111 models/core.py:136
-#: models/core.py:250 models/core.py:497 models/core.py:541 models/core.py:582
-#: models/crfpa.py:64
-msgid "period"
-msgstr "période"
-
-#: exam/models.py:194 models/core.py:256
+#: exam/models.py:183 models/core.py:256 models/core.py:501
 msgid "session"
 msgstr "séance"
 
-#: exam/models.py:196 models/core.py:389 models/core.py:499 models/core.py:586
+#: exam/models.py:185 models/core.py:389 models/core.py:499 models/core.py:587
 msgid "type"
 msgstr "type"
 
-#: exam/models.py:197
+#: exam/models.py:186
 msgid "author"
 msgstr "auteur"
 
-#: exam/models.py:198
+#: exam/models.py:188
 msgid "PDF file"
 msgstr "Fichier PDF"
 
-#: exam/models.py:199
+#: exam/models.py:189
 msgid "Box UUID"
 msgstr ""
 
-#: exam/models.py:201
+#: exam/models.py:190
 msgid "score"
 msgstr "note"
 
-#: exam/models.py:202 models/pro.py:125
+#: exam/models.py:191 models/pro.py:125
 msgid "comments"
 msgstr "commentaires"
 
-#: exam/models.py:203 models/core.py:265 models/pro.py:48 models/pro.py:88
+#: exam/models.py:192 models/core.py:265 models/pro.py:48 models/pro.py:88
 #: models/pro.py:104
 msgid "status"
 msgstr "status"
 
-#: exam/models.py:204
+#: exam/models.py:193
 msgid "reason"
 msgstr "raison"
 
-#: exam/models.py:205
+#: exam/models.py:194
 msgid "date submitted"
 msgstr "date de soumission"
 
-#: exam/models.py:206
+#: exam/models.py:195
 msgid "date marked"
 msgstr "date de correction"
 
-#: exam/models.py:207
+#: exam/models.py:196
 msgid "date rejected"
 msgstr "date de rejet"
 
-#: exam/models.py:209
+#: exam/models.py:197
 msgid "URL"
 msgstr ""
 
-#: exam/models.py:215
+#: exam/models.py:201 exam/templates/exam/inc/script_list.html:15
+#: templates/teleforma/course.html:50
+#: templates/teleforma/course_conference.html:40
+#: templates/teleforma/course_conference.html:71
+#: templates/teleforma/course_conference_audio.html:68
+#: templates/teleforma/course_media.html:86
+#: templates/teleforma/course_media.html:135
+#: templates/teleforma/course_media_video_embed.html:34
+#: templates/teleforma/inc/conference_list.html:26
+#: templates/teleforma/inc/media_list.html:37
+msgid "Session"
+msgstr "Séance"
+
+#: exam/models.py:209
 msgid "Script"
 msgstr "Copie"
 
-#: exam/models.py:216 exam/templates/exam/scripts.html:21
+#: exam/models.py:210 exam/templates/exam/scripts.html:21
 #: templates/telemeta/base.html:116
 msgid "Scripts"
 msgstr "Copies"
 
-#: exam/views.py:65
+#: exam/views.py:73
 msgid "Pending scripts"
 msgstr "Copies en attente"
 
-#: exam/views.py:78
+#: exam/views.py:86
 msgid "Treated scripts"
 msgstr "Copie traitées"
 
-#: exam/views.py:91
+#: exam/views.py:99
 msgid "Rejected scripts"
 msgstr "Copies rejetées"
 
-#: exam/templates/exam/script_detail.html:85
-#: exam/templates/exam/inc/script_list.html:15 models/core.py:503
-#: templates/teleforma/course.html:50
-#: templates/teleforma/course_conference.html:40
-#: templates/teleforma/course_conference.html:71
-#: templates/teleforma/course_conference_audio.html:68
-#: templates/teleforma/course_media.html:86
-#: templates/teleforma/course_media.html:135
-#: templates/teleforma/course_media_video_embed.html:34
-#: templates/teleforma/inc/conference_list.html:26
-#: templates/teleforma/inc/media_list.html:37
-msgid "Session"
-msgstr "Séance"
+#: exam/templates/exam/script_detail.html:92
+msgid "Topic"
+msgstr "Sujet"
 
-#: exam/templates/exam/script_detail.html:90
-#: exam/templates/exam/inc/script_list.html:19
+#: exam/templates/exam/script_detail.html:95
+#: exam/templates/exam/inc/script_list.html:20
 msgid "Score"
 msgstr "Note"
 
-#: exam/templates/exam/script_detail.html:91
-#: exam/templates/exam/script_detail.html:107
+#: exam/templates/exam/script_detail.html:96
+#: exam/templates/exam/script_detail.html:112
 msgid "Comments"
 msgstr "Commentaire"
 
-#: exam/templates/exam/script_detail.html:93
+#: exam/templates/exam/script_detail.html:98
 #: exam/templates/exam/scripts.html:27 templates/postman/view.html:25
 msgid "Rejected"
 msgstr "Rejeté"
 
-#: exam/templates/exam/script_detail.html:96
-#: exam/templates/exam/script_detail.html:133
+#: exam/templates/exam/script_detail.html:101
 msgid "Scoring"
 msgstr "Noter"
 
-#: exam/templates/exam/script_detail.html:97
-#: exam/templates/exam/script_detail.html:138
-#: exam/templates/exam/script_detail.html:156
+#: exam/templates/exam/script_detail.html:102
+#: exam/templates/exam/script_detail.html:143
+#: exam/templates/exam/script_detail.html:161
 msgid "Reject"
 msgstr "Rejeter"
 
-#: exam/templates/exam/script_detail.html:99
+#: exam/templates/exam/script_detail.html:104
 msgid "Submitted"
 msgstr "Soumise"
 
-#: exam/templates/exam/script_detail.html:111
+#: exam/templates/exam/script_detail.html:116
 msgid "Mark"
 msgstr "Note"
 
-#: exam/templates/exam/script_form.html:25 exam/templates/exam/scripts.html:35
+#: exam/templates/exam/script_detail.html:138
+msgid "Validate"
+msgstr "Validée"
+
+#: exam/templates/exam/script_form.html:27 exam/templates/exam/scripts.html:35
 msgid "New script"
 msgstr "Nouvelle copie"
 
-#: exam/templates/exam/script_form.html:46
+#: exam/templates/exam/script_form.html:47
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -299,8 +290,8 @@ msgid "Pending"
 msgstr "En attente"
 
 #: exam/templates/exam/scripts.html:26
-msgid "Treated"
-msgstr "Traitées"
+msgid "Marked"
+msgstr "Corrigées"
 
 #: exam/templates/exam/scripts.html:56
 msgid "No scripts"
@@ -329,7 +320,7 @@ msgstr "Matière"
 #: templates/telemeta/lists.html:70
 #: templates/telemeta/inc/module_revisions.html:18
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: exam/templates/exam/inc/script_list.html:17
 msgid "Submission date"
@@ -339,6 +330,15 @@ msgstr "Date de soumission"
 msgid "Mark date"
 msgstr "Date de correction"
 
+#: exam/templates/exam/inc/script_list.html:19
+msgid "Corrector"
+msgstr "Correcteur"
+
+#: models/ae.py:46 models/core.py:205 models/crfpa.py:108 models/crfpa.py:149
+#: models/pro.py:101 models/pro.py:140
+msgid "user"
+msgstr "utilisateur"
+
 #: models/ae.py:49 models/crfpa.py:117
 msgid "platform only"
 msgstr "plateforme seulement"
@@ -353,7 +353,7 @@ msgstr "Etudiant AE"
 
 #: models/core.py:75
 msgid "Hidden"
-msgstr ""
+msgstr "Caché"
 
 #: models/core.py:76
 msgid "Private"
@@ -385,7 +385,7 @@ msgstr ""
 msgid "department"
 msgstr "département"
 
-#: models/core.py:148 models/core.py:253 models/core.py:494 models/core.py:580
+#: models/core.py:148 models/core.py:253 models/core.py:494 models/core.py:581
 msgid "course type"
 msgstr "type de matière"
 
@@ -399,11 +399,11 @@ msgstr "cote"
 
 #: models/core.py:158
 msgid "tweeter title"
-msgstr ""
+msgstr "titre tweeter"
 
 #: models/core.py:160 models/core.py:477
 msgid "number"
-msgstr ""
+msgstr "nombre"
 
 #: models/core.py:161 models/crfpa.py:67
 msgid "synthesis note"
@@ -441,21 +441,21 @@ msgstr "date de début"
 msgid "end date"
 msgstr "date de fin"
 
-#: models/core.py:263 models/core.py:507 models/core.py:544 models/core.py:587
+#: models/core.py:263 models/core.py:508 models/core.py:545 models/core.py:588
 msgid "readers"
 msgstr ""
 
-#: models/core.py:379 models/core.py:407 models/core.py:495 models/core.py:576
+#: models/core.py:379 models/core.py:407 models/core.py:495 models/core.py:577
 msgid "conference"
 msgstr "conférence"
 
 #: models/core.py:387
 msgid "host"
-msgstr ""
+msgstr "hôte"
 
 #: models/core.py:388
 msgid "port"
-msgstr ""
+msgstr "port"
 
 #: models/core.py:391
 msgid "source password"
@@ -501,19 +501,19 @@ msgstr ""
 msgid "document type"
 msgstr "type de document"
 
-#: models/core.py:501 models/crfpa.py:111
+#: models/core.py:503 models/crfpa.py:111
 msgid "iej"
 msgstr "iej"
 
-#: models/core.py:504
+#: models/core.py:505
 msgid "annal"
 msgstr "annale"
 
-#: models/core.py:505
+#: models/core.py:506
 msgid "year"
 msgstr "année"
 
-#: models/core.py:506 models/core.py:543
+#: models/core.py:507 models/core.py:544
 msgid "file"
 msgstr "fichier"
 
@@ -1438,7 +1438,7 @@ msgstr ""
 "Merci de vous connecter ou bien contactez l'administateur du site pour "
 "obtenir un accès privé."
 
-#: views/core.py:223
+#: views/core.py:221
 msgid ""
 "You do NOT have access to this resource and then have been redirected to "
 "your desk."
@@ -1446,12 +1446,15 @@ msgstr ""
 "Vous n'avez pas accès à cette ressource et avez été redirigé vers votre "
 "bureau."
 
-#: views/core.py:551
+#: views/core.py:549
 msgid "A new live conference has started : "
 msgstr "Une nouvelle conférence en direct a commencé : "
 
-#~ msgid "Validate"
-#~ msgstr "Validée"
+#~ msgid "Correctors"
+#~ msgstr "Correcteurs"
+
+#~ msgid "Treated"
+#~ msgstr "Traitées"
 
 #, fuzzy
 #~ msgid "Score : "