Merge remote-tracking branch 'origin/master' into statistics

This commit is contained in:
Maximilian Grundke
2015-11-19 16:01:53 +01:00
8 changed files with 76 additions and 34 deletions

View File

@@ -300,7 +300,7 @@ en:
failure: Invalid email or password.
success: Successfully signed in.
create_through_lti:
session_with_outcome: 'After you have finished the exercise, your grade will be transmitted to %{consumer}.'
session_with_outcome: 'Please click "Submit Code for Assessment" after scoring to send your score %{consumer}.'
session_without_outcome: 'This is a practice session. Your grade will not be transmitted to %{consumer}.'
destroy:
link: Sign out