diff --git a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_pt_BR.properties
index a46c9c0fc585cbd9403b38ca1062300dca594106..cf8be61c5237e3b3318164b3d165d862a87b4e6f 100644
--- a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_pt_BR.properties
@@ -1,5 +1,10 @@
-#Mon Jan 16 20:57:43 CET 2017
+#Wed May 31 14:24:11 CEST 2017
 action.choose=Selecionar 
+admin.assessable.coursenode=Configura\u00E7\u00F5es para elementos de curso avali\u00E1veis
+admin.info.box=Mostrar caixa de informa\u00E7\u00F5es no in\u00EDcio
+admin.menu.title=Curso
+admin.menu.title.alt=$\:admin.menu.title settings
+admin.user.changelog=Mostrar o log de mudan\u00E7as da avalia\u00E7\u00E3o para o usu\u00E1rio
 artefact.title=Comprovantes de conclus\u00E3o para curso {0}
 assessment.testresults.finished=<font color\="green">Avalia\u00E7\u00E3o conclu\u00EDda</font>
 assessment.testresults.open=<font color\="orange">Avalia\u00E7\u00E3o pendente</font>
diff --git a/src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
index 3a7d50d102ff87ee4c3d1040215b08a45f2af48e..c3da69b7e791a80aa423f630a8f37f7a2f46db3e 100644
--- a/src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Tue May 02 23:51:10 CEST 2017
+#Wed May 31 14:24:12 CEST 2017
 command.new_db=Criar novo banco de dados
 customDb.category=Nome
 customDb.create=Criar
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantGradingController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantGradingController.java
index 604d425ccd98afe3dc91260a2bacfff9e1ab0db2..1449359418bd2e36491436edbfcb9ec93c447160 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantGradingController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantGradingController.java
@@ -39,6 +39,7 @@ import org.olat.course.assessment.ui.tool.AssessmentIdentityCourseNodeController
 import org.olat.course.nodes.GTACourseNode;
 import org.olat.course.nodes.gta.GTAManager;
 import org.olat.course.nodes.gta.Task;
+import org.olat.course.nodes.gta.TaskList;
 import org.olat.course.nodes.gta.TaskProcess;
 import org.olat.course.nodes.ms.MSCourseNodeRunController;
 import org.olat.course.run.scoring.AssessmentEvaluation;
@@ -158,7 +159,13 @@ public class GTACoachedParticipantGradingController extends BasicController {
 		
 		AssessmentEvaluation scoreEval = gtaNode.getUserScoreEvaluation(assessedUserCourseEnv);
 		if(scoreEval.getAssessmentStatus() == AssessmentEntryStatus.done) {
-			assignedTask = gtaManager.updateTask(assignedTask, TaskProcess.graded, gtaNode);
+			if(assignedTask == null) {
+				RepositoryEntry courseEntry = coachCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
+				TaskList taskList = gtaManager.createIfNotExists(courseEntry, gtaNode);
+				assignedTask = gtaManager.createTask(null, taskList, TaskProcess.graded, null, assessedIdentity, gtaNode);
+			} else {
+				assignedTask = gtaManager.updateTask(assignedTask, TaskProcess.graded, gtaNode);
+			}
 			fireEvent(ureq, Event.CHANGED_EVENT);
 		}
 	}
diff --git a/src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_pt_BR.properties
index b2cd30e9f51d01d34a7053c956d0343049395329..9c57d63d0ff7b65ef81b7e269440bf4ea8a4737b 100644
--- a/src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Thu Mar 16 22:50:19 CET 2017
+#Wed May 31 14:24:53 CEST 2017
 Intro.self=Clicar o bot\u00E3o "Iniciar" para executar o auto-teste.
 Intro.surv=Clicar o bot\u00E3o "Iniciar" para executar a pesquisa.
 Intro.test=Clicar o bot\u00E3o "Iniciar" para executar o teste.
@@ -25,6 +25,7 @@ condition.accessibility.title=Acesso
 correction.auto=Auto
 correction.manual=Manual
 correction.mode=Corre\u00E7\u00E3o
+correction.mode.help=Para a corre\u00E7\u00E3o autom\u00E1tica, o resultado \u00E9 mostrado imediatamente. Para corre\u00E7\u00E3o manual, a visibilidade precisa ser alterada na ferramenta de avalia\u00E7\u00E3o. Para os tipos de perguntas ensaio, desenho e carregamento de arquivos, \u00E9 obrigat\u00F3ria uma corre\u00E7\u00E3o manual.
 correcttest=Teste correto
 coursefolder=Pasta de armazenamento do curso "{0}"
 digital.signature=Recibo de teste
