Merge branch 'dev' into 'fix/localistation'

# Conflicts:
#   mainwindow.cpp

mainwindow.cpp

@@ -164,7 +164,7 @@ void MainWindow::loadStep(Step s) {
     ui->responseSpin->setValue(s.getResponse());
 
     for(int i = 0; i < s.getTexte().length(); i++) {
-        QString q = s.getPersonnage().at(i) + ": " + s.getTexte().at(i);
+        QString q = "[" + s.getPersonnage().at(i) + "] : " + s.getTexte().at(i);
         ui->dialogEdit->appendPlainText(q);
     }
 }
@@ -660,6 +660,7 @@ void MainWindow::on_pathNumber_valueChanged(int arg1)
 
 void MainWindow::on_stepNumber_valueChanged(int arg1)
 {
+    ui->dialogEdit->clear();
     this->loadStep(currentPath->getStep().at(arg1-1));
 }
 
@@ -1046,3 +1047,6 @@ void MainWindow::on_addStep_clicked()
 {
     this->addNewStep();
 }
+
+
+