From 5316f67e50717f61e006b0bc52adfc89ef2e398a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Heikkil=C3=A4?= <timo.t.heikkila@utu.fi>
Date: Fri, 21 Dec 2018 12:39:43 +0200
Subject: [PATCH] updated translations

---
 .gitignore                                  |   1 +
 app/routes.py                               |   1 -
 app/templates/consent.html                  |   2 +-
 app/templates/index.html                    |   8 +-
 app/templates/task.html                     |  16 +++
 app/translations/el/LC_MESSAGES/messages.mo | Bin 5991 -> 6837 bytes
 app/translations/el/LC_MESSAGES/messages.po |  68 ++++++------
 app/translations/en/LC_MESSAGES/messages.mo | Bin 4781 -> 4763 bytes
 app/translations/en/LC_MESSAGES/messages.po |  36 +++---
 app/translations/fa/LC_MESSAGES/messages.mo | Bin 5428 -> 6204 bytes
 app/translations/fa/LC_MESSAGES/messages.po |  68 +++++++-----
 app/translations/fi/LC_MESSAGES/messages.mo | Bin 4648 -> 4630 bytes
 app/translations/fi/LC_MESSAGES/messages.po |  55 ++++++----
 app/translations/it/LC_MESSAGES/messages.mo | Bin 4781 -> 5089 bytes
 app/translations/it/LC_MESSAGES/messages.po | 116 ++++++++++----------
 app/translations/zh/LC_MESSAGES/messages.mo | Bin 4668 -> 4409 bytes
 app/translations/zh/LC_MESSAGES/messages.po |  68 ++++++------
 messages.pot                                |  30 +++--
 18 files changed, 254 insertions(+), 215 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30ee18a..32b42d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ cmd.txt
 DB_inserts.txt
 dumb.sql
 scrap_script.py
+config.py
 *.pyc
 *.db
 
diff --git a/app/routes.py b/app/routes.py
index 847d23f..5cc7193 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1929,7 +1929,6 @@ def remove_research_notification():
 
 
 @app.route('/view_research_notification')
-@login_required
 def view_research_notification():
     
     exp_id = request.args.get('exp_id', None)
diff --git a/app/templates/consent.html b/app/templates/consent.html
index ada1b8b..f8a236d 100644
--- a/app/templates/consent.html
+++ b/app/templates/consent.html
@@ -17,7 +17,7 @@
 <h3>{{ _('Consent for participation:') }}</h3>
 
 {% if experiment_info.research_notification_filename  %}
-<h5> {{ _('Research bulletin can be read') }}  <a href="{{ url_for('view_research_notification', exp_id=experiment_info.idexperiment) }}">{{ _('here.') }}</a></h5>
+<h5> <a href="{{ url_for('view_research_notification', exp_id=experiment_info.idexperiment) }}">{{ _('Research bulletin can be read here') }} </a></h5>
 {% endif %}
 
 {% for para in consent_paragraphs %}
diff --git a/app/templates/index.html b/app/templates/index.html
index ba931b1..8fa709a 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -34,7 +34,7 @@
                     
                      <ul class="list-group mb-3">
                          <li class="list-group-item active"><span class="font-weight-bold">{{ _('Name:') }}</span> {{ exp.name }} </li>
-                         <li class="list-group-item text-justify"><span class="font-weight-bold">{{ _('Instruction:') }}</span> 
+                         <li class="list-group-item"><span class="font-weight-bold">{{ _('Instruction:') }}</span> 
                          
                          {% autoescape false %}
                          {{ exp.short_instruction }}</li>
@@ -75,7 +75,7 @@
                     
                      <ul class="list-group mb-4">
                          <li class="list-group-item active"><span class="font-weight-bold">{{ _('Name:') }}</span> {{ exp.name }} </li>
-                         <li class="list-group-item text-justify"><span class="font-weight-bold">{{ _('Instruction:') }}</span> 
+                         <li class="list-group-item"><span class="font-weight-bold">{{ _('Instruction:') }}</span> 
                          
                          {% autoescape false %}
                          {{ exp.short_instruction }}</li>
@@ -119,7 +119,7 @@
                     <h3>Unpublished experiment:</h3>
                      <ul class="list-group mb-4">
                         <li class="list-group-item list-group-item-dark"><span class="font-weight-bold">Name:</span> {{ exp.name }} </li>
-                        <li class="list-group-item text-justify"><span class="font-weight-bold">Instruction:</span> 
+                        <li class="list-group-item"><span class="font-weight-bold">Instruction:</span> 
                         
                          {% autoescape false %}
                          {{ exp.short_instruction }}</li>
@@ -159,7 +159,7 @@
                     <h3>Unpublished experiment:</h3>
                      <ul class="list-group mb-4">
                         <li class="list-group-item list-group-item-dark"><span class="font-weight-bold">Name:</span> {{ exp.name }} </li>
-                        <li class="list-group-item text-justify"><span class="font-weight-bold">Instruction:</span> 
+                        <li class="list-group-item"><span class="font-weight-bold">Instruction:</span> 
                         
                         
                          {% autoescape false %}
diff --git a/app/templates/task.html b/app/templates/task.html
index 558975d..8eeaf5c 100644
--- a/app/templates/task.html
+++ b/app/templates/task.html
@@ -28,6 +28,10 @@
     
     {% if session['type']=='video' %}
         <div class="col-{{stimulus_size}} container stimulus mt-5 pt-5">
+        
+        
+        
+        
             {% for page in pages.items %}
                 <div class="embed-responsive embed-responsive-16by9">
                     <iframe class="embed-responsive-item" src="/{{ page.media }}" allowfullscreen></iframe>
@@ -38,7 +42,12 @@
 
 
     {% if session['type']=='audio' %}
+
         <div class="col-{{stimulus_size}} container stimulus mt-5 pt-5">
+
+
+
+
             {% for page in pages.items %}
                 <div class="embed-responsive embed-responsive-16by9">
                     <iframe class="embed-responsive-item" src="/{{ page.media }}" allowfullscreen></iframe>
@@ -73,6 +82,10 @@
     
     {% if session['type']=='video' %}
         <div class="col-{{stimulus_size}} container stimulus mt-5 pt-5">
+
+
+
+
             {% for page in pages.items %}
                 <div class="embed-responsive embed-responsive-16by9">
                     <iframe class="embed-responsive-item" src="/{{ randomized_stimulus.media }}" allowfullscreen></iframe>
@@ -84,6 +97,9 @@
 
     {% if session['type']=='audio' %}
         <div class="col-{{stimulus_size}} container stimulus mt-5 pt-5">
+
+
+
             {% for page in pages.items %}
                 <div class="embed-responsive embed-responsive-16by9">
                     <iframe class="embed-responsive-item" src="/{{ randomized_stimulus.media }}" allowfullscreen></iframe>