@@ -39,6 +40,7 @@ disclaimer.file.invalid=Algumas informa\u00E7\u00F5es n\u00E3o podem ser apresen
 error.assessment.pulled=Seu tutor selecioneu o seu teste.
 error.assessment.stopped=Seu tutor puxou o seu teste.
 error.entry.locked=O recurso did\u00E1tico selecionado \u00E9 editado atualmente por outro usu\u00E1rio. Favor selecionar algum outro recurso did\u00E1tico.
+error.resource.corrupted=O recurso did\u00E1tico n\u00E3o pode ser interpretado. Parece corrompido ou com o formato errado.
 error.self.undefined.long=Nenhum auto-teste definido para "{0}" . Escolher um.
 error.self.undefined.short=Nenhum auto-teste definido para "{0}" .
 error.surv.undefined.long=Nenhuma pesquisa para "{0}" definido. Escolher um.
diff --git a/src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties
index 32474d356781492f5c66e8a3a031c14df7165b5f..03716bd7055394ce59af32ceaf9a3b24313e1a73 100644
--- a/src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Tue May 02 23:51:48 CEST 2017
+#Wed May 31 14:24:54 CEST 2017
 add.member=Adicionar
 already.all.selected=Voc\u00EA j\u00E1 escolheu todos usu\u00E1rios
 coaches=Treinadores do Curso
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
index fa087306f4ac8538b3200c417f31700a0fc35fc4..2b706a4e3dd39863a9c7c66c182b0a90d531e134 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
@@ -68,6 +68,7 @@ import org.olat.core.gui.control.generic.wizard.StepsMainRunController;
 import org.olat.core.gui.control.generic.wizard.StepsRunContext;
 import org.olat.core.gui.media.MediaResource;
 import org.olat.core.helpers.Settings;
+import org.olat.core.logging.AssertException;
 import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.Util;
