Merge branch 'master' into aperez-edit-poll-question-answers

config/locales/en/admin.yml

@@ -599,12 +599,13 @@ en:
         author: Author
         title: Title
         valid_answers: Valid answers
-        add_answer: "Add answer"
+        add_answer: Add answer
         video_url: External video
-        documents: Documents (1)
         answers:
           title: Answer
           description: Description
+          videos: Videos
+          video_list: Video list (%{count})
           images: Images
           images_list: Images list
     answers:
@@ -617,6 +618,16 @@ en:
         images_list: Images list
       edit:
         title: Edit answer
+      videos:
+        index:
+          title: Videos
+          add_video: Add video
+          video_title: Title
+          video_url: External video
+        new:
+          title: New video
+        edit:
+          title: Edit video
     recounts:
       index:
         title: "Recounts"