Merge branch 'master' into webhooks

config/locales/en-us.yml

@@ -47,8 +47,11 @@ en-US:
   client:
     are_you_sure: Are you sure?
     change_visibility: Change visibility
-    delete_recording: Delete recording
+    delete_recording: Delete
+    email_footer_1: This e-mail is auto-generated by your friendly neighbourhood BigBlueButton server. Do no reply to this e-mail.
+    email_footer_2: BigBlueButton is an open source web conferencing system. For more information on BigBlueButton and it's amazing capabilities, see https://bigbluebutton.org/ .
     enter_name: Enter a name to join
+    mail_recording: Mail
     meeting_ended: Meeting was ended
     meeting_started: Meeting was started
     no_recordings: No Recordings
@@ -59,13 +62,18 @@ en-US:
     recording_created: A recording was created
     recording_deleted: Recording was deleted
     recording_published: Recording was published
+    recording_mail_subject: " has invited you to view a recording."
+    recording_mail_body: "To view the recording, follow the link below:"
     recording_unlisted: Recording was unlisted
     recording_unpublished: Recording was unpublished
+    share: Share
     unpublish_recording: Hide recording
     unlisted: Unlisted
     unpublished: No one
+    upload_youtube: Youtube
     user_waiting_body: "%{user} is waiting to join %{meeting}!"
     user_waiting_title: A user is waiting
+    youtube_disabled: Recording did not contain any video.
   copied: Copied
   copy_error: Use Ctrl-c to copy
   create_your_session: Create your own meeting
@@ -156,11 +164,18 @@ en-US:
       phrase1: This is a test email sent to %{email}
   thumbnails: Thumbnails
   upload: Upload
+  upload_to_youtube: Upload to Youtube
   url_copy_explanation: Copy this URL to invite others to the meeting
   user_person_room: "%{name} personal room"
   video: Video
+  video_title: Video title
   visibility: Visibility
   wait_for_mod_msg: Looks like you're the first one here...
   wait_for_mod_explanation: You will automatically join when the meeting starts
   watch: Watch
   'yes': 'Yes'
+  youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
+  youtube_privacy_options:
+    public: Public
+    private: Private
+    unlisted: Unlisted