@@ -364,7 +365,11 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
 	@Override
 	protected void doDispose() {
 		if (lockEntry != null && lockEntry.isSuccess()) {
-			CoordinatorManager.getInstance().getCoordinator().getLocker().releasePersistentLock(lockEntry);
+			try {
+				CoordinatorManager.getInstance().getCoordinator().getLocker().releasePersistentLock(lockEntry);
+			} catch (AssertException e) {
+				logWarn("Lock was already released", e);
+			}
 		}
 		if (activeSessionLock != null && activeSessionLock.isSuccess()) {
 			CoordinatorManager.getInstance().getCoordinator().getLocker().releaseLock(activeSessionLock);			
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties
index 3185d153e8b2eebf3a27f22746a7bdb81197ab97..409b5ca61a28439c21e914f5a22df4b1119119c8 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Tue May 02 23:46:55 CEST 2017
+#Wed May 31 14:22:33 CEST 2017
 add.match.column=Adicionar coluna
 add.match.row=Adicionar linha
 answers=Respostas
@@ -27,6 +27,10 @@ essay.max.strings=M\u00E1x. palavras
 essay.min.strings=Min. palavras
 essay.rows=Altura (n\u00FAmero de linhas)
 export.qpool.successful=$org.olat.ims.qti.editor\:export.qpool.successful
+feedback.correct.help=Feedback para todas as respostas corretas\: o feedback aparece apenas se toda a resposta estiver correta.
+feedback.correctsolution.help=Solu\u00E7\u00E3o correta\: a solu\u00E7\u00E3o \u00E9 mostrada automaticamente, se a resposta for errada.
+feedback.hint.help=Dica\: para a "dica" aparecer\u00E1 um bot\u00E3o, que pode ser aberto, desde que a resposta ainda n\u00E3o tenha sido enviada.
+feedback.incorrect.help=Feedback para resposta errada\: esse feedback aparece, assim que 1 resposta estiver errada. Por exemplo. Tamb\u00E9m em um texto de lacunas, que consiste em 50 lacunas e apenas 1 resposta est\u00E1 errada.
 fib.alternative=Alternativa
 fib.alternative.help=Diferentes alternativas s\u00E3o separadas por v\u00EDrgula.
 fib.caseSensitive=Mai\u00FAsculas e min\u00FAsculas
@@ -135,6 +139,7 @@ new.essay=Reda\u00E7\u00E3o
 new.fib=Lacuna de texto
 new.fib.numerical=Entrada num\u00E9rica
 new.hotspot=Hotspot
+new.hottext=Hottext
 new.hottext.start=Esse \u00E9 um Hot
 new.hottext.text=Text
 new.kprim=Kprim
diff --git a/src/main/java/org/olat/ims/qti21/ui/statistics/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/ims/qti21/ui/statistics/_i18n/LocalStrings_pt_BR.properties
index 7c9054e13a30d5a4d9f32324dcc83ede2e6544c3..58c1353bb0a950b5987dacebd0eb90c49ee0280f 100644
--- a/src/main/java/org/olat/ims/qti21/ui/statistics/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/statistics/_i18n/LocalStrings_pt_BR.properties
@@ -1,8 +1,11 @@
-#Mon Nov 21 20:05:43 CET 2016
+#Wed May 31 14:23:07 CEST 2017
 answer.correct=$org.olat.ims.qti.statistics.ui\:answer.correct
 answer.false=$org.olat.ims.qti.statistics.ui\:answer.false
 answer.noanswer=$org.olat.ims.qti.statistics.ui\:answer.noanswer
 answer.points=$org.olat.ims.qti.statistics.ui\:answer.points
+associateInteraction=Associate
+chart.answer.averageScoreQuestions.y=$org.olat.ims.qti.statistics.ui\:chart.answer.averageScoreQuestions.y
+chart.averagescore.peritem=$org.olat.ims.qti.statistics.ui\:chart.averagescore.peritem
 chart.cutscore=$org.olat.ims.qti.statistics.ui\:chart.cutscore
 chart.duration.histogramm=$org.olat.ims.qti.statistics.ui\:chart.duration.histogramm
 chart.duration.histogramm.legend=$org.olat.ims.qti.statistics.ui\:chart.duration.histogramm.legend
@@ -12,8 +15,11 @@ chart.percent.participants=$org.olat.ims.qti.statistics.ui\:chart.percent.partic
 chart.percent.participants.num=$org.olat.ims.qti.statistics.ui\:chart.percent.participants.num
 chart.points=$org.olat.ims.qti.statistics.ui\:chart.points
 chart.responses=$org.olat.ims.qti.statistics.ui\:chart.responses
+chart.rightanswers.peritem=$org.olat.ims.qti.statistics.ui\:chart.rightanswers.peritem
 chart.score.histogramm=$org.olat.ims.qti.statistics.ui\:chart.score.histogramm
 download.raw.data=$org.olat.ims.qti.statistics.ui\:download.raw.data
+drawingInteraction=$org.olat.ims.qti21.ui.editor\:new.drawing
+extendedTextInteraction=$org.olat.ims.qti21.ui.editor\:new.essay
 fib.wrong.answer=$org.olat.ims.qti.statistics.ui\:fib.wrong.answer
 fig.averagedur=$org.olat.ims.qti.statistics.ui\:fig.averagedur
 fig.averagescore=$org.olat.ims.qti.statistics.ui\:fig.averagescore
@@ -33,22 +39,19 @@ fig.surveyId=$org.olat.ims.qti.statistics.ui\:fig.surveyId
 fig.testId=$org.olat.ims.qti.statistics.ui\:fig.testId
 fig.title=$org.olat.ims.qti.statistics.ui\:fig.title
 fig.wronganswers=$org.olat.ims.qti.statistics.ui\:fig.wronganswers
-menu.title=$org.olat.ims.qti.statistics.ui\:menu.title
-section=$org.olat.ims.qti.statistics.ui\:section
-stats.unsupported.interaction={0} n\u00E3o \u00E9 suportado
-user.not.answer=$org.olat.ims.qti.statistics.ui\:user.not.answer
-associateInteraction=Associate
 gapMatchInteraction=Gap match
-inlineChoiceInteraction=Inline choice
-sliderInteraction=Slider
-selectPointInteraction=Select point
-graphicOrderInteraction=Graphic order
 graphicAssociateInteraction=Graphic associate
 graphicGapMatchInteraction=Graphic gap match
-positionObjectInteraction=Position object
-mediaInteraction=Media
+graphicOrderInteraction=Graphic order
 hotspotInteraction=$org.olat.ims.qti21.ui.editor\:new.hotspot
-drawingInteraction=$org.olat.ims.qti21.ui.editor\:new.drawing
-uploadInteraction=$org.olat.ims.qti21.ui.editor\:new.upload
-extendedTextInteraction=$org.olat.ims.qti21.ui.editor\:new.essay
 hottextInteraction=Hottext
+inlineChoiceInteraction=Inline choice
+mediaInteraction=Media
+menu.title=$org.olat.ims.qti.statistics.ui\:menu.title
+positionObjectInteraction=Position object
+section=$org.olat.ims.qti.statistics.ui\:section
+selectPointInteraction=Select point
+sliderInteraction=Slider
+stats.unsupported.interaction={0} n\u00E3o \u00E9 suportado
+uploadInteraction=$org.olat.ims.qti21.ui.editor\:new.upload
+user.not.answer=$org.olat.ims.qti.statistics.ui\:user.not.answer
diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties
index 5708550f86b77545365c10added550afea2c631b..83e68353bd297c740e75a0f28f5b7e163bff2ffe 100644
--- a/src/main/java/org/olat/modules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Tue May 02 23:47:11 CEST 2017
+#Wed May 31 14:23:10 CEST 2017
 add.my.account=Eu tenho uma conta
 add.organizer=Adicionar um novo organizador
 add.training=Adicionar novo treinamento