diff --git a/app/translations/el/LC_MESSAGES/messages.mo b/app/translations/el/LC_MESSAGES/messages.mo
index 7425c11d7744e83eed3dbf5241191577b486df07..2bc1396a866c90deb8c0e9897093ef49ea56d91d 100644
GIT binary patch
delta 2594
zcma)+U2KzO6vv;9eZXW4#x_J5yj>y=_r=V-U|yIhOTYvoL`J+&6JaWe4uc;c7j&f?
zW3g*u%EE#skc=paZAaIZuHCxDXiU60?}a8@EJ1}3qv#ch7eo_(=Y8AmBa_&z{k`w=
zah`Mj=bY!)*5otZTh%3_hEEIMEqn)x^ljnuN3k)hdHoZX!oOez{2Q)?<*ST&4A#IZ
z*aj=%b5Qr~gX>@q+yHywH}E9<-59TVw#1kN3~a}`8axHnz#y!FA;`bE#?KlUg$-~D
zmcx121n<B%VO5ziFT#(Y2YwB8{T--w%h>b^tbuDd-}LdoUULenr)QvU7=e$#>rfq=
zfg1Vu5L@O)s1eUY-FFXeg%6<a+f4Wx=@alZ_#5njdx)YNUWS`E-`wS41lj+AD%mIO
zR)ZIy1;^ob_$_RQ_h1*S$E!y8I@I;&bG!(5^8N)ph~1m8o^(CMq9EgY*1JmFgkF{8
zE)QzxK4h)gLZTjrJK%e;8)~FCpi1{0`~_Oo#*D$@jmEqHKZ7sBpP&bJkiQ482R6e4
zwJy)VHr~IgMgK!Q%rnpg+w0tkSD{Kh0yVNRsPkXKZSV)!0q;Y^FpZmx*-xY$@EY&_
zM~#WW=FK<-Z^2G@S}V2d=)1@I4u05Yy52g`8?RV(y`<E7yO+mI`TpY2x{4#KpKiC>
z+dDgU#Xqj_7wwdBdr;z%k(fOoVVRPo?U$6rP+DS^?Pqp|za+DB_K-wFwQGZ3yPuaq
z%O0|Ql45<D6>~bsQ&J{a8<VspQAtRu)yOD@vrBD7u%$MW`IGbvnU)A+3#a$nK0D})
z*ylLFC*fubSG|~X_h#6VmW<lQKb^xbnZcC_t3l37mau#>t0t2?#Ci401ixn+TCJR4
z%=AlIEwCcOK}-F@gzI{ii6MgXOQ>~YS?FqIU0w%v5ltativyFmlIHj*%b9W9{-0iJ
zLb7?25^F%fPmzz*M2I%$oa0qISUFn!l3Z4qiH*2A&9b*kxx7x3n>gZ}wFnl62sMV}
zVS*l(Y^QmWeOcDbNGx=C{Z_ABU=@cJB2)Dpkr<z_P+K#l`9}4a>WulUJzQ8tR_uV)
zxOexCLWX1ZAjbuC^PKC(M9z&EF<#+$4z-*r>-HGA%BsD)mzIq)Nf1QUuQi6LMfK*^
zEOVSg@nu8Nx;n3si!0b*NNevQE-gDlZHy3Sf($qfLcJ1%I<3t^c5(_KVML{*7?C#d
zhSsMWbnY;GOYx-!of1S;N4zisy2)kop`vQ&j&K<_fAL)#I*L4Ur7#+kX*;MDPhD$I
z$t)(5@zd4kiVp2#P(5{JLjtWNqN3Yn5_`y^i%HUPw`Y=0IjYBQAgTcN2PikZOiIEI
zwub6!#<yt(?ErElIDix_G+f#ak_@SN-Ye9jI;ZndyqLmg=d@h^7WOcz^IBed2RZ$n
zS}0iD)4C-`_&?>`5*jN7n7?SWB30TcTBA_sUXLYLwV(TOTzep_1<zT|kX~sr$*A@?
zH;Hq}=tZWYXsEMJ2d3To#3_1iiwGMQEnSuytHpAzBUkcLy&99DOI04PN*uuOiq0(V
zbz0-|6?3*Iy@i~)cc%*M&)aq`YR+-H#)mfnxglQXx}uBn{fH1WJeeEOel1vFS5AAx
z))Vy-8`gqRInoklwTiBn&wqMKow6c#bLly8@kU4+_Z(iPtTt761``=FnIA-{l%DRk
z*d!WHQxfV92Buk@aALwG5~u~HX=MJ$2PfXKny{%4Emq^<V|_=DpM0NdC~Dmfj5$-c
K10i4C&;J5qGw00!

delta 947
zcmYMxUr19?9Ki8&=dPQkOPy_*&ThG+GHh$*gF#W!i$Q--0v`&7-KAvP*qssvjgnF#
z2XPgI3IquvsGwUQ1SRxPPp)Xuo6$>wy+lS2VbJ&2gf2V#+;eu$@BDthJ=^!SJ-1Zn
zo>n~Vj3&lSO=ka}RhLp;rhib!@-n3=u?nj&h?_8s>+v8~<8hR8r_qNAti@q`h2yxa
zR8AdrD|M2E4x&rI36ucSSdVkaN6qt9fiG|?zCjOu!!}&O1a2-@svEE47JP@Ye+4CO
zfJ1#4#tQCNmwDl=nn1}kk0HE^>+m^BVy{suFCwwjCzOi6pq%@K&8SnhoC~8=8o@L8
z6Hj3eRUE+w803ESofk>KOY}+F??d*gJ4BJd_t3zn*oq%eTE2>hFi3XWu@7bc)irOS
zw0ssNktZ19ZyccwdFE4OpJPq6)RbBiL23B`l!SV)5&KYDIE+&947TBYOkfdba6h+o
z$sBueV_hlk1^mtY67Iqgf5|yN{ol>PTNb3{a=Qd>Mp^GhY56EhW!KhzpIVzQ;9k}X
zNHdgsL#fgll$IA!S{@51bsKMBC$<Jl1;&HUvTMQZJoX%O=>ulQY`0e{&U&LUBO2?B
z#+-r5F|DC1m9)%c)<~o>MmnC!4)zbG<JrMf(r&EE+XH3qot?giF8iY1VehDIvgh>{
z-{NfH%Hqqy7-M|#k^Nbpc3l2FTJ?z`Gj5rNWe%DBSzGf5ouT@aW>0!Tb|f(8>y2CI
ejdUh;E@N6&r~M;v*xBYC)$FB)kLCZeQ-1+)ZHqMk

diff --git a/app/translations/el/LC_MESSAGES/messages.po b/app/translations/el/LC_MESSAGES/messages.po
index d22d2d5..4af4364 100644
--- a/app/translations/el/LC_MESSAGES/messages.po
+++ b/app/translations/el/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: el\n"
@@ -28,15 +28,15 @@ msgstr "Είμαι έτοιμος να ξεκινήσω"
 
 #: app/routes.py:371
 msgid "ID already in use"
-msgstr ""
+msgstr "ID που χρησιμοποιείται ήδη."
 
 #: app/routes.py:380
 msgid "No such ID set for this experiment"
-msgstr ""
+msgstr "Δεν έχει οριστεί τέτοιο αναγνωριστικό (ID) για αυτό το πείραμα."
 
 #: app/templates/base.html:35
 msgid "Task progress:"
-msgstr ""
+msgstr "Πρόοδος εργασιών"
 
 #: app/templates/begin_with_id.html:8
 msgid "Please insert your ID-code below:"
@@ -52,19 +52,15 @@ msgstr "Προσοχή!"
 msgid ""
 "Participation in this experiment requires a login with a predetermined ID"
 " code. Please input ID below."
-msgstr ""
+msgstr "Η συμμετοχή σε αυτό το πείραμα απαιτεί σύνδεση με προκαθορισμένο κωδικό ταυτότητας. Εισαγάγετε το αναγνωριστικό παρακάτω."
 
 #: app/templates/consent.html:17
 msgid "Consent for participation:"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
+msgstr "Συγκατάθεση για συμμετοχή:"
 
 #: app/templates/consent.html:20
-msgid "here."
-msgstr ""
+msgid "Research bulletin can be read here"
+msgstr "Mπορείτε να διαβάσετε τo ερευνητικό δελτίο εδώ."
 
 #: app/templates/consent.html:29
 msgid "Agree"
@@ -99,60 +95,60 @@ msgid ""
 "Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! "
 "The experiments that are currently underway are listed below -\n"
 "       you can participate for as many experiments you want."
-msgstr ""
+msgstr "Καλώς ήρθατε στο εργαστήριο συστημάτων των ανθρώπινων συναισθημάτων! Τα πειράματα που βρίσκονται σε εξέλιξη αναφέρονται παρακάτω - μπορείτε να συμμετάσχετε σε όσα πειράματα θέλετε."
 
 #: app/templates/index.html:20
 msgid ""
 "If you are participating for a study for the first time, click on the "
 "\"Begin task\" -button. If you are returning to continue \n"
 "      a previously started task, click on the \"Continue task\" button."
-msgstr ""
+msgstr "Εάν συμμετέχετε για μελέτη για πρώτη φορά, κάντε κλικ στο κουμπί \"Έναρξη εργασίας\". Εάν επιστρέφετε για να συνεχίσετε μια εργασία που έχει ήδη ξεκινήσει, κάντε κλικ στο κουμπί \"Συνέχεια\"."
 
 #: app/templates/index.html:23
 msgid ""
 "You can choose the language suitable for you from the language menu in "
 "the upper right corner."
-msgstr ""
+msgstr "Μπορείτε να επιλέξετε τη γλώσσα που σας αρμόζει από το μενού γλώσσας στην επάνω δεξιά γωνία."
 
 #: app/templates/index.html:29
 msgid "List of experiments:"
-msgstr ""
+msgstr "Κατάλογος πειραμάτων:"
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
-msgstr ""
+msgstr "'Ονομα:"
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
-msgstr ""
+msgstr "Οδηγία:"
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
-msgstr ""
+msgstr "Το ID συμμετοχής απαιτείται για αυτήν την εργασία"
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr "Ξεκίνα την άσκηση"
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr "Συνέχιση της εργασίας"
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
 #: app/templates/instructions.html:4
 msgid "Instructions:"
-msgstr ""
+msgstr "Οδηγία:"
 
 #: app/templates/instructions.html:14
 msgid ""
@@ -199,25 +195,25 @@ msgstr ""
 
 #: app/templates/register.html:14
 msgid "Please select"
