diff --git a/app/__init__.py b/app/__init__.py
index 00098fcb58c7967e455d2427eeec1a96efcc1883..4051a1c904b83abfa146777bcc5b2f672c252e70 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -8,7 +8,7 @@ from flask_babel import Babel
from flask import request
from flask import session
from flask import flash
-
+import pymysql
app = Flask(__name__)
#app.config['BABEL_DEFAULT_LOCALE'] = 'fin'
diff --git a/app/models.py b/app/models.py
index 4686b9892d6de1494d21e4a67edf2440fce2dbc6..85ab39a9d32167449b7662c9ffab678419d5aed2 100644
--- a/app/models.py
+++ b/app/models.py
@@ -123,7 +123,7 @@ class page (db.Model):
idpage = db.Column(db.Integer, primary_key=True)
experiment_idexperiment = db.Column(db.Integer, db.ForeignKey('experiment.idexperiment'))
type = db.Column(db.String(120), index=True)
- text = db.Column(db.String(120), index=True)
+ text = db.Column(db.Text)
media = db.Column(db.String(120), index=True)
"""
def __repr__(self):
diff --git a/app/routes.py b/app/routes.py
index 991bb632620ee08df11e504c0950988f0d4c630c..847d23f71cc0dc0374299870e0a3a22a7d91d638 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -76,6 +76,12 @@ def consent():
experiment_info = experiment.query.filter_by(idexperiment=exp_id).first()
+ instruction_paragraphs = str(experiment_info.short_instruction)
+ instruction_paragraphs = instruction_paragraphs.split('<br>')
+
+ consent_paragraphs = str(experiment_info.consent_text)
+ consent_paragraphs = consent_paragraphs.split('<br>')
+
@@ -87,7 +93,7 @@ def consent():
- return render_template('consent.html', exp_id=exp_id, experiment_info=experiment_info)
+ return render_template('consent.html', exp_id=exp_id, experiment_info=experiment_info, instruction_paragraphs=instruction_paragraphs, consent_paragraphs=consent_paragraphs)
@app.route('/set_language')
@@ -420,8 +426,14 @@ def create_task():
def instructions():
participant_id = session['user']
- instructions = experiment.query.filter_by(idexperiment = session['exp_id']).all()
- return render_template('instructions.html', instructions=instructions, participant_id=participant_id)
+ instructions = experiment.query.filter_by(idexperiment = session['exp_id']).first()
+
+ instruction_paragraphs = str(instructions.instruction)
+ instruction_paragraphs = instruction_paragraphs.split('<br>')
+
+
+
+ return render_template('instructions.html', instruction_paragraphs=instruction_paragraphs, participant_id=participant_id)
@app.route('/task/<int:page_num>', methods=['GET', 'POST'])
diff --git a/app/static/css/slider.css b/app/static/css/slider.css
index 7cfc2e6e8385bc26f0e27953db85cb625cc0261b..7ed7cdb88a4e9b23270d9ae1055e45ca9de0089b 100644
--- a/app/static/css/slider.css
+++ b/app/static/css/slider.css
@@ -4,3 +4,4 @@ input[type='range'] {
}
+
diff --git a/app/static/img/onni_LOGO-RGB-transparent_bg.png b/app/static/img/onni_LOGO-RGB-transparent_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ba738dab08f9b3ae400f298429d6cad37d0ff4f
Binary files /dev/null and b/app/static/img/onni_LOGO-RGB-transparent_bg.png differ
diff --git a/app/static/img/onni_LOGO-RGB-transparent_bg_cut.png b/app/static/img/onni_LOGO-RGB-transparent_bg_cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..23650a2a3e8f6cdb7675314292d005492ff9821e
Binary files /dev/null and b/app/static/img/onni_LOGO-RGB-transparent_bg_cut.png differ
diff --git a/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg.png b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..80d1169875a2068c759339de39cc81e99e26c30d
Binary files /dev/null and b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg.png differ
diff --git a/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.png b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e0b23b94310e585138ecf7f1830332f5d0bf3a
Binary files /dev/null and b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.png differ
diff --git a/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.xcf b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..92e5032fcd78280be628ed9408b84fc6a3565973
Binary files /dev/null and b/app/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.xcf differ
diff --git a/app/templates/base.html b/app/templates/base.html
index a1fb514638d81f080e044679e1daea5d56508834..c8b4c59e28e16f00c42ce42391bb448fd1427edf 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -25,65 +25,92 @@
<body>
<header>
<!-- Navigation -->
-<nav class="navbar navbar-expand navbar-dark bg-dark fixed-top">
- <div class="col navbar-brand">
- <img src="/static/img/madam-300x250.jpg" alt="Logo" style="width:70px;">
+<nav class="navbar navbar-expand bg-light fixed-top">
+
+
{% if pages %}
- <a class="navbar-brand pl-5 font-weight-light"><span class="text-success font-weight-bold">{{ session['user']}}</span></a>
+
+ <div class="navbar-brand font-weight-light"><span class="text-primary font-weight-bold">ID:{{ session['user']}}</span>
+ </div>
+ <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {{ progress_bar_percentage }}%;" aria-valuemin="0" aria-valuemax="100">{{ _('Task progress:') }} {{ progress_bar_percentage }}%
+ </div>
+
+
{% else %}
-
-
- <a class="navbar-brand pl-3 text-success font-weight-light" href="{{ url_for('index') }}" class="nav-link">Onni</a>
-
-
- {% endif %}
- </div>
- <div class="navbar-nav w-50">
- {% if pages %}
- <div class="progress-bar bg-success progress-bar-striped" role="progressbar" style="width: {{ progress_bar_percentage }}%" aria-valuemin="0" aria-valuemax="100">{{ _('Task progress:') }} {{ progress_bar_percentage }}%</div>
- {% endif %}
- </div>
- <div class="col text-success text-right">
+
+
+ <div class="col-1 navbar-brand">
+ <a href="{{ url_for('index') }}">
+ <img class="mt-1 mb-1" src="/static/img/onni_LOGO-horizontal-RGB-transparent_bg_cut.png" alt="Logo" height=40">
+ </a>
+
+
{% block navbar %}
{% with messages = get_flashed_messages() %}
{% if messages %}
{% for message in messages %}
- <a class="text">{{ message }}</a>
+
+ <a class="pl-5 text-align-center text-danger">{{ message }}</a>
+
{% endfor %}
{% endif %}
{% endwith %}
{% endblock %}
- {% if current_user.is_authenticated %}
+
+
+
+
+
+ </div>
+
+
+
+
+ {% if current_user.is_authenticated %}
+
+
+
+ <div class="col-11 text-primary text-right">
+
+
+
+ <a class="nav-item" href="{{ url_for('researcher_info') }}" class="nav-link">Info |</a>
+ <a class="nav-item" href="{{ url_for('create_experiment') }}" class="nav-link">Create |</a>
+ <a class="nav-item" href="" class="nav-link">Archives |</a>
+ <a class="nav-item" href="{{ url_for('logout') }}" class="nav-link">Logout |</a>
<a class="nav-item dropdown">
- <a class="nav-item dropdown-toggle text-align-right" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <a class="nav-item dropdown-toggle text-align-right" href="#" id="navbarDropdown_auth" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Language
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown_auth">
<a class="dropdown-item" href="{{ url_for('set_language', language='Finnish', lang='fi') }}">Finnish</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='English', lang='en') }}">English</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Persian', lang='fa') }}">Persian</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Greek', lang='el') }}">Greek</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Italian', lang='it') }}">Italian</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Chinese', lang='zh') }}">Chinese</a>
- <a class="dropdown-item" href="{{ url_for('set_language', language='All') }}">Show all experiments</a>
+ <a class="dropdown-item" href="{{ url_for('set_language', language='All') }}">Show all</a>
</div>
- <a class="nav-item" href="{{ url_for('researcher_info') }}" class="nav-link">| Info |</a>
- <a class="nav-item" href="{{ url_for('create_experiment') }}" class="nav-link">Create |</a>
- <a class="nav-item" href="" class="nav-link">Archives |</a>
+ </div>
+
+ {% endif %}
+
+
+
+ {% if current_user.is_anonymous %}
+
+ <div class="col-11 text-primary text-right">
+
+
+
- {% endif %}
- {% if current_user.is_anonymous %}
- <a class="nav-item" href="{{ url_for('login') }}" class="nav-link">Researcher login |</a>
-
- <a class="nav-item dropdown">
<a class="nav-item dropdown-toggle text-align-right" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Language
</a>
- <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+ <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ url_for('set_language', language='Finnish', lang='fi') }}">Finnish</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='English', lang='en') }}">English</a>
@@ -91,16 +118,14 @@
<a class="dropdown-item" href="{{ url_for('set_language', language='Greek', lang='el') }}">Greek</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Italian', lang='it') }}">Italian</a>
<a class="dropdown-item" href="{{ url_for('set_language', language='Chinese', lang='zh') }}">Chinese</a>
- <a class="dropdown-item" href="{{ url_for('set_language', language='All') }}">Show all experiments</a>
+
</div>
- {% else %}
- <a class="nav-item" href="{{ url_for('logout') }}" class="nav-link">Logout</a>
- {% endif %}
- </div>
+ {% endif %}
+ {% endif %}
</nav>
@@ -112,7 +137,7 @@
<footer class="footer">
<div class="container">
<br>
- <span class="text-muted">Human Emotion Systems Laboratory | <a href="http://emotion.utu.fi">emotion.utu.fi</a></span>
+ <span class="text-muted">Developed by Timo Heikkilä | Human Emotion Systems Labratory, Turku PET Centre | <a href="http://emotion.utu.fi">emotion.utu.fi</a></span>
</div>
</footer>
diff --git a/app/templates/consent.html b/app/templates/consent.html
index 58eaec314c8ec5265f3d36ead59bd67f9e73292d..ada1b8be9ec8457aae5956a6696ec3202795e0a9 100644
--- a/app/templates/consent.html
+++ b/app/templates/consent.html
@@ -5,7 +5,13 @@
<h1 class="container mt-5 display-4"><br> {{ experiment_info.name }}</h1>
<br>
-<p class="lead">{{ experiment_info.short_instruction }}</p>
+
+
+{% for para in instruction_paragraphs %}
+<p class="lead text-justify">{{ para }}</p>
+{% endfor %}
+
+
<br>
<h3>{{ _('Consent for participation:') }}</h3>
@@ -14,7 +20,10 @@
<h5> {{ _('Research bulletin can be read') }} <a href="{{ url_for('view_research_notification', exp_id=experiment_info.idexperiment) }}">{{ _('here.') }}</a></h5>
{% endif %}
-<p class="lead"> {{ experiment_info.consent_text }} </p>
+{% for para in consent_paragraphs %}
+<p class="lead text-justify">{{ para }}</p>
+{% endfor %}
+
<a class="btn btn-primary" href="{{ url_for('participant_session', exp_id=exp_id, agree='true') }}" role="button">{{ _('Agree') }}</a>
@@ -40,6 +49,7 @@
</div>
+
{% endblock %}
diff --git a/app/templates/index.html b/app/templates/index.html
index aa611a6313be41ef4b21459b978aa4ec2b6508d3..ba931b15e0c8645b53d61406d965a85dd657411e 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -2,28 +2,44 @@
{% block content %}
-
- <h1 class="container mt-5 display-4 text-center"><br>{{ _('Welcome to Onni') }}</h1>
- <br>
- <br>
- <p class="lead text-center">{{ _('This is the Human Emotion Systems laboratorys stimulus rating tool. If you have previously started a rating task you can continue that task on this page. If you are a researcher you can create new rating tasks by logging in. Or you can start a new rating task and start rating by selecting a task from the database list below.') }}</p>
- <br>
- <br>
- <p class="lead text-center">{{ _('You can choose the language suitable for you from the language menu in the upper right corner') }}</p>
+ <div class="container text-center col-4 mt-5 pt-5">
+
+ <img class="img-fluid" src="/static/img/onni_LOGO-RGB-transparent_bg_cut.png" alt="Logo">
+
+ </div>
+
+
+
+
+
+
+
+ <p class="lead text-center mt-5 font-weight-bold">{{ _('Welcome to the Human Emotion Systems -laboratory`s Onni-net laboratory! The experiments that are currently underway are listed below -
+ you can participate for as many experiments you want.') }}</p>
+ <p class="lead text-center mt-5">{{ _('If you are participating for a study for the first time, click on the "Begin task" -button. If you are returning to continue
+ a previously started task, click on the "Continue task" button.') }}</p>
+
+ <p class="lead text-center">{{ _('You can choose the language suitable for you from the language menu in the upper right corner.') }}</p>
</p>
<div class="row">
<div class="col mt-5">
- <h3>{{ _('List of experiments in database:') }}</h3>
+
+ <p class="lead text-left mt-3 font-weight-bold">{{ _('List of experiments:') }}</p>
{% block attributes %}
{% for exp in experiments %}
{% if exp.status == 'Public' and session['language'] == exp.language %}
- <ul class="list-group mb-4">
+ <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"><span class="font-weight-bold">{{ _('Instruction:') }}</span> {{ exp.short_instruction }}</li>
+ <li class="list-group-item text-justify"><span class="font-weight-bold">{{ _('Instruction:') }}</span>
+
+ {% autoescape false %}
+ {{ exp.short_instruction }}</li>
+ {% endautoescape %}
+
{% if current_user.is_authenticated %}
<li class="list-group-item"><span class="font-weight-bold">ID number:</span> {{ exp.idexperiment }} </li>
<li class="list-group-item"><span class="font-weight-bold">Language:</span> {{ exp.language }}</li>
@@ -37,8 +53,8 @@
<li class="list-group-item">
- <a class="btn btn-outline-success" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">{{ _('Begin task') }}</a>
- <a class="btn btn-outline-success" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">{{ _('Continue task') }}</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">{{ _('Begin task') }}</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">{{ _('Continue task') }}</a>
{% if current_user.is_authenticated %}
<span class="text-right">
@@ -59,7 +75,15 @@
<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"><span class="font-weight-bold">{{ _('Instruction:') }}</span> {{ exp.short_instruction }}</li>
+ <li class="list-group-item text-justify"><span class="font-weight-bold">{{ _('Instruction:') }}</span>
+
+ {% autoescape false %}
+ {{ exp.short_instruction }}</li>
+ {% endautoescape %}
+
+
+
+
{% if current_user.is_authenticated %}
<li class="list-group-item"><span class="font-weight-bold">ID number:</span> {{ exp.idexperiment }} </li>
<li class="list-group-item"><span class="font-weight-bold">Language:</span> {{ exp.language }}</li>
@@ -72,8 +96,8 @@
<li class="list-group-item">
- <a class="btn btn-outline-success" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">{{ _('Begin task') }}</a>
- <a class="btn btn-outline-success" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">{{ _('Continue task') }}</a
+ <a class="btn btn-outline-primary" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">{{ _('Begin task') }}</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">{{ _('Continue task') }}</a
{% if current_user.is_authenticated %}
<span class="text-right">
@@ -95,7 +119,14 @@
<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"><span class="font-weight-bold">Instruction:</span> {{ exp.short_instruction }}</li>
+ <li class="list-group-item text-justify"><span class="font-weight-bold">Instruction:</span>
+
+ {% autoescape false %}
+ {{ exp.short_instruction }}</li>
+ {% endautoescape %}
+
+
+
{% if current_user.is_authenticated %}
<li class="list-group-item"><span class="font-weight-bold">ID number:</span> {{ exp.idexperiment }} </li>
<li class="list-group-item"><span class="font-weight-bold">Language:</span> {{ exp.language }}</li>
@@ -107,8 +138,8 @@
<li class="list-group-item">
- <a class="btn btn-outline-success" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">Begin task</a>
- <a class="btn btn-outline-success" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">Continue task</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">Begin task</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">Continue task</a>
{% if current_user.is_authenticated %}
<a class="btn btn-outline-info" href="{{ url_for('admin_dryrun', exp_id=exp.idexperiment) }}" role="button">AdminRun</a>
@@ -128,7 +159,14 @@
<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"><span class="font-weight-bold">Instruction:</span> {{ exp.short_instruction }}</li>
+ <li class="list-group-item text-justify"><span class="font-weight-bold">Instruction:</span>
+
+
+ {% autoescape false %}
+ {{ exp.short_instruction }}</li>
+ {% endautoescape %}
+
+
{% if current_user.is_authenticated %}
<li class="list-group-item"><span class="font-weight-bold">ID number:</span> {{ exp.idexperiment }} </li>
<li class="list-group-item"><span class="font-weight-bold">Language:</span> {{ exp.language }}</li>
@@ -140,8 +178,8 @@
<li class="list-group-item">
- <a class="btn btn-outline-success" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">Begin task</a>
- <a class="btn btn-outline-success" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">Continue task</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('consent', exp_id=exp.idexperiment) }}" role="button">Begin task</a>
+ <a class="btn btn-outline-primary" href="{{ url_for('continue_task', exp_id=exp.idexperiment) }}" role="button">Continue task</a>
{% if current_user.is_authenticated %}
<a class="btn btn-outline-info" href="{{ url_for('admin_dryrun', exp_id=exp.idexperiment) }}" role="button">AdminRun</a>
diff --git a/app/templates/instructions.html b/app/templates/instructions.html
index 0049144c856f0241a09a8eedc756c7fe1ba515aa..57925d57c7e431b1231a51f3033cde806383f66f 100644
--- a/app/templates/instructions.html
+++ b/app/templates/instructions.html
@@ -4,14 +4,13 @@
<h1 class="container mt-5 display-4"><br>{{ _('Instructions:') }}</h1>
-{% block attributes %}
- {% for ins in instructions %}
- <div class="row lead"> {{ ins.instruction }} </div>
- {% endfor %}
- {% endblock %}
+{% for para in instruction_paragraphs %}
+<p class="lead text-justify">{{ para }}</p>
+{% endfor %}
<br>
<h3 class="row display-5 text-danger">{{ _('Notice!') }}</h3>
+<br>
<div class="row lead">{{ _('If you wish to quit a rating task before it is fully completed, you can 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!') }}</div>
<br>
diff --git a/app/templates/view_experiment.html b/app/templates/view_experiment.html
index 095aae36107c7efe45f38a0fd2b8407285ca4ce4..0b0aba74ce230f9034cbe61337b30e2d2b58ffb8 100644
--- a/app/templates/view_experiment.html
+++ b/app/templates/view_experiment.html
@@ -114,14 +114,17 @@
<tr>
<td nowrap>Detailed instructions:</td>
- <td>{{ exp.instruction }}</td>
+
+
+ <td class="text-justify">{{ exp.instruction }}</td>
+
<td nowrap>
<a class="btn btn-primary btn-block btn-sm btn-info" href="{{ url_for('edit_experiment', exp_id=exp.idexperiment) }}" role="button">Edit properties</a>
</td>
</tr>
<tr>
<td nowrap>Short description:</td>
- <td>{{ exp.short_instruction }}</td>
+ <td class="text-justify">{{ exp.short_instruction }}</td>
<td nowrap></td>
</tr>
@@ -133,7 +136,7 @@
<tr>
<td nowrap>Consent form text:</td>
- <td>{{ exp.consent_text }}</td>
+ <td class="text-justify">{{ exp.consent_text }}</td>
<td nowrap></td>
</tr>
<tr>
diff --git a/app/translations/el/LC_MESSAGES/messages.mo b/app/translations/el/LC_MESSAGES/messages.mo
index c17b67a75d1e960a4f129d99f437698ddf0dd9dc..7425c11d7744e83eed3dbf5241191577b486df07 100644
Binary files a/app/translations/el/LC_MESSAGES/messages.mo and b/app/translations/el/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/el/LC_MESSAGES/messages.po b/app/translations/el/LC_MESSAGES/messages.po
index 19abfce0c8dfb72029bbfb66e080db566c5779eb..d22d2d5a6a7117b438a396f5ec0769561ea1c36f 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: el\n"
@@ -26,15 +26,15 @@ msgstr "Συνεχίστε την εργασία βαθμολόγησης"
msgid "Start rating"
msgstr "Είμαι έτοιμος να ξεκινήσω"
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -42,8 +42,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr "Παρακαλώ εισάγετε τον κωδικό σας εδω"
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 "Προσοχή!"
@@ -54,27 +54,27 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr "Συμφωνώ"
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr "Διαφωνώ"
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
@@ -82,11 +82,11 @@ msgstr ""
"Για να συμμετάσχετε στο πείραμα, πρέπει να αποδεχθείτε τους όρους "
"συμμετοχής."
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr "Κλείσε την ενημέρωση"
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr "Πίσω στην Αρχική Σελίδα"
@@ -94,65 +94,59 @@ msgstr "Πίσω στην Αρχική Σελίδα"
msgid "Please insert your participant ID:"
msgstr "Παρακαλώ εισάγετε τον κωδικό αναγνώρισης σας"
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
-msgstr "Καλώς ήρθατε"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
+"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 ""
-"Αυτό είναι το εργαλείο βαθμολόγησης των ερεθισμάτων του εργαστηρίου των "
-"ανθρώπινων συναισθημάτων. Εάν έχετε ήδη ξεκινήσει μια εργασία "
-"βαθμολόγησης, μπορείτε να συνεχίσετε την εργασία αυτή σε αυτή τη σελίδα. "
-"Αν είστε ερευνητής, μπορείτε να δημιουργήσετε νέες εργασίες αξιολόγησης "
-"συνδεόμενοι με το σύστημα. Ή μπορείτε να ξεκινήσετε μια νέα αξιολόγηση "
-"και να ξεκινήσετε την αξιολόγηση επιλέγοντας μια εργασία αξιολόγησης από "
-"την παρακάτω λίστα βάσης δεδομένων"
-
-#: app/templates/index.html:13
+
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
-msgstr "Λίστα των πειραμάτων"
+#: app/templates/index.html:29
+msgid "List of experiments:"
+msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr "Ξεκίνα την άσκηση"
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr "Συνέχιση της εργασίας"
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -160,7 +154,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -173,11 +167,11 @@ msgstr ""
"αυτό. Αποθηκεύστε τον κωδικό αναγνώρισης πριν ξεκινήσετε την εργασία "
"αξιολόγησης!"
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr "Ο κωδικός αναγνώρισης σας είναι"
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr "Είμαι έτοιμος να ξεκινήσω"
@@ -249,7 +243,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "Welcome to Onni"
-#~ msgstr ""
+#~ msgstr "Καλώς ήρθατε"
#~ msgid ""
#~ "This is the Human Emotion Systems "
@@ -263,6 +257,19 @@ msgstr ""
#~ "start rating by selecting a task "
#~ "from the database list below."
#~ msgstr ""
+#~ "Αυτό είναι το εργαλείο βαθμολόγησης των"
+#~ " ερεθισμάτων του εργαστηρίου των ανθρώπινων"
+#~ " συναισθημάτων. Εάν έχετε ήδη ξεκινήσει "
+#~ "μια εργασία βαθμολόγησης, μπορείτε να "
+#~ "συνεχίσετε την εργασία αυτή σε αυτή "
+#~ "τη σελίδα. Αν είστε ερευνητής, μπορείτε"
+#~ " να δημιουργήσετε νέες εργασίες αξιολόγησης"
+#~ " συνδεόμενοι με το σύστημα. Ή "
+#~ "μπορείτε να ξεκινήσετε μια νέα "
+#~ "αξιολόγηση και να ξεκινήσετε την "
+#~ "αξιολόγηση επιλέγοντας μια εργασία αξιολόγησης"
+#~ " από την παρακάτω λίστα βάσης "
+#~ "δεδομένων"
#~ msgid ""
#~ "You can choose the language suitable "
@@ -271,7 +278,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "List of experiments in database:"
-#~ msgstr ""
+#~ msgstr "Λίστα των πειραμάτων"
#~ msgid "Name:"
#~ msgstr ""
diff --git a/app/translations/en/LC_MESSAGES/messages.mo b/app/translations/en/LC_MESSAGES/messages.mo
index 7e74cd37c37c13f5379212843af7a99dd9a2b35d..bb77614203283df279384b59d0984ad20031ff55 100644
Binary files a/app/translations/en/LC_MESSAGES/messages.mo and b/app/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/en/LC_MESSAGES/messages.po b/app/translations/en/LC_MESSAGES/messages.po
index 16a75e01d7adccc445e6dcd285e78a101be3b709..94c651f04a978965688d2720daa1e7c6e9224afd 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Start rating"
msgstr ""
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -42,8 +42,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr ""
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 ""
@@ -54,37 +54,37 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr ""
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr ""
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr ""
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr ""
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr ""
@@ -92,58 +92,59 @@ msgstr ""
msgid "Please insert your participant ID:"
msgstr ""
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
+"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 ""
-#: app/templates/index.html:13
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
+#: app/templates/index.html:29
+msgid "List of experiments:"
msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr ""
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr ""
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -151,7 +152,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -159,11 +160,11 @@ msgid ""
"starting the rating task!"
msgstr ""
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr ""
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr ""
diff --git a/app/translations/fa/LC_MESSAGES/messages.mo b/app/translations/fa/LC_MESSAGES/messages.mo
index 2b8f7a6fed6c73200e0d101caa0d0fd052414a10..86ae7e57e678f6f577d7576b10ec1fe02845f890 100644
Binary files a/app/translations/fa/LC_MESSAGES/messages.mo and b/app/translations/fa/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/fa/LC_MESSAGES/messages.po b/app/translations/fa/LC_MESSAGES/messages.po
index 6ecbb8d3ced7a1b70b53359d159758b0b0c5a963..7c2461298f1f470c0c498784d4177f8c00b3288d 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fa\n"
@@ -26,15 +26,15 @@ msgstr "ادامه امتیازدهی"
msgid "Start rating"
msgstr "برای شروع آزمایش آماده ام"
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -42,8 +42,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr "لطفا شناسه خود را اینجا وارد کنید:"
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 "توجه!"
@@ -54,37 +54,37 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr "موافقم"
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr "موافق نیستم"
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr "برای شرکت در این آزمایش باید موافقت خود را با این موارد اعلام کنید."
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr "بستن توجه"
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr "بازگشت به صفحه اصلی"
@@ -92,62 +92,59 @@ msgstr "بازگشت به صفحه اصلی"
msgid "Please insert your participant ID:"
msgstr "لطفا شناسه خود را اینجا وارد کنید:"
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
-msgstr "خوش آمدید"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
+"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 ""
-"این صفحه مربوط به امتیازدهی به محرک ها در گروه تحقیقاتی سیسنم احساسات "
-"انسانها می باشد. چنانچه شما قبلا وارد این سامانه شده اید میتوانید در این "
-"صفحه به ادامه بپردازید. اگر شما یکی از پژوهشگرهای گروه هستید می توانید با"
-" ورود به سامانه سیستم امتیازدهی خود را طراحی کنید."
-#: app/templates/index.html:13
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
-msgstr "لیست تحقیقات موجود در بانک اطلاعاتی::"
+#: app/templates/index.html:29
+msgid "List of experiments:"
+msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr "آزمایش را شروع کنید"
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr "ادامه آزمایش"
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -155,7 +152,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -167,11 +164,11 @@ msgstr ""
"کار شما به کد شناسایی خود نیاز دارید. لذا لطفا پیش از شروع آزمایش کد "
"شناسایی خود را ذخیره کنید. "
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr "کد شناسایی شما"
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr "برای شروع آزمایش آماده ام"
@@ -239,7 +236,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "Welcome to Onni"
-#~ msgstr ""
+#~ msgstr "خوش آمدید"
#~ msgid ""
#~ "This is the Human Emotion Systems "
@@ -253,6 +250,15 @@ msgstr ""
#~ "start rating by selecting a task "
#~ "from the database list below."
#~ msgstr ""
+#~ "این صفحه مربوط به امتیازدهی به "
+#~ "محرک ها در گروه تحقیقاتی سیسنم "
+#~ "احساسات انسانها می باشد. چنانچه شما "
+#~ "قبلا وارد این سامانه شده اید "
+#~ "میتوانید در این صفحه به ادامه "
+#~ "بپردازید. اگر شما یکی از پژوهشگرهای "
+#~ "گروه هستید می توانید با ورود به"
+#~ " سامانه سیستم امتیازدهی خود را طراحی"
+#~ " کنید."
#~ msgid ""
#~ "You can choose the language suitable "
@@ -261,7 +267,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "List of experiments in database:"
-#~ msgstr ""
+#~ msgstr "لیست تحقیقات موجود در بانک اطلاعاتی::"
#~ msgid "Name:"
#~ msgstr ""
diff --git a/app/translations/fi/LC_MESSAGES/messages.mo b/app/translations/fi/LC_MESSAGES/messages.mo
index a95738971ca115e7d99054bb272894bbec3799bc..c722da35c6e3e25879f7f2b5a65166bda29a6754 100644
Binary files a/app/translations/fi/LC_MESSAGES/messages.mo and b/app/translations/fi/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/fi/LC_MESSAGES/messages.po b/app/translations/fi/LC_MESSAGES/messages.po
index 77adc3f2b44cf44de32e922ba8d02a66f4d18e8f..5d179b8597f0460e6da1d2604f4e4c9b0edc6a1d 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fi\n"
@@ -26,24 +26,24 @@ msgstr "Jatka tehtävää"
msgid "Start rating"
msgstr "Aloita"
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr "Kyseinen ID on jo käytössä"
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr "Kyseistä ID:tä ei löydy"
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
-msgstr "Kokeesta tehty:"
+msgstr "Tehtävästä valmiina:"
#: app/templates/begin_with_id.html:8
msgid "Please insert your ID-code below:"
msgstr "Syötä koehenkilötunnuksesi:"
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 "Huom!"
@@ -56,37 +56,37 @@ msgstr ""
"Tähän kokeeseen osallistumiseen vaaditaan ID-tunnus. Syötä ID-tunnuksesi "
"alla olevaan kenttään."
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr "Suostumus osallistumiseksi:"
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr "Tutkimustiedote on luettavissa"
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr "täällä"
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr "Suostun"
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr "En suostu"
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr "Osallistuaksesi kokeeseen sinun on hyväksyttävä esitetyt ehdot."
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr "Sulje"
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr "Palaa etusivulle"
@@ -94,63 +94,59 @@ msgstr "Palaa etusivulle"
msgid "Please insert your participant ID:"
msgstr "Syötä ID-tunnuksesi:"
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
-msgstr "Tervetuloa"
+#: 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 "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:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
-msgstr ""
-"Tämä on Human Emotion Systems Laboratoryn arviointityökalu. Jos olet "
-"aiemmin aloittanut arviointitehtävän voit jatkaa tehtävää tällä sivulla. "
-"Jos olet tutkija voit luoda uuden arviointitehtävän kirjautumalla sisään."
-" Tai voit aloittaa uuden arvointitehtävän ja aloittaa arvioinnin "
-"valitsemalla arviointitehtävän alla olevasta listasta."
+"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.
-#: app/templates/index.html:13
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
-msgstr "Voit valita kielen oikeassa yläkulmassa olevasta language-valikosta"
+"the upper right corner."
+msgstr "Voit valita kielen oikeassa yläkulmassa olevasta language-valikosta."
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
-msgstr "Tietokannassa olevat kokeet:"
+#: app/templates/index.html:29
+msgid "List of experiments:"
+msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr "Nimi:"
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr "Ohjeet:"
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr "Tähän kokeeseen osallistumiseen vaaditaan ID-tunnus."
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr "Aloita"
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr "Jatka"
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr "AdminRun"
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr "Statistics"
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr "View / Edit"
@@ -158,19 +154,19 @@ msgstr "View / Edit"
msgid "Instructions:"
msgstr "Ohjeet:"
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"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 "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:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr "ID-numerosi on:"
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr "Olen valmis aloittamaan"
@@ -246,8 +242,8 @@ msgstr ""
#~ "from the database list below."
#~ msgstr ""
#~ "Tämä on Human Emotion Systems "
-#~ "Laboratoryn arviointityökalu.Jos olet aiemmin "
-#~ "aloittanut arviointitehtävän voit jatkaa "
+#~ "Laboratoryn arviointityökalu. Jos olet aiemmin"
+#~ " aloittanut arviointitehtävän voit jatkaa "
#~ "tehtävää tällä sivulla. Jos olet tutkija"
#~ " voit luoda uuden arviointitehtävän "
#~ "kirjautumalla sisään. Tai voit aloittaa "
@@ -259,7 +255,7 @@ msgstr ""
#~ "You can choose the language suitable "
#~ "for you from the language menu in"
#~ " the upper right corner"
-#~ msgstr "Voit vaihtaa kieltä oikeassa yläkulmassa olevasta valikosta."
+#~ msgstr "Voit valita kielen oikeassa yläkulmassa olevasta language-valikosta"
#~ msgid "List of experiments in database:"
#~ msgstr "Tietokannassa olevat kokeet:"
diff --git a/app/translations/it/LC_MESSAGES/messages.mo b/app/translations/it/LC_MESSAGES/messages.mo
index 279cea7af6189b542ed597194d4e14c657964701..d5fb67d82144de40feb3f0b675e7fe8e99a12415 100644
Binary files a/app/translations/it/LC_MESSAGES/messages.mo and b/app/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/it/LC_MESSAGES/messages.po b/app/translations/it/LC_MESSAGES/messages.po
index 69b586bff4128a64733cb237cc363e65b35bb486..c58ab6704749e34277103589bbc8f860b4f19c56 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: it\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Start rating"
msgstr ""
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -42,8 +42,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr ""
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 ""
@@ -54,37 +54,37 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr ""
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr ""
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr ""
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr ""
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr ""
@@ -92,58 +92,59 @@ msgstr ""
msgid "Please insert your participant ID:"
msgstr ""
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
+"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 ""
-#: app/templates/index.html:13
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
+#: app/templates/index.html:29
+msgid "List of experiments:"
msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr ""
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr ""
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -151,7 +152,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -159,11 +160,11 @@ msgid ""
"starting the rating task!"
msgstr ""
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr ""
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr ""
diff --git a/app/translations/zh/LC_MESSAGES/messages.mo b/app/translations/zh/LC_MESSAGES/messages.mo
index 92ea41779f8fe60a11f458613e50c52aa67abfd6..91aff88f0a2c2e391fd6b221702506ed205c52c8 100644
Binary files a/app/translations/zh/LC_MESSAGES/messages.mo and b/app/translations/zh/LC_MESSAGES/messages.mo differ
diff --git a/app/translations/zh/LC_MESSAGES/messages.po b/app/translations/zh/LC_MESSAGES/messages.po
index 9e15cd95acf6a652a47d9d2072c8ced732f950e2..6246005cbc838e7976774f36daf712ed58f7f22c 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+0200\n"
"PO-Revision-Date: 2018-11-27 16:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: zh\n"
@@ -26,15 +26,15 @@ msgstr "继续评分"
msgid "Start rating"
msgstr "我准备开始了"
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -42,8 +42,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr "请输入您的参与者ID："
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 "注意！"
@@ -54,37 +54,37 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr "同意"
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr "不同意"
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr "要参与本研究，您需要同意所提供的条款。"
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr "关闭通知"
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr "返回主页"
@@ -92,58 +92,59 @@ msgstr "返回主页"
msgid "Please insert your participant ID:"
msgstr "请输入您的参与者ID："
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
-msgstr "欢迎"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
-msgstr "这是人类情感系统实验室刺激评级工具。如果您之前已经开始了一个评级工具，您可以在此页面继续该任务。如果您是一名研究员，您可以通过登录来创建新的评级任务。或者，您可以启动一个新的评级任务，并通过从下面的数据库列表中选择一个评级任务开始评级。"
-
-#: app/templates/index.html:13
+"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 ""
+
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
-msgstr "数据库中的实验列表："
+#: app/templates/index.html:29
+msgid "List of experiments:"
+msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr "开始任务"
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr "继续任务"
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -151,7 +152,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -159,11 +160,11 @@ msgid ""
"starting the rating task!"
msgstr "如果您希望在完成评估任务之前退出评级任务，您可以返回以后完成任务，但是需要您的参与者ID号才能执行此操作。 请在开始评级任务前保存您的参与者ID！"
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr "您的参与者ID是："
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr "我准备开始了"
@@ -229,7 +230,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "Welcome to Onni"
-#~ msgstr ""
+#~ msgstr "欢迎"
#~ msgid ""
#~ "This is the Human Emotion Systems "
@@ -242,7 +243,7 @@ msgstr ""
#~ " start a new rating task and "
#~ "start rating by selecting a task "
#~ "from the database list below."
-#~ msgstr ""
+#~ msgstr "这是人类情感系统实验室刺激评级工具。如果您之前已经开始了一个评级工具，您可以在此页面继续该任务。如果您是一名研究员，您可以通过登录来创建新的评级任务。或者，您可以启动一个新的评级任务，并通过从下面的数据库列表中选择一个评级任务开始评级。"
#~ msgid ""
#~ "You can choose the language suitable "
@@ -251,7 +252,7 @@ msgstr ""
#~ msgstr ""
#~ msgid "List of experiments in database:"
-#~ msgstr ""
+#~ msgstr "数据库中的实验列表："
#~ msgid "Name:"
#~ msgstr ""
diff --git a/messages.pot b/messages.pot
index edc5cc77c6fe78c52e31226b9c62732899858515..3d74795e2a5f93a4f13b32013bd267b72477847b 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-11-28 14:59+0200\n"
+"POT-Creation-Date: 2018-12-13 13:13+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"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Start rating"
msgstr ""
-#: app/routes.py:359
+#: app/routes.py:371
msgid "ID already in use"
msgstr ""
-#: app/routes.py:368
+#: app/routes.py:380
msgid "No such ID set for this experiment"
msgstr ""
-#: app/templates/base.html:43
+#: app/templates/base.html:35
msgid "Task progress:"
msgstr ""
@@ -41,8 +41,8 @@ msgstr ""
msgid "Please insert your ID-code below:"
msgstr ""
-#: app/templates/begin_with_id.html:12 app/templates/consent.html:29
-#: app/templates/instructions.html:14 app/templates/quit_task.html:4
+#: 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 ""
@@ -53,37 +53,37 @@ msgid ""
" code. Please input ID below."
msgstr ""
-#: app/templates/consent.html:11
+#: app/templates/consent.html:17
msgid "Consent for participation:"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "Research bulletin can be read"
msgstr ""
-#: app/templates/consent.html:14
+#: app/templates/consent.html:20
msgid "here."
msgstr ""
-#: app/templates/consent.html:20
+#: app/templates/consent.html:29
msgid "Agree"
msgstr ""
-#: app/templates/consent.html:21
+#: app/templates/consent.html:30
msgid "Disagree"
msgstr ""
-#: app/templates/consent.html:32
+#: app/templates/consent.html:41
msgid ""
"In order to participate for the study you need to agree with the terms "
"presented."
msgstr ""
-#: app/templates/consent.html:35
+#: app/templates/consent.html:44
msgid "Close Notice"
msgstr ""
-#: app/templates/consent.html:36 app/templates/task_completed.html:15
+#: app/templates/consent.html:45 app/templates/task_completed.html:15
msgid "Return Home"
msgstr ""
@@ -91,58 +91,59 @@ msgstr ""
msgid "Please insert your participant ID:"
msgstr ""
-#: app/templates/index.html:6
-msgid "Welcome to Onni"
+#: 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 ""
-#: app/templates/index.html:9
+#: app/templates/index.html:20
msgid ""
-"This is the Human Emotion Systems laboratorys stimulus rating tool. If "
-"you have previously started a rating task you can continue that task on "
-"this page. If you are a researcher you can create new rating tasks by "
-"logging in. Or you can start a new rating task and start rating by "
-"selecting a task from the database list below."
+"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 ""
-#: app/templates/index.html:13
+#: app/templates/index.html:23
msgid ""
"You can choose the language suitable for you from the language menu in "
-"the upper right corner"
+"the upper right corner."
msgstr ""
-#: app/templates/index.html:18
-msgid "List of experiments in database:"
+#: app/templates/index.html:29
+msgid "List of experiments:"
msgstr ""
-#: app/templates/index.html:25 app/templates/index.html:61
+#: app/templates/index.html:36 app/templates/index.html:72
msgid "Name:"
msgstr ""
-#: app/templates/index.html:26 app/templates/index.html:62
+#: app/templates/index.html:37 app/templates/index.html:73
msgid "Instruction:"
msgstr ""
-#: app/templates/index.html:34 app/templates/index.html:69
+#: app/templates/index.html:45 app/templates/index.html:80
msgid "Participation ID is required for this task."
msgstr ""
-#: app/templates/index.html:40 app/templates/index.html:75
+#: app/templates/index.html:51 app/templates/index.html:86
msgid "Begin task"
msgstr ""
-#: app/templates/index.html:41 app/templates/index.html:76
+#: app/templates/index.html:52 app/templates/index.html:87
msgid "Continue task"
msgstr ""
-#: app/templates/index.html:45 app/templates/index.html:80
+#: app/templates/index.html:56 app/templates/index.html:91
msgid "AdminRun"
msgstr ""
-#: app/templates/index.html:46 app/templates/index.html:81
+#: app/templates/index.html:57 app/templates/index.html:92
msgid "Statistics"
msgstr ""
-#: app/templates/index.html:47 app/templates/index.html:82
+#: app/templates/index.html:58 app/templates/index.html:93
msgid "View / Edit"
msgstr ""
@@ -150,7 +151,7 @@ msgstr ""
msgid "Instructions:"
msgstr ""
-#: app/templates/instructions.html:15
+#: app/templates/instructions.html:14
msgid ""
"If you wish to quit a rating task before it is fully completed, you can "
"return to finish the task later but you will need your participant ID-"
@@ -158,11 +159,11 @@ msgid ""
"starting the rating task!"
msgstr ""
-#: app/templates/instructions.html:18 app/templates/quit_task.html:11
+#: app/templates/instructions.html:17 app/templates/quit_task.html:11
msgid "Your participant ID is:"
msgstr ""
-#: app/templates/instructions.html:21
+#: app/templates/instructions.html:20
msgid "Ready to start"
msgstr ""