Merge branch 'master' into feature-file-templates

Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb

config/locales/en.yml

@@ -34,8 +34,6 @@ en:
         instructions: Instructions
         maximum_score: Maximum Score
         public: Public
-        team: Team
-        team_id: Team
         title: Title
         user: Author
         allow_file_creation: "Allow file creation"
@@ -79,6 +77,7 @@ en:
         password_confirmation: Passwort Confirmation
         role: Role
       request_for_comments:
+        comments: Comments
         exercise: Exercise
         execution_environment: Language
         username: Username
@@ -91,9 +90,6 @@ en:
         files: Files
         score: Score
         user: Author
-      team:
-        internal_user_ids: Members
-        name: Name
       file_template:
         name: "Name"
         file_type: "File Type"
@@ -135,9 +131,6 @@ en:
       submission:
         one: Submission
         other: Submissions
-      team:
-        one: Team
-        other: Teams
     errors:
       messages:
         together: 'has to be set along with %{attribute}'
@@ -169,6 +162,7 @@ en:
     show:
       link: Consumer
   errors:
+    connection_refused: Connection refused
     index:
       count: Count
   execution_environments:
@@ -217,8 +211,10 @@ en:
       submit: Submit Code For Assessment
       test: Test
       timeout: 'Execution stopped. Your code exceeded the permitted execution time of %{permitted_execution_time} seconds.'
+      exercise_deadline_passed: 'The deadline for this exercise has already passed'
       tooltips:
         save: Your code is automatically saved whenever you download, run, or test it. Therefore, explicitly saving is rarely necessary.
+        exercise_deadline_passed: 'The results for this exercise can only be submitted to the e-learning platform before the deadline has passed.'
       request_for_comments_sent: "Request for comments sent."
     editor_file_tree:
       file_root: Files
@@ -331,14 +327,38 @@ en:
       activation_needed:
         body: 'Please visit %{link} and set up a password in order to complete your registration.'
         subject: Please complete your registration.
+      got_new_comment:
+        body: |
+          English version below <br>
+          _________________________<br>
+          <br>
+          Hallo %{receiver_displayname}, <br>
+          <br>
+          es gibt einen neuen Kommentar von %{commenting_user_displayname} zu Ihrer Kommentaranfrage auf CodeOcean. <br>
+          Sie finden ihn hier: %{link} <br>
+          <br>
+          Diese Mail wurde automatisch von CodeOcean verschickt.<br>
+          <br>
+          _________________________<br>
+          <br>
+          Dear %{receiver_displayname}, <br>
+          <br>
+          you received a new comment from %{commenting_user_displayname} to your request for comments on CodeOcean. <br>
+          You can find it here: %{link} <br>
+          <br>
+          This mail was automatically sent by CodeOcean. <br>
+        subject: 'You received a new comment on CodeOcean from %{commenting_user_displayname}.'
       reset_password:
         body: 'Please visit %{link} if you want to reset your password.'
         subject: Password reset instructions
   request_for_comments:
+    comments: Comments
     index:
       all: All Requests for Comments
       get_my_comment_requests: My Requests for Comments
     no_question: "The author did not enter a question for this request."
+    mark_as_solved: "Mark this question as answered"
+    solved: "This question has been answered"
   sessions:
     create:
       failure: Invalid email or password.