-msgstr ""
+msgstr "Παρακαλώ επιλέξτε"
 
 #: app/templates/register.html:22
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr "Εγκαταλείπω την εργασία"
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr "Επόμενη σελίδα"
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
-msgstr ""
+msgstr "Μπορείτε να κάνετε μεγέθυνση / σμίκρυνση της προβολής σελίδας πατώντας ctrl + / ctrl- (Windows) ή ⌘ + / ⌘- (Mac)"
 
 #: app/templates/task_completed.html:7
 msgid "Task completed!"
@@ -295,3 +291,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr ""
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr ""
+
+#~ msgid "here."
+#~ msgstr ""
+
diff --git a/app/translations/en/LC_MESSAGES/messages.mo b/app/translations/en/LC_MESSAGES/messages.mo
index bb77614203283df279384b59d0984ad20031ff55..f15f4f43a9ded6f9114729e8f9eff3ff7ebf00c3 100644
GIT binary patch
delta 817
zcmYk&Jt)L+9LMo5cjq|IIz*C(&T>g73z7^Zp%|_h7&s4u8<dAzTtbpeC^1+l3yFbb
z5sSfQkw}U1w8<dK`;&p|?q2`<-~apleZQY=-<mIao8eqGUZs5U_)N#>*Wc?k)-0Z%
zZ|K4g^xzjJq1$1Wi(X8{GEBx=R9y?EU=Y(Wgr_)$&t_4pcAB+uqlE5iIF4#CgI-)j
z-nPY80`6cD9-<qs(U14ohpBO9O*o2$c!GNV9@RIFq7L+80_R(p3u<i~HR%MZU;z_x
z7d6;1YV&iXmtCSZzDCu(U_O4L>T+0LoBFT|pD>7xY*CNvn9ce2z{LWwf1@Isr&<Fo
zp$=R{4X}xddJlE*1!|)kRNV_|katwn4vI8DCK9z>p^`qMNd2;SII0H4Tqx=Q>fi=s
z7HdW&5k!`<2>Njn`*0f-wU=oWbvNqyNmSnrRMdN@eo1M+{j-o#%S$7F75KTq(AJ8Y
ztP{0)KPu{Bq=!XNg>$H=S5S2as7+5%QO~lzqJBh0U6Vo7IE7Z%J2V(>9|>Ds|8QvE
k<Jfh&3I;-49=Tg%7gIbv@#TSnK%lCkazEm^bN&1C2b_vn&Hw-a

delta 818
zcmYMwPe|Hv7{~D^^JnV%<3ti7`!h5TGD(aM5ex<$a<GVCv7nvGJVs;JJZ+27A4oh^
zr#6C(v4a#rAc2Q<i=eKyQwM_)6`dUP{<K4)zJC7vKF{xYJ{z&0v3xb?E*h^SpH4o@
z4f^%?s=Lg*{QQRwdK%6A*o@5>#tw{P8@|9697EMjV=HFyDSp5Te#V+v-d?%Q#<?*_
zcQsr>H7H^Tw~@E)^X0=bKEoqy!b?ox4Q8?1W0t{B*o!Bq^Earz?G(MmDEfH5EpkDv
zEukh|#RzWU6Ffi-_8YbNDbmZ%Q5#>N>h7=$9oAM|6t!tTzQbF5gA;5qg5NRB^X-ZY
z4dA8w3h}ohXKj-%y8jLJ;2)?#_E3>mPy<v^oBc)A)lmaE99HBZ)F6FW!x}2_Gm7$D
zTb$EsFo25uCF;SGsK}>L5zZk?+80dVI%ctq8H_QFBA-W{Uq|)bMMYjg^@{}l_m2n2
zpIUp)4MjeT3~y7Y!Lq2$-=iX5M0(gqR9z7j`Bzk31-0ohD)IvBEAnep<fB0%$2HV~
rJHb-Tb?7erYI^N*a<dDw$wJ*X<4vV|Qt6>ox|H+(aUTBkJp5_*yhB$a

diff --git a/app/translations/en/LC_MESSAGES/messages.po b/app/translations/en/LC_MESSAGES/messages.po
index 94c651f..90d3ddf 100644
--- a/app/translations/en/LC_MESSAGES/messages.po
+++ b/app/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -59,11 +59,7 @@ msgid "Consent for participation:"
 msgstr ""
 
 #: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "here."
+msgid "Research bulletin can be read here"
 msgstr ""
 
 #: app/templates/consent.html:29
@@ -116,35 +112,35 @@ msgstr ""
 msgid "List of experiments:"
 msgstr ""
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
 msgstr ""
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
 msgstr ""
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
 msgstr ""
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr ""
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr ""
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
@@ -194,15 +190,15 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr ""
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr ""
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
@@ -269,3 +265,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr ""
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr ""
+
+#~ msgid "here."
+#~ msgstr ""
+
diff --git a/app/translations/fa/LC_MESSAGES/messages.mo b/app/translations/fa/LC_MESSAGES/messages.mo
index 86ae7e57e678f6f577d7576b10ec1fe02845f890..a2d5c96d7e279ddc626a202e8d5310f2f51aecc0 100644
GIT binary patch
delta 2543
zcmaKtPiS0K6vl7<w~0;DB(}9^d5J`9Y9~gzX+&%hp$ICvXf0G-G|@^mNUa(d`be0W
zWHDLDAe3%IH*Yc~napHj8Z8AQ3f&cPao-GdVHHv9LJ=3mg1_&+c`>QckeT26bM86c
z`QEv2%Keuf^sjX`eqi`Jz~^p0$vU0=^LL}(m@S<C3Y*}cuoeCV?|>~0#_WOJa624;
z+u);6>z;(|@EF_yN8p$6ZTPb>zInLOm}j_fAK8^~3@SkicEc>>-{kn(3g=-jya-!h
z74C=E;Y)CPvoTM=w_p$a0xJGGRNiJ5oq*kNEA`DN2dp(?P)gr}S}+aU-~yDeOHiF(
zf#fpZLUmk)TK5aw3vWWLyNmYKX&-z6{sfP~qjd2&{1EP<zWITJG`8P@vMkAJ6`Y3m
z!V6H=U9O#9h4*m&2iyfa3BD8dLkT$ykHV+n1LQpq=ipbgKgRVpP_6hI(APnIhcS=A
z-4OBSBvfa^P><#uM4R~<s*|g*3I|a2B5dn4<`H<N#u+FleuM#R?uuq)9;(4BFaf{m
z!vEtO)bXIz=?SPC??PEUTjMeu;CvPGZ+_=%Cu~7ICYZhOFdg>8_c=eq%@Vu?Uxy3W
zq#^Cu&DW9P*IpTY_RUdq<mIy?i>(a{jZNO^5e`3Vd8$6!-g;`wLxbMn;LyQCi|@3a
zuImj`;gk)+@o>WCJ)5&d8&or1n6hOX*kWbI=Ce23p7(V%OnbH*rn$ZtPI|Uri=Lfh
zZPLMhs`K?1iL?1|ocMy`-Knub#l^&xSU(jeqvSc2jB->nl^M_G?OZs)y$PSnks74w
zUYM?CD3<YTF`PoMEpRPGnbl7eNlz;t;>oxAIR~mh!gyT*HIhNoOSYi416$%k*?B;g
z+sb=BD<?g|b79g3PE1^)SnE!Dq@9wnv;r}%C)VDsvzI`Eo#ser?<P7;B`w3l#e>_t
zdY=VybV?5i9V;wO4w=obs$)g3Gm(mU>|^~bA14;K5g4Xrc3_v)oLx~|H8V71T<H`Q
zmUxPDVLx5uxLt6n{xuJp8}7RS%Kp~A)6d(LYQ}|;sJw0n62^5g8&38}eIVZ%E^I(l
zZNfBg>k=Z5B(r>{IE<2}s5KWRWiGQvOBnCQBYL1sluVfH_wBvDn-(51H}n{Z<U=i;
zVG>D|UMDVSnZ&tpBAS9tRVggIjKgL58@CxZ>4t#f9)2!k-J!tSyg9tm$nX?O<SI%T
z<AbtzP_xf<T-#I2La02*+j)X=E+o6u(U%?GQ9Z7m;^qzu)W+JzA(Usy^ifGWhg&M5
zt?cSLE9EP9?J_qsR+CbTj70Wi=Y_7QPb?c}e4<g!Hgxs*k$Y>EyhI}5>~kAyYEu;f
zDzV#rm`t@J_i-Kpb{=K;`7ufg+CuEowd}P%+%}Aq`x{?9>`h$JyGU81K_RX7OL}eA
zBbV)h+S4X3NTqu(QLC&e*l3beIHSnK0-m%RSFQ!tFU9Y~4I=ei7%@`uB$8evA<7fK
z!QzLTF#lb%WOHhSM3|z9po@#rAd{$Hw7%v+W0=A}_X>>HIDaa7`IOb)B4RL`36L8M
zJ&D~*Oh&DrCaL@%Nv!jj0r$IrDf}ehU)no$?(D1Hes91X9PsX!7FkaD(mu8jtG>&e
zcM(tlsmhEC$&;bHPl8Ik+sPHVrXh`9IQUq*rn%4vYkV<+<*8P;1Ee{T{iu8TZxpV&
AQUCw|

delta 950
zcmYMxUr19?9KiA8^t#PCwM`v~*0p9u($a)I1mQykk<cHK{=tf2cWoux*cM0+i4bmt
z^>WyYP!IJ`Sfa3^KUM@$_7*|J9Y*0x59UK;NDl^me<^gi_kPZ~obx-s-|s%}dboY~
zi?6DvxI#RwJYy9y`+u!ClyWisg9cVtDpiBESc?H{!64RSFM9DX%DxEJVGP&dC47x}
zTu^FQ^;Ic#ln-H|OTYq3fFd^H9pqL|c)9T<Zo+ry#P8UNOBlnA)k+=2QEbN#DC?I{
z;x@DC6b8}F`RWP-_NoF(rZ=z+Z=wfhP!gL(sr(}nOMOMD_#4W;W!!)UWy`)GN~K+R
z27lpkJVq7!aRLLJuYNF)1YATPrTultT2&;99DEBm<9(DCzDH^KJW8S~7{C@5H{mXn
zgbtvrKY@}+0w;;TgEkB?pJUN5-&8+kNNb`fEl;5&bQQVPHD1!fag<;10y}XQW4MH8
z@pOYyd+^zszft0b$>J{VLrHuQr9h{T{)ZSe_*N_FMX5A`@_huQ<<o1<;7;amQ7T-<
zW;Fb(EpJ7sbQ?;`7g1W?M^$OOjgo+$Hc5e@rqY7rRaI%qdB|bJt&A1YEADfy?jEzd
zXLol`DP9w=Sid)w%v#Bu8B1l%bTpGo3?$OgTq2d!KRpp`RembH@oshKAtPLGKPr#d
zljXc=-?N|EQ~I$HblDT-g8iVJ*YieEdwie0M+U8E)-to!pf!-w7kuq{i+@gEced%1
jjpN?_X!fF+&ZN#~tZY^rO&z5U*X0U59T=<rm!SF!EmV+7

diff --git a/app/translations/fa/LC_MESSAGES/messages.po b/app/translations/fa/LC_MESSAGES/messages.po
index 7c24612..e19b138 100644
--- a/app/translations/fa/LC_MESSAGES/messages.po
+++ b/app/translations/fa/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fa\n"
@@ -28,15 +28,15 @@ msgstr "برای شروع آزمایش آماده ام"
 
 #: app/routes.py:371
 msgid "ID already in use"
-msgstr ""
+msgstr "این شناسه در حال حاضر در حال استفاده است"
 
 #: app/routes.py:380
 msgid "No such ID set for this experiment"
-msgstr ""
+msgstr "چنین شناسه ای برای این آزمایش تعیین نشده است."
 
 #: app/templates/base.html:35
 msgid "Task progress:"
-msgstr ""
+msgstr "پیشرفت کار:"
 
 #: app/templates/begin_with_id.html:8
 msgid "Please insert your ID-code below:"
@@ -53,18 +53,16 @@ msgid ""
 "Participation in this experiment requires a login with a predetermined ID"
 " code. Please input ID below."
 msgstr ""
+"شرکت در این آزمایش نیاز به ورود به سامانه از طربق یک کد شناسایی از پیش "
+"تعیین شده دارد. لطفا  کد شناسایی را در زیر وارد کنید."
 
 #: app/templates/consent.html:17
 msgid "Consent for participation:"
-msgstr ""
+msgstr "موافقت برای مشارکت:"
 
 #: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "here."
-msgstr ""
+msgid "Research bulletin can be read here"
+msgstr "تحریریه تحقیقاتی را می توان در اینجا مطالعه کرد."
 
 #: app/templates/consent.html:29
 msgid "Agree"
@@ -97,60 +95,62 @@ msgid ""
 "Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! "
 "The experiments that are currently underway are listed below -\n"
 "       you can participate for as many experiments you want."
-msgstr ""
+msgstr "به تحقیق ...از گروه تحقیقاتی احساسات انسانها خوش آمدید. تحقیقاتی که در حال حاضرقابل انجام هستند در زیر ذکر شده است. شما می توانید درهر تعداد ازاین تحقیقات که مایل هستید شرکت کنید."
 
 #: app/templates/index.html:20
 msgid ""
 "If you are participating for a study for the first time, click on the "
 "\"Begin task\" -button. If you are returning to continue \n"
 "      a previously started task, click on the \"Continue task\" button."
-msgstr ""
+msgstr "اگر برای اولین بار در یک تحقیق شرکت میکنید، روی دکمه «شروع کار» کلیک کنید. اگرقصد بازگشت به یک تحقیق که قبلا شروع کرده اید دارید، دوباره روی دکمه \"ادامه کار\" کلیک کنید."
 
 #: app/templates/index.html:23
 msgid ""
 "You can choose the language suitable for you from the language menu in "
 "the upper right corner."
 msgstr ""
+"شما می توانید زبان مورد نظر خود را از منوی زبان در گوشه سمت راست بالا "
+"انتخاب کنید"
 
 #: app/templates/index.html:29
 msgid "List of experiments:"
-msgstr ""
+msgstr "لیست تحقیقات موجود در بانک اطلاعاتی::"
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
-msgstr ""
+msgstr "نام:"
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
-msgstr ""
+msgstr "دستورالعمل:"
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
-msgstr ""
+msgstr "داشتن کد شناسایی برای انجام این مرحله ضروری می باشد."
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr "آزمایش را شروع کنید"
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr "ادامه آزمایش"
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
 #: app/templates/instructions.html:4
 msgid "Instructions:"
-msgstr ""
+msgstr "دستورالعمل:"
 
 #: app/templates/instructions.html:14
 msgid ""
@@ -194,25 +194,27 @@ msgstr "لطفا قبل از شروع امتیازدهی به سوالات زم
 
 #: app/templates/register.html:14
 msgid "Please select"
-msgstr ""
+msgstr "لطفا انتخاب کنید"
 
 #: app/templates/register.html:22
 msgid "Submit"
 msgstr "ارسال"
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr "خروج از آزمایش"
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr "صفحه بعد"
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
 msgstr ""
+"شما می توانید با فشار دادن ctrl + / ctrl- (ویندوز) یا ⌘ + / ⌘- (مکینتاش) "
+"بزرگنمایی صفحه نمایش را  تنظیم کنید."
 
 #: app/templates/task_completed.html:7
 msgid "Task completed!"
@@ -284,3 +286,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr ""
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr "تحریریه تحقیقاتی را می توان در اینجا مطالعه کرد."
+
+#~ msgid "here."
+#~ msgstr "کلیک"
+
diff --git a/app/translations/fi/LC_MESSAGES/messages.mo b/app/translations/fi/LC_MESSAGES/messages.mo
index c722da35c6e3e25879f7f2b5a65166bda29a6754..405d930bafd9be2894b1fb3b27267e47b53d92da 100644
GIT binary patch
delta 832
zcmYMyPe@cz6vy#1f1DY|oTu{8G)F8{1d*Ibv09jcFeC~^32j=Gqqb-kf~lKkQ>$<_
z>dI)53)_e>8y$2};i70Mh)A`tKV*iYpdbl;fAFBky!qUF=bdx!IdA6brt30a%YswJ
z)y!SZ{miG?|7*u@7Ge4q3-A!5_z%xuIAB(VE;@J-i?IV0*Ml+a!%|G)2OPz1vy5E}
zn%!cdf$T~+hDz`pUCbgMo8zkx=kWqAVi-5E3Ab<nosij0e1hlk9qRclRNfFl_t3>c
z_O~<xVr>j{(x<3^2`s_|)WMcfm48HX*&3?iO;p?;tifYcTqWhJ(t5m)zp)RKRMCa6
zu!8;V2ZIUPeu8S*3!=$klc<emPzQXC=kN`xm8;(RIudGMPzU*iaXiFXbUFPBF5wLv
zr47oT$BYK=8C2pY)JES?2iZow+XHVsM)o%5E~c;>uj5-(<@;EUrL;wP8?hf-P=!o+
z>oZuveAc1=YV|S;CHT#Ia1Yh$Bh-QX{HXsz1Qi&^GHgYPv?S*74tAkKdj|0?CUFHx
zWg!K1_CJ1<zCDt*&cWeSE*e+}7Ss-<80N#h{%kDzFmfqTn@C)}d?hy?eGu?<XFr#m
T&FvO%__8m<aqromPP_jUs7_#2

delta 862
zcmYMxUr1A77{~F)xw${-W+OJRTq}-Of;1KqQ51m?1(g&=kb$vdj#ffD>$2U|E~=Yh
zS9K9BkRS?97hxE}h$OF~sEfd^`h!6ThInDx_XmRxJNumT?tPy3d7j;Krk(0yGB{;i
z1Kc~fZ@1~~|Fs@4i}3mvL)g)77Q;^L#5DGxg9$u@U3d}|H;Qo_$E{ewCf>p&v#K2r
znhmosNOmQxp%P5tHhhG9>?L1Oe2u$t9>e$x`*8)wac76wF}#Vp@I7k(3My}kpmXS8
zl=JNd55!sxRq0*q#Rs?rU!e+ni|YI%lFPoLI{uD|Tg429Xj^d(s?$Aq0sr6#o~DZ-
ze1d7tw`CqwK!ogf7=IkuYxl`QPJ4_x@F{BF3*3$~sF8kZt^Y(#=r^jMHB=*Es&8N)
z&f+^ff;Glb)d34U$PcKIe?c9zj4EUm^&fAx)_cf4$a@xDJd1~M7BztlOkpqMQQo~+
zzyqj89=6t}6U;x&!gCfBIFH@<qqT7jHS$eVK{0+*f!(OMK1||4q**(KGk6|{FwJ-_
z;V2%(H%Kar6QoIHlKxU)F6ciCp9q8|+-vSYeLY%;<nq~Eet$0SPsA>^*XyB_|E=qD
vTjor~yIj0dDSJh?FzLD3$*b8?#r3?g>&0?;%wJ6G3&gx;quD5xnhpC0tT$_^

diff --git a/app/translations/fi/LC_MESSAGES/messages.po b/app/translations/fi/LC_MESSAGES/messages.po
index 5d179b8..c3301ad 100644
--- a/app/translations/fi/LC_MESSAGES/messages.po
+++ b/app/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fi\n"
@@ -61,12 +61,8 @@ msgid "Consent for participation:"
 msgstr "Suostumus osallistumiseksi:"
 
 #: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr "Tutkimustiedote on luettavissa"
-
-#: app/templates/consent.html:20
-msgid "here."
-msgstr "täällä"
+msgid "Research bulletin can be read here"
+msgstr ""
 
 #: app/templates/consent.html:29
 msgid "Agree"
@@ -99,14 +95,20 @@ msgid ""
 "Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! "
 "The experiments that are currently underway are listed below -\n"
 "       you can participate for as many experiments you want."
-msgstr "Tervetuloa Human Emotion Systems –laboratorion Onni-nettilaboratorioon! Alla on listattuna tällä hetkellä käynnissä olevat kokeet – voit osallistua niin moneen kuin vain haluat."
+msgstr ""
+"Tervetuloa Human Emotion Systems –laboratorion Onni-nettilaboratorioon! "
+"Alla on listattuna tällä hetkellä käynnissä olevat kokeet – voit "
+"osallistua niin moneen kuin vain haluat."
 
 #: app/templates/index.html:20
 msgid ""
 "If you are participating for a study for the first time, click on the "
 "\"Begin task\" -button. If you are returning to continue \n"
 "      a previously started task, click on the \"Continue task\" button."
-msgstr "Jos osallistut kokeeseen ensimmäistä kertaa, klikkaa \"Aloita\" –painiketta. Jos taas palaat täyttämään kesken jäänyttä koetta, klikkaa \"Jatka\" –nappulaa.
+msgstr ""
+"Jos osallistut kokeeseen ensimmäistä kertaa, klikkaa \"Aloita\" "
+"–painiketta. Jos taas palaat täyttämään kesken jäänyttä koetta, klikkaa "
+"\"Jatka\" –nappulaa"
 
 #: app/templates/index.html:23
 msgid ""
@@ -116,37 +118,37 @@ msgstr "Voit valita kielen oikeassa yläkulmassa olevasta language-valikosta."
 
 #: app/templates/index.html:29
 msgid "List of experiments:"
-msgstr ""
+msgstr "Käynnissä olevat kokeet"
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
 msgstr "Nimi:"
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
 msgstr "Ohjeet:"
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
 msgstr "Tähän kokeeseen osallistumiseen vaaditaan ID-tunnus."
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr "Aloita"
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr "Jatka"
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr "AdminRun"
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr "Statistics"
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr "View / Edit"
 
@@ -160,7 +162,10 @@ msgid ""
 "return to finish the task later but you will need your participant ID-"
 "number in order to do that. Please save your participant ID before "
 "starting the rating task!"
-msgstr "Voit palata myöhemmin jatkamaan mahdollisesti kesken jäänyttä tehtävää, mutta tarvitset silloin osallistujatunnustasi. Ole hyvä ja talleta alla oleva ID-numerosi ennen kuin aloitat!"
+msgstr ""
+"Voit palata myöhemmin jatkamaan mahdollisesti kesken jäänyttä tehtävää, "
+"mutta tarvitset silloin osallistujatunnustasi. Ole hyvä ja talleta alla "
+"oleva ID-numerosi ennen kuin aloitat!"
 
 #: app/templates/instructions.html:17 app/templates/quit_task.html:11
 msgid "Your participant ID is:"
@@ -198,15 +203,15 @@ msgstr "Valitse"
 msgid "Submit"
 msgstr "Jatka"
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr "Lopeta"
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr "Seuraava"
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
@@ -275,3 +280,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr "Jatka"
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr "Tutkimustiedote on luettavissa"
+
+#~ msgid "here."
+#~ msgstr "täällä"
+
diff --git a/app/translations/it/LC_MESSAGES/messages.mo b/app/translations/it/LC_MESSAGES/messages.mo
index d5fb67d82144de40feb3f0b675e7fe8e99a12415..3cae4a0828bd1482dfa48fe4e689d3528520ca55 100644
GIT binary patch
literal 5089
zcmai%O>A996~`~7w8c;gZCVIIWo$m0klg3kpb}o1QYUc|7u!i~lhO_9y!+-oPjla$
z$IQKUoJC;)E2xA71vZGTP}v};Sb$Us6-$ULkyufI5EUT4wk%MQ_?@}$(@DTe{D1ep
znRCvZ^FRMN{{8)TzL@Zn^8W+;|MFYpY5en#JCfuc9{&lx4g4241HK8q6TJJaN%DU1
z5O^Or58exY8kBu&;Jd&p;Cny=?t{DF-@sFMCdpIaM=>t;u7R@uE8rpU8zBFZm-+Q}
z@Q2_W_*3w1@OAJQ_y*Vk@4G8Wo&<NmS@1Pb*1rLY-MiTI40s3>dj-hW<Qgb(J`c+J
z7r=LbKLRDLS3x=V4G>ewZ$LTk>!9rWJNPj8Z&3Cf=J0aPkAR;C{|a6KFXD6={2usT
z@K4|i<orLN<m;<!7W^jo5cpkC^7a$(gWxa02f;rNzJC*x_#WVw#GwW_58mMUaqvOx
z-^1aTcz&2gY)PI4<vcm~K5!S5JbWFLbA1c^82Eiq*8dtj3H}az9(;&JN5L1tN5G$h
z3*cWsiTm)oljKX_2~gtyF(~%;LH;E-__YZB7JLA_mqmxcSy19S1%3!T4+;;S10`Qy
z1V0RZ8<e<S1^)p43j7@SgZq=jgLh!`GhhWu-d+<YOYNR5HmV|7>Uv|6Gp1_`RqAjx
zIh(s+)VeEeW|Fh62&O1i$9dJ)o_DsdOY4fJd{x?_GRpI!=#HPGm2)=eX!*R&qcwHj
zRYf~lIj3~)jc)HL99F?3D;>4xDy6-d^iXu8Ppv{(u~z(-+eUS)52Y$?&m31-ZnLY(
z5jJ1UjZZMA(pFWLu4t$U+uoFwF9=kXPG!T`XH@*rs_)H?bydjs@W??;J7(jcm(ii+
zkaKF_XLyEP8@9##7b;sSJxENnqgsX|7{z-VRHw@Eleu0$H+VW86Oidb)j^7hjxC}w
zjwY^Du1n*^UtGIu^IR2%AW7XsWvJB3xwNQyEf$ks=i7Y1T-%W)T{hI^+-S-h^p3gJ
z-eH_E2QgU$P!~AHF`KMRSRFHh$_y%0*GnoI<HL94f!ehtxsl@--wTp&A(m-3uoy~T
zWi_iN9zru&wN%@6l)2V7o}w2eFV}U?@Y`G~AxzgK>rRC#+vemdn3}5PHd!8TVu`SM
zHn}`WVcEbkZzz{1mGudDBMEODSS#HzZFIOXQ0d%B`@|zgDzz!Ar@^p_lgzcvDD$@H
zQ$*gjOzw7ZQx~Ko6^%~Fi)!iYYS&A{z$FtTHR1o2ra3faX;~k6;_;J;_uAPlSBz>H
zxieZ4Om4DrXmZ!v(m<l!;+CWdF0yih!J5b?C_KTSn#r@tQ_>?*D&*5_vJo`_x<u;n
z7>xE*wMDNO1V)MV7Gz|d+BV*>L^@hsbUl-7O3x0Jh=&s5*eoQQRjX&qWJ_9T)Nix(
zbKg4@D!`~MsjL)U$c_@i$0%}<UybC7HM?qFEw{1sw8^mpi>0BAx>)rHYq<x%5Teb!
zP#Vac=DOuD;r!mSL0u{en-(y0{B~Atv3X2TajlUI6e6p<hv(=6)i-`u@5R?SLBXa-
z8kG)YYn1g-5vh{USO-O1ds7~yC3kgEHj-!fB-zZiok+c$BiBW@qM7I<Tj~~)EoNj(
z$GhJ2656mDP*qiZ8dG`O-7d+mFN`0XzwX#+i+Km%#fLPj+L2tg_G14B5tyv>`LTKV
zovI^G+X9k>qX?J!<JZ1(Y@T1dUenpp81=Tu)~Jrr>IAhKWK|be>#*zaC$v#26oZ?1
z7dcPmp}lv{LHKl~onA3M$PK41Z(MqE`Rtauvb?dma%p{L!}Ogm)3wmG?et954e6F^
zs^zt%mDMMf&Yjy>-rStId}%8^3rEFUdJfTUs>KrvC)0(+ba6o~EHppysbeP=Pn=+3
zy1|tro~G6<q>G<a3y(HGezIP-szaG>d0hmq0Oy<P{AX8J)%w!fvU+UF_2V<EgCaJ$
zW=0R`meD<VqaIsbeImCF=ev*3T+S=6^Ypw!i<_$G$H#Db@sz4Ro<35j+0$y_=*-&6
z+VVIh3yl*qatFfDbZf8A=}L5XzMpGboPto=Bf+PuvXh=1uan?A#;3~#T13s8>ST)u
zFBs@ThREe!Q=QRpTP-#o#lv_y!IxYUj_Cq9&8&2Y&0&wr=v-cJ+lnrMz>nx1vgwkg
zjLSXlVbI7?W4X*_YPn9Pxi<zkxERuEN9PsF5$7BkW)7NPr>TeLlA9-)uHAo0I-$bv
zW<9<{R|<)$3X!s^ZJm-9kx00~aOv_=*JDMtZRxjMwVX^V%rL`4j?OpNP}oHgX)%gl
zAgi@Gf*QtK6{F?S8Zk?#6Ble|+T_m2wK*7<ZsD=EGcqyPkdy3G4hg72#>J@GdYo|8
zwu7X_bh1s(l+oS6azbkgE@#{gn-t0(SN&@LmEi$m+6Nsxoo#mS|BM^Kx9xG%OX(d?
zc3af6ODfxtBUDZ<PDy7+``mG-#*aHPS@lfMd3*i37-i<@_p1V1!NLso5cV_?29fiA
zm^1cGFzdiU869vnG9jnP^HG7@CdyKzon%bgIOQ<HNg0HU=s~g~W6pquqt7<ZIGXcy
zbE{0?aB<GDOgP*#QJ6xIBqN`;(9As{P;$;>dwmBrq}Ie1=L9!lfmSH#)97$ES-o`@
z_Ftwju!0$5%FM9A8p-Ox781hW>}+6$QG?*>aR`pegY<l6QYjo$)?hFq>Z$6*nMG0;
ztHnU3f;2@#`d)@)scLj8QwUcZex!4R5q%v3=1_3cg=`~B6ti|Mxf)p{p<~X}YeS}`
z@&k6=#FQotksC>)1R<&JXkpx>A!t@J&i*e;!l|C4gWKfP$vi*kYV3|XhKJkpaH2^X
z$uj*p)t&JTRQ0F>JrMayQj-<Y7#X9`jMz%35oI@?lgH+SQ&B`&5&wE=BpbEf5KL6j
zIAl?ap$221*3L*T8NY@T*RWvfh?EKY98)CJBGa`7AC&;3d`s`e>Xt4>9mlb{*M|gb
zGAKe$tzfEXXlw#W<Zw=_1DG7q&X{6{5k)ePk7q7)cr=KKn2d%ozQA0N`Km`cX~Lcp
zqgKgmXVj5f&Ui;>)rIMXtyR#GU`?KPU_?%}MGesjc`YLxX&Q4;rFHhFWQDI8(uhJn
z9PkijnLin-{Z~}TL@{F3`1^xfwIVy-aL+QpMOMT)Egm&~+wF4F!sOhPMb{x-^s&w(
zPugVIYm^_o65E;Xwc=IFsyM}AMJjHCgoMV%q>CnxOM-74LhjoPbO^FHzj*23R0lPO
lrIy@JkV-0E%iDk@D8>b$P~C*l^W@deACk9kVvIGD{{lLtS2X|t

delta 823
zcmYMwO(?^09LMpm*=F->iIV5W4j!^52Pvf-P$WeZC&p3aY9|lLL(y)WkRmw@DJ8W7
zHz}^<;xHv4rz!6b2miLc{`>d)e*fR^=P7Vl6?yPEqsCRwx0vs8ivImyNr#z-zu)LW
zcdA)BW@085ViEc=2U{@<dr)=5n2lk~!x@a@0w&BN*5x$o<v|nO)o>BjAd308jeP8k
zA1_{DC0=71zF-Z0U>M8XW}P^X6?ls}|AFdTK+z!j(aZa7mK$nq5jE*5mf#j<;5llr
zE7az9NH2RtZTyU?`@&Lmv9{{`s7)Ji1V6DK``Dr#_py-o+Z#6;z(e;H;?G9T+9qA}
zd>8fN1Jod=sL11}0Ul7By`t)psDWG@R^<7pL8>u<2~^_u6h*kV0H@WU5fynG>cs=7
z$cIr8jw4Ij64u~4hVcSBv5ILF`6TN6I;!spD)Kn0UrFv?|3EJJQ)_iRP~<Jh@HT`R
zER5QG8Ws60(!=IZbx~C0JE*!iYSSB3<QuH7$lp<scld}L*H8=Y`C<vjr89Pv*6naj
jj7^QzZzR2=o?xgv7-|lNViW1LDX}ld@!tve?+N<>U4&T`

diff --git a/app/translations/it/LC_MESSAGES/messages.po b/app/translations/it/LC_MESSAGES/messages.po
index c58ab67..b8adfb3 100644
--- a/app/translations/it/LC_MESSAGES/messages.po
+++ b/app/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it\n"
@@ -20,137 +20,133 @@ msgstr ""
 
 #: app/forms.py:36
 msgid "Continue rating"
-msgstr ""
+msgstr "Continuare a valutare"
 
 #: app/forms.py:41
 msgid "Start rating"
-msgstr ""
+msgstr "Cominciare la valutazione"
 
 #: app/routes.py:371
 msgid "ID already in use"
-msgstr ""
+msgstr "ID già in uso"
 
 #: app/routes.py:380
 msgid "No such ID set for this experiment"
-msgstr ""
+msgstr "Nessun ID impostato per questo esperimento"
 
 #: app/templates/base.html:35
 msgid "Task progress:"
-msgstr ""
+msgstr "Progresso del processo:"
 
 #: app/templates/begin_with_id.html:8
 msgid "Please insert your ID-code below:"
-msgstr ""
+msgstr "Prego, inserire il codice ID qui sotto:"
 
 #: app/templates/begin_with_id.html:12 app/templates/consent.html:38
 #: app/templates/instructions.html:12 app/templates/quit_task.html:4
 #: app/templates/quit_task.html:7
 msgid "Notice!"
-msgstr ""
+msgstr "Attenzione!"
 
 #: app/templates/begin_with_id.html:13
 msgid ""
 "Participation in this experiment requires a login with a predetermined ID"
 " code. Please input ID below."
-msgstr ""
+msgstr "La partecipazione in questo esperimento richiede un login con un codice-ID predeterminato. Per favore inserire l'ID qui sotto."
 
 #: app/templates/consent.html:17
 msgid "Consent for participation:"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
+msgstr "Acconsento alla partecipazione:"
 
 #: app/templates/consent.html:20
-msgid "here."
-msgstr ""
+msgid "Research bulletin can be read here"
+msgstr "Il bollettino della ricerca può essere letto qui."
 
 #: app/templates/consent.html:29
 msgid "Agree"
-msgstr ""
+msgstr "Consento"
 
 #: app/templates/consent.html:30
 msgid "Disagree"
-msgstr ""
+msgstr "Non consento"
 
 #: app/templates/consent.html:41
 msgid ""
 "In order to participate for the study you need to agree with the terms "
 "presented."
-msgstr ""
+msgstr "Per partecipare allo studio deve consentire ai termini presentati"
 
 #: app/templates/consent.html:44
 msgid "Close Notice"
-msgstr ""
+msgstr "Chiudere l'avviso"
 
 #: app/templates/consent.html:45 app/templates/task_completed.html:15
 msgid "Return Home"
-msgstr ""
+msgstr "Ritornare alla Home"
 
 #: app/templates/continue_task.html:9
 msgid "Please insert your participant ID:"
-msgstr ""
+msgstr "Per favore inserisca il suo ID di partecipazione:"
 
 #: app/templates/index.html:18
 msgid ""
 "Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! "
 "The experiments that are currently underway are listed below -\n"
 "       you can participate for as many experiments you want."
-msgstr ""
+msgstr "Benvenuto al laboratorio Onni-net del laboratorio di sistemi di emozioni umane (Human Emotion Systems)! Gli esperimenti che sono attivi al momento sono listati qui sotto - può partecipare a quanti e quali esperimenti vuole."
 
 #: app/templates/index.html:20
 msgid ""
 "If you are participating for a study for the first time, click on the "
 "\"Begin task\" -button. If you are returning to continue \n"
 "      a previously started task, click on the \"Continue task\" button."
-msgstr ""
+msgstr "Se partecipa ad uno studio per la prima volta, clicchi sul bottone \"Comincia processo\". Se sta ritornando per continuare un processo cominciato precedentemente, clicchi sul bottone \"Continua processo\"."
 
 #: app/templates/index.html:23
 msgid ""
 "You can choose the language suitable for you from the language menu in "
 "the upper right corner."
-msgstr ""
+msgstr "Può scegliere la lingua preferita dal menu del linguaggio nell'angolo in alto a destra."
 
 #: app/templates/index.html:29
 msgid "List of experiments:"
-msgstr ""
+msgstr "Lista degli esperimenti:"
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
-msgstr ""
+msgstr "Nome:"
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
-msgstr ""
+msgstr "Istruzione:"
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
-msgstr ""
+msgstr "L'ID di partecipazione è richiesto per questo processo."
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
-msgstr ""
+msgstr "Cominciare il processo"
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
-msgstr ""
+msgstr "Continuare il processo"
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
 #: app/templates/instructions.html:4
 msgid "Instructions:"
-msgstr ""
+msgstr "Istruzioni"
 
 #: app/templates/instructions.html:14
 msgid ""
@@ -158,63 +154,63 @@ msgid ""
 "return to finish the task later but you will need your participant ID-"
 "number in order to do that. Please save your participant ID before "
 "starting the rating task!"
-msgstr ""
+msgstr "Se vuole uscire dal processo di valutazione prima che sia pienamente completato, può ritornare a completare il process più tardi, ma avrà bisogno del suo ID per farlo. Per favore memorizzare o appuntarsi l'ID di partecipazione prima di cominciare il processo di valutazione!"
 
 #: app/templates/instructions.html:17 app/templates/quit_task.html:11
 msgid "Your participant ID is:"
-msgstr ""
+msgstr "Il suo ID di partecipazione è:"
 
 #: app/templates/instructions.html:20
 msgid "Ready to start"
-msgstr ""
+msgstr "Pronto a partire"
 
 #: app/templates/quit_task.html:8
 msgid ""
 "Please write down your participant ID so you can return and finish the "
 "rating task later!"
-msgstr ""
+msgstr "Per favore si appunti il suo ID di partecipazione di modo da poter ritornare e completare il processo di valutazione più tardi."
 
 #: app/templates/quit_task.html:14
 msgid "Quit!"
-msgstr ""
+msgstr "Esci!"
 
 #: app/templates/register.html:6
 msgid "This is the registration page."
-msgstr ""
+msgstr "Questa è la pagina di registrazione"
 
 #: app/templates/register.html:7
 msgid "Please fill in these background questions before starting the rating task:"
-msgstr ""
+msgstr "Completare queste domande sul suo passato"
 
 #: app/templates/register.html:14
 msgid "Please select"
-msgstr ""
+msgstr "Selezionare per favore"
 
 #: app/templates/register.html:22
 msgid "Submit"
-msgstr ""
+msgstr "Completa (manda per considerazione)"
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
-msgstr ""
+msgstr "Esci dal processo"
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
-msgstr ""
+msgstr "Prossima pagina"
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
-msgstr ""
+msgstr "Si può cambiare lo zoom della visualizzazione della pagina premendo ctrl+/ctrl- (Windows) oppure ⌘+/⌘- (Mac)"
 
 #: app/templates/task_completed.html:7
 msgid "Task completed!"
-msgstr ""
+msgstr "Processo completato!"
 
 #: app/templates/task_completed.html:11
 msgid "You have completed the rating task. Thank you for your participation."
-msgstr ""
+msgstr "Il processo di valutazione è stato completo. Grazie per la partecipazione."
 
 #: app/templates/test_page.html:7
 msgid "File Not Found"
@@ -269,3 +265,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr ""
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr ""
+
+#~ msgid "here."
+#~ msgstr ""
+
diff --git a/app/translations/zh/LC_MESSAGES/messages.mo b/app/translations/zh/LC_MESSAGES/messages.mo
index 91aff88f0a2c2e391fd6b221702506ed205c52c8..8bb0c4c3791602e08f7bb0e3ebfab09d9c388cb4 100644
GIT binary patch
delta 1518
zcmZY7TWl0n7{KvUD3q4c1yWP5WQ&(b2$C9jKpzYm5jEA|1Bow92v*d@YK#|rahG1O
z+ip9gL!p-~?KCXi>UOuVnr=H=H^vu9eDU@`NHA&VoS6}&i4U3>O#GkBxIDPoo!^<6
z^L^+0&e_sKi#uaCwpR}eK707x&#${m-`)BAwoZsm-2RRm@K3D6+gOh^>xH-%8!>`=
zaSJ|$I<6HP@F;G>cKilE!e51mi6^UtIKqQR$gUHfM4g}q8_`6*BEzK?bGQ?WScBJb
zH?HFA7}+Sq3-}>6<JYL?ucFSok)T(x5o=jrbTA-RoJ3veC#VAka5K)MF06#Q^Q%ZM
z@e}HfucMB;i97Ib)N%LFzV7s4Y(pQ9;$gaY7ALWZ^@U_`nr;6F^_F!Ltrr+Tz3|yk
zD>N5shklEMil0#z@(bRDx3CYZN%B1!cmR*F4SN1K#`GY~KzEW4Uz9_yqVDL&@cs|H
zkNexGJGh(GTCfctz%!va)P;YC&*8Q3zL`aIV~^o>+#g~8^#X@^paV{XFWyJJ)t{mc
z7z&?{B43f^qB|@hO^P2-@8k`98r!xC@jP0%A8%q4HtT=j!Pnk?v*VQyI>f;f@3j}|
z*3VaOh`!OzaH-~{b!J1|@lB7nL|a;(*mt1taowS+dYQZ6f0pzu+nr3C*Ea8qxo0z~
zcR`*RkPBD5>Cc_zGEaoO)Tu6{oaHGsl6SLNrx;gROB$U{anQ@BgCuLEq?cb%$;3)L
zB};KR)9=`}?6X$l6Fl^Xa;x#qN*>pqaqT&$*he0BtUH)VhUQ9&aK`^q6jtiDRK>jf
z7iwg1tu!X?jDj*`?|IM4=r_8Fx$}DD6#FUJx4vX{Sgli>tF-DAnK&X-8KDXp)orYm
zP6?ID21WU)xOeGPWiCw!X*|;@`=*!@Zr^`X*fW(%&`)K$J8Ju*r-QBWzA|M`y7J1r
z)$mR|?fUVA>YpXA`BvoJ9YIDlVY%ZuY2+!2;{AzfFK<iZocUMeP$a0!E023tk~Yj2
zw>}tC*=esls3y{~civfAaxdGet4DQDx&_;{C&Qh|UDQWl<Q+TB+0g-&h8<XotjBq?
zdwNMb&8kd}a^yjPKW4~smr8K(SAt;5aF&OI_*PMwNVvRg$i-o46gXdRW{6e1{G6AG
zdqzqQ3<v!(-&veeUHQsewpCZgf5nW~HtkZq=b|ggk==W_?1?_wdhGbFs7lPri!;1&
QOS5v`;6T|K)7|#+zch6>IsgCw

delta 943
zcmYMwT}V@57{Kv&b7x=f!$!4`bW`U|g0)tI2H{0yP+?yZ1Su>#%b{#zTM%8eg0Mj!
z5~p1jL<G@I&_P-$C3Io8LPU5`P_jxd7AVohivCXxI&A0nzAxu_-sgFqch5yi9|E?D
z;_2tVmH!Qk?EXIut5Qz3zfePai&Ad%pa+B4juG_Z0DAEVO56zgFohfNJif+jxS~`^
z9kMBPjDtAYC1DvQK?OJB1LUWwyj=JayYUS=a25M-4O1AhD|Ha3unQMazF$MhyP2R<
z7(o~Jt4l11Rb`Y)Z(#@C#a5g}DQp3y^S4MY^%14x8cN&`>_m;WB`$)}=?)ylbv%hD
z=wd%U#vu2r?<}MMC)uYMzYqCVRmdV2-9sthVbiB5BY)N0FE#ywGNE;pf_|fn+)J<&
z62e9NjC*i~ag-!+orR31!AnN&CRz##p(N}@8R7Qk{y6rrKaD9YV-)Kslj~wE;s8qC
z5j=nsDEFBtjm`U+e}KgT2NJN<{NN|bxz_e?<XcbzdQi@{A$O_0xCsv<&8jmfon}x*
zzLWN4<hOA*e#Ibml0+Je2h0`gyv=;#7_w^PdS3508m_a>Xe=C!C89BN+&yS%-<Qo4
z^h`0F%I3qlWWJalOXrfsbT*SPUbOBq^p<z#w8vvHE@*Mra`pOh_42p-GsZJ5;;NaC
zYFDT0b61Q{+8txmm+>B*)RP50T+k==v7+(bmosiUI*gQm&^MecOoVg!?76&NC?t$o
Te~;Pgyl632+lK6aD^q^}GP#Lq

diff --git a/app/translations/zh/LC_MESSAGES/messages.po b/app/translations/zh/LC_MESSAGES/messages.po
index 6246005..dfb48af 100644
--- a/app/translations/zh/LC_MESSAGES/messages.po
+++ b/app/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+0200\n"
 "PO-Revision-Date: 2018-11-27 16:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -28,15 +28,15 @@ msgstr "我准备开始了"
 
 #: app/routes.py:371
 msgid "ID already in use"
-msgstr ""
+msgstr "用户名已被使用"
 
 #: app/routes.py:380
 msgid "No such ID set for this experiment"
-msgstr ""
+msgstr "该实验中用户名不存在"
 
 #: app/templates/base.html:35
 msgid "Task progress:"
-msgstr ""
+msgstr "任务进行中"
 
 #: app/templates/begin_with_id.html:8
 msgid "Please insert your ID-code below:"
@@ -52,19 +52,15 @@ msgstr "注意!"
 msgid ""
 "Participation in this experiment requires a login with a predetermined ID"
 " code. Please input ID below."
-msgstr ""
+msgstr "参加本实验需要用已有的用户名登陆,请输入用户名"
 
 #: app/templates/consent.html:17
 msgid "Consent for participation:"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
+msgstr "实验须知"
 
 #: app/templates/consent.html:20
-msgid "here."
-msgstr ""
+msgid "Research bulletin can be read here"
+msgstr "实验条目可在下面读取"
 
 #: app/templates/consent.html:29
 msgid "Agree"
@@ -97,60 +93,60 @@ msgid ""
 "Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! "
 "The experiments that are currently underway are listed below -\n"
 "       you can participate for as many experiments you want."
-msgstr ""
+msgstr "欢迎来到人类情感系统实验室。可以参加的实验项目被列在以下。 你可以随心所欲参加任何实验"
 
 #: app/templates/index.html:20
 msgid ""
 "If you are participating for a study for the first time, click on the "
 "\"Begin task\" -button. If you are returning to continue \n"
 "      a previously started task, click on the \"Continue task\" button."
-msgstr ""
+msgstr "如果你是第一次参与该实验,请按“开始任务”按钮。如果你继续上次的任务,请按“继续任务”按钮。"
 
 #: app/templates/index.html:23
 msgid ""
 "You can choose the language suitable for you from the language menu in "
 "the upper right corner."
-msgstr ""
+msgstr "你可以在屏幕右上角的语言菜单选择你习惯的语言"
 
 #: app/templates/index.html:29
 msgid "List of experiments:"
-msgstr ""
+msgstr "实验列表:"
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
-msgstr ""
+msgstr "名字:"
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
-msgstr ""
+msgstr "说明:"
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
-msgstr ""
+msgstr "本任务需要用户名。"
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr "开始任务"
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr "继续任务"
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
 #: app/templates/instructions.html:4
 msgid "Instructions:"
-msgstr ""
+msgstr "说明:"
 
 #: app/templates/instructions.html:14
 msgid ""
@@ -188,25 +184,25 @@ msgstr "请在开始评分前填写以下相关的问题:"
 
 #: app/templates/register.html:14
 msgid "Please select"
-msgstr ""
+msgstr "请选择。"
 
 #: app/templates/register.html:22
 msgid "Submit"
 msgstr "提交"
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr "退出任务"
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr "下一页"
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
-msgstr ""
+msgstr "可以按 ctrl+/ctrl- (Windows) 或 ⌘+/⌘- (Mac) 扩大或缩小页面"
 
 #: app/templates/task_completed.html:7
 msgid "Task completed!"
@@ -269,3 +265,9 @@ msgstr ""
 #~ msgid "Continue task"
 #~ msgstr ""
 
+#~ msgid "Research bulletin can be read"
+#~ msgstr ""
+
+#~ msgid "here."
+#~ msgstr ""
+
diff --git a/messages.pot b/messages.pot
index 3d74795..989302a 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-12-13 13:13+0200\n"
+"POT-Creation-Date: 2018-12-21 11:49+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"
@@ -58,11 +58,7 @@ msgid "Consent for participation:"
 msgstr ""
 
 #: app/templates/consent.html:20
-msgid "Research bulletin can be read"
-msgstr ""
-
-#: app/templates/consent.html:20
-msgid "here."
+msgid "Research bulletin can be read here"
 msgstr ""
 
 #: app/templates/consent.html:29
@@ -115,35 +111,35 @@ msgstr ""
 msgid "List of experiments:"
 msgstr ""
 
-#: app/templates/index.html:36 app/templates/index.html:72
+#: app/templates/index.html:36 app/templates/index.html:77
 msgid "Name:"
 msgstr ""
 
-#: app/templates/index.html:37 app/templates/index.html:73
+#: app/templates/index.html:37 app/templates/index.html:78
 msgid "Instruction:"
 msgstr ""
 
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:50 app/templates/index.html:93
 msgid "Participation ID is required for this task."
 msgstr ""
 
-#: app/templates/index.html:51 app/templates/index.html:86
+#: app/templates/index.html:56 app/templates/index.html:99
 msgid "Begin task"
 msgstr ""
 
-#: app/templates/index.html:52 app/templates/index.html:87
+#: app/templates/index.html:57 app/templates/index.html:100
 msgid "Continue task"
 msgstr ""
 
-#: app/templates/index.html:56 app/templates/index.html:91
+#: app/templates/index.html:61 app/templates/index.html:104
 msgid "AdminRun"
 msgstr ""
 
-#: app/templates/index.html:57 app/templates/index.html:92
+#: app/templates/index.html:62 app/templates/index.html:105
 msgid "Statistics"
 msgstr ""
 
-#: app/templates/index.html:58 app/templates/index.html:93
+#: app/templates/index.html:63 app/templates/index.html:106
 msgid "View / Edit"
 msgstr ""
 
@@ -193,15 +189,15 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: app/templates/task.html:127
+#: app/templates/task.html:143
 msgid "Quit task"
 msgstr ""
 
-#: app/templates/task.html:128
+#: app/templates/task.html:144
 msgid "Next page"
 msgstr ""
 
-#: app/templates/task.html:132
+#: app/templates/task.html:148
 msgid ""
 "You can zoom in/out the page view by pressing ctrl+/ctrl- (Windows) or "
 "⌘+/⌘- (Mac)"
-- 
GitLab