From 3efc7b3a0c67b13a50c8b2f1fd27d5a039e15178 Mon Sep 17 00:00:00 2001
From: Miroslav Mitev <m1r0@users.noreply.github.com>
Date: Thu, 6 Apr 2023 21:39:18 +0300
Subject: [PATCH 01/41] Fix patterns wizard preview box sizing

---
 assets/admin/editor-wizard/patterns-list.scss | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/assets/admin/editor-wizard/patterns-list.scss b/assets/admin/editor-wizard/patterns-list.scss
index 9a6c492dcc..a55192225c 100644
--- a/assets/admin/editor-wizard/patterns-list.scss
+++ b/assets/admin/editor-wizard/patterns-list.scss
@@ -1,6 +1,6 @@
 $thumbnail-height: 235px;
 $preview-padding: 5px;
-$preview-max-height: $thumbnail-height - $preview-padding * 2;
+$preview-max-height: $thumbnail-height + 5px;
 
 .sensei-patterns-list {
 	@media ( min-width: 600px ) {
@@ -22,14 +22,12 @@ $preview-max-height: $thumbnail-height - $preview-padding * 2;
 			height: $thumbnail-height;
 			overflow: hidden;
 
-			display: flex;
-			justify-content: center;
-			align-items: center;
 			padding-top: $preview-padding;
 			padding-bottom: $preview-padding;
 
 			.block-editor-block-preview__container {
 				max-height: $preview-max-height;
+				margin-top: -17px;
 			}
 		}
 

From 7b3330c6c4486b2727988e5f0ac8c220a6e84270 Mon Sep 17 00:00:00 2001
From: Miroslav Mitev <m1r0@users.noreply.github.com>
Date: Thu, 6 Apr 2023 21:42:06 +0300
Subject: [PATCH 02/41] Add changelog

---
 changelog/fix-wizard-layouts-preview | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/fix-wizard-layouts-preview

diff --git a/changelog/fix-wizard-layouts-preview b/changelog/fix-wizard-layouts-preview
new file mode 100644
index 0000000000..85b5994d6a
--- /dev/null
+++ b/changelog/fix-wizard-layouts-preview
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix patterns wizard preview style

From e18a988e696dbffff2cb6cc68cdf9cde005080f6 Mon Sep 17 00:00:00 2001
From: Miroslav Mitev <m1r0@users.noreply.github.com>
Date: Wed, 12 Apr 2023 22:40:41 +0300
Subject: [PATCH 03/41] Fix PHP Warning with Divi when using Learning Mode
 Video theme

---
 changelog/fix-divi-error-on-video-template |  4 ++++
 includes/3rd-party/divi.php                | 25 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 changelog/fix-divi-error-on-video-template

diff --git a/changelog/fix-divi-error-on-video-template b/changelog/fix-divi-error-on-video-template
new file mode 100644
index 0000000000..e8fdbd06e3
--- /dev/null
+++ b/changelog/fix-divi-error-on-video-template
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix PHP Warning with Divi when using Learning Mode Video theme
diff --git a/includes/3rd-party/divi.php b/includes/3rd-party/divi.php
index b70f520f81..80dafb6ff2 100644
--- a/includes/3rd-party/divi.php
+++ b/includes/3rd-party/divi.php
@@ -65,3 +65,28 @@ function sensei_fix_divi_theme_builder_and_learning_mode_conflict() {
 
 }
 add_action( 'wp', 'sensei_fix_divi_theme_builder_and_learning_mode_conflict' );
+
+/**
+ * Disable the Divi excerpt logic for the Video learning mode template.
+ *
+ * This fixes an error generated by Divi when the Video learning mode template is used.
+ */
+function sensei_fix_divi_learning_mode_video_template_excerpt() {
+	if (
+		! class_exists( 'ET_GB_Block_Post_Excerpt' )
+		|| 'lesson' !== get_post_type()
+	) {
+		return;
+	}
+
+	$course_id = Sensei_Utils::get_current_course();
+	if ( ! Sensei_Course_Theme_Option::has_learning_mode_enabled( $course_id ) ) {
+		return;
+	}
+
+	$template = Sensei_Course_Theme_Template_Selection::get_active_template_name();
+	if ( 'video' === $template ) {
+		remove_filter( 'render_block_core/post-excerpt', array( ET_GB_Block_Post_Excerpt::instance(), 'render_block' ) );
+	}
+}
+add_action( 'template_redirect', 'sensei_fix_divi_learning_mode_video_template_excerpt' );

From 1a1af6fb1adaa38ca258c24e4a92904b6bd685fe Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Thu, 13 Apr 2023 07:18:27 +0600
Subject: [PATCH 04/41] Add fallback if site admin email does not match any
 user

---
 includes/class-sensei-modules.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/includes/class-sensei-modules.php b/includes/class-sensei-modules.php
index c1a74f79d4..dc24af4c64 100644
--- a/includes/class-sensei-modules.php
+++ b/includes/class-sensei-modules.php
@@ -2279,6 +2279,15 @@ public static function get_term_author( $slug = '' ) {
 
 		$term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
 
+		// Fallaback in case the admin email does not match a user, otherwise it shows warnings.
+		if ( ! $term_owner ) {
+			$site_admins = get_super_admins();
+
+			if ( ! empty( $site_admins ) && is_array( $site_admins ) ) {
+				$term_owner = get_user_by( 'login', $site_admins[0] );
+			}
+		}
+
 		if ( empty( $slug ) ) {
 
 			return $term_owner;
@@ -2292,7 +2301,7 @@ public static function get_term_author( $slug = '' ) {
 				return get_user_by( 'id', $author_meta );
 			}
 		}
-		// look for the author in the slug
+		// look for the author in the slug.
 		$slug_parts = explode( '-', $slug );
 
 		if (

From e1f8afb5b72f633f26d7b2209f9f4562a1d68f1b Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Thu, 13 Apr 2023 07:18:59 +0600
Subject: [PATCH 05/41] Add test for site admin not matching any user by email

---
 tests/unit-tests/test-class-modules.php | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/unit-tests/test-class-modules.php b/tests/unit-tests/test-class-modules.php
index a6d643576a..307941c037 100644
--- a/tests/unit-tests/test-class-modules.php
+++ b/tests/unit-tests/test-class-modules.php
@@ -144,6 +144,40 @@ public function testGetTermAuthor() {
 
 	}
 
+	public function testGetTermAuthor_WhenNoAuthorAndSiteAdminEmailDoesNotMatchAnyUser_AddsTheFirstAdminUserInFallback() {
+		/* Arrange */
+		wp_insert_term( 'Get Started', 'module' );
+
+		$term = wp_insert_term(
+			'A test term',
+			'module',
+			array(
+				'description' => 'A yummy apple.',
+				'slug'        => 'a-test-term',
+			)
+		);
+		update_site_option( 'admin_email', 'non-existant-user-mail@abc.com' );
+
+		$admins       = get_super_admins();
+		$admin        = get_user_by( 'login', $admins[0] );
+		$test_user_id = $this->factory->user->create(
+			[
+				'display_name' => 'Test User',
+				'user_email'   => 'test@a.com',
+			]
+		);
+
+		/* Act */
+		$term_author_admin = Sensei_Core_Modules::get_term_author( 'a-test-term' );
+		update_term_meta( $term['term_id'], 'module_author', $test_user_id );
+		$term_author_teacher = Sensei_Core_Modules::get_term_author( 'a-test-term' );
+
+		/* Assert */
+		$this->assertTrue( $admin->ID === $term_author_admin->ID, 'The function should return the first admin user in fallback.' );
+		$this->assertFalse( 'non-existant-user-mail@abc.com' === $admin->user_email );
+		$this->assertTrue( $test_user_id === $term_author_teacher->ID, 'The function should return the teacher user if exists using term meta.' );
+	}
+
 	/**
 	 * Ensure the course modules column "more" link is shown
 	 * only if the course has more than 3 modules.

From 32b6d8ee12103163e7d6610ec5b2104f0e0285b2 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Thu, 13 Apr 2023 07:37:50 +0600
Subject: [PATCH 06/41] Add changelog

---
 changelog/fix-warning-when-no-author-found-for-module | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/fix-warning-when-no-author-found-for-module

diff --git a/changelog/fix-warning-when-no-author-found-for-module b/changelog/fix-warning-when-no-author-found-for-module
new file mode 100644
index 0000000000..8eef8b856b
--- /dev/null
+++ b/changelog/fix-warning-when-no-author-found-for-module
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Warning when admin email does not match any existing user and module has no author

From 2b6b2b9e133fcc7c0589980ee14e8698035925a0 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Thu, 13 Apr 2023 11:10:48 +0600
Subject: [PATCH 07/41] Fix astra not loading courses archive page

---
 includes/class-sensei-course.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/class-sensei-course.php b/includes/class-sensei-course.php
index 616ee74579..4e99d316f2 100755
--- a/includes/class-sensei-course.php
+++ b/includes/class-sensei-course.php
@@ -4402,6 +4402,12 @@ public function archive_page_content() {
 				)
 			);
 			remove_all_actions( 'sensei_pagination' );
+
+			// Running query loop block in do_blocks sets $wp_query->current_post to 0 which should be -1.
+			// This causes have_posts() to return false after rendering blocks. Which eventually causes
+			// Astra theme to not render the generated content.
+			global $wp_query;
+			$wp_query->current_post = -1;
 		}
 	}
 

From a18f9c30d8dbf45d83054d4365811df39ccfcbc6 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Thu, 13 Apr 2023 11:11:39 +0600
Subject: [PATCH 08/41] Add changelog

---
 changelog/fix-courses-page-blank-on-astra-theme | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/fix-courses-page-blank-on-astra-theme

diff --git a/changelog/fix-courses-page-blank-on-astra-theme b/changelog/fix-courses-page-blank-on-astra-theme
new file mode 100644
index 0000000000..a3581a9420
--- /dev/null
+++ b/changelog/fix-courses-page-blank-on-astra-theme
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Astra not loading the Courses page content

From 592c01fffc69400189294883f8b49ef06cf70526 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Tue, 18 Apr 2023 15:05:07 +0600
Subject: [PATCH 09/41] Add allow same origin to allow parent page access
 iframe contents

---
 includes/class-sensei-grading-user-quiz.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/class-sensei-grading-user-quiz.php b/includes/class-sensei-grading-user-quiz.php
index 7f70076cd3..46c5bc4c86 100755
--- a/includes/class-sensei-grading-user-quiz.php
+++ b/includes/class-sensei-grading-user-quiz.php
@@ -331,10 +331,11 @@ public function display() {
 							$html = wp_kses_post( apply_filters( 'sensei_answer_text', $_user_answer ) );
 							$html = '<html><head><title></title></head><body>' . $html . '</body></html>';
 							?>
-							<iframe class="user-answer" srcdoc="<?php echo esc_attr( $html ); ?>" sandbox="" height="auto"></iframe>
+							<iframe class="user-answer" srcdoc="<?php echo esc_attr( $html ); ?>" sandbox="allow-same-origin" height="auto"></iframe>
 							<?php
 						}
 						?>
+
 						<div class="right-answer">
 							<h5><?php esc_html_e( 'Correct answer', 'sensei-lms' ); ?></h5>
 							<span class="correct-answer">

From c6589c685c5c0aa6ebcce11cc4911cf770888b4d Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Tue, 18 Apr 2023 15:06:45 +0600
Subject: [PATCH 10/41] Fix getting iframe markup by using contents

---
 assets/js/grading-general.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/js/grading-general.js b/assets/js/grading-general.js
index 29fa3c5559..2bf344aa57 100755
--- a/assets/js/grading-general.js
+++ b/assets/js/grading-general.js
@@ -110,13 +110,19 @@ jQuery( document ).ready( function ( $ ) {
 
 				if ( $this.hasClass( 'gap-fill' ) ) {
 					user_answer = $this
-						.find( '.user-answer .highlight' )
+						.find( '.user-answer' )
+						.contents()
+						.find( '.highlight' )
 						.html();
 					correct_answer = $this
 						.find( '.correct-answer .highlight' )
 						.html();
 				} else {
-					user_answer = $this.find( '.user-answer' ).html();
+					user_answer = $this
+						.find( '.user-answer' )
+						.contents()
+						.find( 'body' )
+						.html();
 					correct_answer = $this.find( '.correct-answer' ).html();
 				}
 

From ea427c20ba2283f81ac9e7d36fc151dfaa0014e3 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Tue, 18 Apr 2023 15:37:36 +0600
Subject: [PATCH 11/41] Add changelog

---
 changelog/fix-auto-grading-not-working | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/fix-auto-grading-not-working

diff --git a/changelog/fix-auto-grading-not-working b/changelog/fix-auto-grading-not-working
new file mode 100644
index 0000000000..51b8c60730
--- /dev/null
+++ b/changelog/fix-auto-grading-not-working
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix auto grading not working and additionally throwing error for fill gap questions

From 668ba2ced4a289ef43404f43c6eaf104dbcadc39 Mon Sep 17 00:00:00 2001
From: Fernando Jorge Mota <contato@fjorgemota.com>
Date: Tue, 18 Apr 2023 12:17:53 -0300
Subject: [PATCH 12/41] Use href instead of xlink:href for loading SVG icons

---
 includes/class-sensei-assets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-sensei-assets.php b/includes/class-sensei-assets.php
index c95160e7c4..58a1a87dc9 100644
--- a/includes/class-sensei-assets.php
+++ b/includes/class-sensei-assets.php
@@ -310,7 +310,7 @@ private function get_icon_href( string $name ) : string {
 	public function get_icon( string $name, string $class_names = '' ) : string {
 		$href = $this->get_icon_href( $name );
 
-		return '<svg class="' . esc_attr( $class_names ) . '"><use xlink:href="' . esc_url( $href ) . '"></use></svg>';
+		return '<svg class="' . esc_attr( $class_names ) . '"><use href="' . esc_url( $href ) . '"></use></svg>';
 	}
 
 	/**

From 4be537087e578d16197b0d6d5e9426021250e2fd Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:42:04 +0600
Subject: [PATCH 13/41] Add changelog

---
 changelog.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index dae3c14439..398dd52e51 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,22 @@
 *** Changelog ***
 
+## 4.13.1 - 2023-04-19
+### Changed
+- Disable the "welcome" and "no progress" emails by default
+- Update MailPoet link to point to Lists
+
+### Fixed
+- Astra not loading the Courses page content
+- Fix auto grading not working and additionally throwing error for fill gap questions
+- Fix patterns wizard preview style
+- Fix the home email notification settings link
+- Make the email post type private
+- Remove fallback to legacy options
+- Fix showing warning from module when admin email does not match any existing user and it has no author
+
+### Change
+- Improve plugin loading performance using pre-built class map
+
 ## 4.13.0 - 2023-03-30
 ### Added
 - Functionality to create MailPoet lists for all courses and groups, and to subscribe users to those lists.

From 28b4ac6533bc5e0492dbb43f454a49483698b957 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:42:49 +0600
Subject: [PATCH 14/41] Update readme and fix missing change logs

---
 readme.txt | 56 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/readme.txt b/readme.txt
index 35fc166bc3..0ae6c19a5f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: lms, eLearning, teach, online courses, woocommerce
 Requires at least: 6.0
 Tested up to: 6.2
 Requires PHP: 7.2
-Stable tag: 4.12.0
+Stable tag: 4.13.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -116,6 +116,35 @@ Please visit the [Sensei Blog](https://senseilms.com/blog/) or sign up for our [
 
 == Changelog ==
 
+### 4.13.1 - 2023-04-19
+
+#### Changed
+- Disable the "welcome" and "no progress" emails by default
+- Update MailPoet link to point to Lists
+- Improve plugin loading performance using pre-built class map
+
+#### Fixed
+- Astra not loading the Courses page content
+- Fix auto grading not working and additionally throwing error for fill gap questions
+- Fix patterns wizard preview style
+- Fix the home email notification settings link
+- Make the email post type private
+- Remove fallback to legacy options
+- Fix showing warning from module when admin email does not match any existing user and it has no author
+
+### 4.13.0 - 2023-03-30
+
+#### Added
+- Functionality to create MailPoet lists for all courses and groups, and to subscribe users to those lists.
+
+#### Changed
+- Modify screen reader text to be less verbose on module expand button, front-end 👏 @alexstine
+
+#### Fixed
+- Fix styling of notices on pages other than Sensei home and button output on Sensei home.
+- Missing aria-expanded attribute on front-end module expand button 👏 @alexstine
+- Only show the sensei_email template for the sensei emails.
+
 ### 4.12.0 - 2023-03-29
 
 #### Added
@@ -147,28 +176,3 @@ Please visit the [Sensei Blog](https://senseilms.com/blog/) or sign up for our [
 - Logged out users are redirected to login page if tries to access course completion page
 - Use dynamic pricing for Sensei Pro upsells
 
-### 4.11.1 - 2023-02-03
-
-- Add: Auto select course template depending on selected course pattern [#6200](https://github.com/Automattic/sensei/pull/6200)
-- Fix: Prevent html entities from showing up in module titles in editor [#6372](https://github.com/Automattic/sensei/pull/6372)
-- Fix: Remove separator from course list pattern [#6435](https://github.com/Automattic/sensei/pull/6435)
-- Fix: Alignment of url buttons for Blockbase/Astra themes [#5814](https://github.com/Automattic/sensei/pull/5814)
-- Fix: Type error when `the_content` is not a string [#6484](https://github.com/Automattic/sensei/pull/6484)
-- Fix: `the_content` hook called twice when viewing a lesson in learning mode [#6438](https://github.com/Automattic/sensei/pull/6438)
-- Tweak: Suppress theme without comments.php deprecation message [#6453](https://github.com/Automattic/sensei/pull/6453)
-- Tweak: Round course progress to integer [#6232](https://github.com/Automattic/sensei/pull/6232)
-
-### 4.11.0 - 2023-02-02
-
-- New: Guest users and teachers preview [#6421](https://github.com/Automattic/sensei/pull/6421)
-- Add: Add Course List block to My Courses and course archive on page creation [#6343](https://github.com/Automattic/sensei/pull/6343) [#6354](https://github.com/Automattic/sensei/pull/6354) [#6414](https://github.com/Automattic/sensei/pull/6416)
-- Add: Curate list of installed plugins that are logged [#6424](https://github.com/Automattic/sensei/pull/6424)
-- Add: Add filter for the student bulk action modal [#6366](https://github.com/Automattic/sensei/pull/6366)
-- Fix: Redirect to correct contact form if the user has a WPCOM subscription [#6407](https://github.com/Automattic/sensei/pull/6407)
-- Fix: Fix archive page going on infinite loop in Astra theme [#6431](https://github.com/Automattic/sensei/pull/6431)
-- Fix: Do not show quiz notice if it is the quiz page [#6313](https://github.com/Automattic/sensei/pull/6313)
-- Fix: Fix error when calling `the_content` filter with no post context [#6406](https://github.com/Automattic/sensei/pull/6406)
-- Fix: Fix issue where Quiz Timer options would appear only when the Random Question Order is enabled [#6377](https://github.com/Automattic/sensei/pull/6377)
-- Fix: Fix block editor check [#6359](https://github.com/Automattic/sensei/pull/6359)
-- Fix: Fix Twenty Fifteen and Learning Mode layout issue [#6360](https://github.com/Automattic/sensei/pull/6360)
-- Tweak: Change reset progress copy by [#6371](https://github.com/Automattic/sensei/pull/6371)

From 52158075f30b94e3ec0727e025727e1229b7d0cd Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:43:20 +0600
Subject: [PATCH 15/41] Bump package.json version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f8e4667b5d..5027ea5e7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "sensei-lms",
-  "version": "4.12.0",
+  "version": "4.13.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sensei-lms",
-      "version": "4.12.0",
+      "version": "4.13.1",
       "license": "GPL-2.0-or-later",
       "dependencies": {
         "@wordpress/api-fetch": "wp-5.9",
diff --git a/package.json b/package.json
index 377c03d434..e214941342 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sensei-lms",
   "title": "Sensei LMS",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "description": "Sensei LMS",
   "author": "Automattic",
   "license": "GPL-2.0-or-later",

From d301653d4c5760a5ecc3e3666560b704d969dfcf Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:44:40 +0600
Subject: [PATCH 16/41] Remove individual changelogs

---
 changelog/burtrw-patch-1                                | 4 ----
 changelog/change-disable-no-progress-and-welcome-emails | 4 ----
 changelog/change-remove-lesson-complete-screen          | 4 ----
 changelog/change-use-composer-autoloader                | 4 ----
 changelog/fix-alloptions-call                           | 5 -----
 changelog/fix-auto-grading-not-working                  | 4 ----
 changelog/fix-courses-page-blank-on-astra-theme         | 4 ----
 changelog/fix-css-showing-in-lesson-template            | 4 ----
 changelog/fix-email-notificaiton-settings-link          | 4 ----
 changelog/fix-email-post-type-being-public              | 4 ----
 changelog/fix-learning-mode-global-button-color         | 4 ----
 changelog/fix-warning-when-no-author-found-for-module   | 4 ----
 changelog/fix-wizard-layouts-preview                    | 4 ----
 13 files changed, 53 deletions(-)
 delete mode 100644 changelog/burtrw-patch-1
 delete mode 100644 changelog/change-disable-no-progress-and-welcome-emails
 delete mode 100644 changelog/change-remove-lesson-complete-screen
 delete mode 100644 changelog/change-use-composer-autoloader
 delete mode 100644 changelog/fix-alloptions-call
 delete mode 100644 changelog/fix-auto-grading-not-working
 delete mode 100644 changelog/fix-courses-page-blank-on-astra-theme
 delete mode 100644 changelog/fix-css-showing-in-lesson-template
 delete mode 100644 changelog/fix-email-notificaiton-settings-link
 delete mode 100644 changelog/fix-email-post-type-being-public
 delete mode 100644 changelog/fix-learning-mode-global-button-color
 delete mode 100644 changelog/fix-warning-when-no-author-found-for-module
 delete mode 100644 changelog/fix-wizard-layouts-preview

diff --git a/changelog/burtrw-patch-1 b/changelog/burtrw-patch-1
deleted file mode 100644
index 4244719c42..0000000000
--- a/changelog/burtrw-patch-1
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Update MailPoet link to point to Lists
diff --git a/changelog/change-disable-no-progress-and-welcome-emails b/changelog/change-disable-no-progress-and-welcome-emails
deleted file mode 100644
index 2a39d0789b..0000000000
--- a/changelog/change-disable-no-progress-and-welcome-emails
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Disable the "welcome" and "no progress" emails by default
diff --git a/changelog/change-remove-lesson-complete-screen b/changelog/change-remove-lesson-complete-screen
deleted file mode 100644
index 4495cf22bf..0000000000
--- a/changelog/change-remove-lesson-complete-screen
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Redirect to the next lesson without showing Lesson complete message
diff --git a/changelog/change-use-composer-autoloader b/changelog/change-use-composer-autoloader
deleted file mode 100644
index 4083bc3ea1..0000000000
--- a/changelog/change-use-composer-autoloader
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: change
-
-Improve plugin loading performance using pre-built class map
diff --git a/changelog/fix-alloptions-call b/changelog/fix-alloptions-call
deleted file mode 100644
index 8e1eba5d69..0000000000
--- a/changelog/fix-alloptions-call
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-
-Remove fallback to legacy options
-
diff --git a/changelog/fix-auto-grading-not-working b/changelog/fix-auto-grading-not-working
deleted file mode 100644
index 51b8c60730..0000000000
--- a/changelog/fix-auto-grading-not-working
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fix auto grading not working and additionally throwing error for fill gap questions
diff --git a/changelog/fix-courses-page-blank-on-astra-theme b/changelog/fix-courses-page-blank-on-astra-theme
deleted file mode 100644
index a3581a9420..0000000000
--- a/changelog/fix-courses-page-blank-on-astra-theme
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Astra not loading the Courses page content
diff --git a/changelog/fix-css-showing-in-lesson-template b/changelog/fix-css-showing-in-lesson-template
deleted file mode 100644
index 7453c20ce3..0000000000
--- a/changelog/fix-css-showing-in-lesson-template
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-CSS displayed in site editor Lesson template
diff --git a/changelog/fix-email-notificaiton-settings-link b/changelog/fix-email-notificaiton-settings-link
deleted file mode 100644
index 19cc4d6d96..0000000000
--- a/changelog/fix-email-notificaiton-settings-link
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fix the home email notification settings link
diff --git a/changelog/fix-email-post-type-being-public b/changelog/fix-email-post-type-being-public
deleted file mode 100644
index 7640fe2907..0000000000
--- a/changelog/fix-email-post-type-being-public
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Make the email post type private
diff --git a/changelog/fix-learning-mode-global-button-color b/changelog/fix-learning-mode-global-button-color
deleted file mode 100644
index 5f1765a482..0000000000
--- a/changelog/fix-learning-mode-global-button-color
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fix global button colors in Learning Mode for the Course theme
diff --git a/changelog/fix-warning-when-no-author-found-for-module b/changelog/fix-warning-when-no-author-found-for-module
deleted file mode 100644
index 8eef8b856b..0000000000
--- a/changelog/fix-warning-when-no-author-found-for-module
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Warning when admin email does not match any existing user and module has no author
diff --git a/changelog/fix-wizard-layouts-preview b/changelog/fix-wizard-layouts-preview
deleted file mode 100644
index 85b5994d6a..0000000000
--- a/changelog/fix-wizard-layouts-preview
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fix patterns wizard preview style

From 97145adc733f518a49e1734d8e19ddc6b634d4b1 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:45:37 +0600
Subject: [PATCH 17/41] Update version tag and remove next-version placeholders

---
 includes/class-sensei-autoloader-bundle.php |  6 +++---
 includes/class-sensei-autoloader.php        | 10 +++++-----
 includes/class-sensei-bootstrap.php         | 10 +++++-----
 includes/class-sensei-settings.php          |  4 ++--
 includes/class-sensei.php                   |  2 +-
 sensei-lms.php                              |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/includes/class-sensei-autoloader-bundle.php b/includes/class-sensei-autoloader-bundle.php
index 0f3d041561..f2020a54f7 100644
--- a/includes/class-sensei-autoloader-bundle.php
+++ b/includes/class-sensei-autoloader-bundle.php
@@ -14,18 +14,18 @@
  *
  * This class is no longer used.
  *
- * @deprecated $$next-version$$
+ * @deprecated 4.13.1
  */
 class Sensei_Autoloader_Bundle {
 	/**
 	 * Load a class of bundle.
 	 *
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 *
 	 * @return bool
 	 */
 	public function load_class() {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 
 		return false;
 	}
diff --git a/includes/class-sensei-autoloader.php b/includes/class-sensei-autoloader.php
index 72b827aa25..d76428239a 100644
--- a/includes/class-sensei-autoloader.php
+++ b/includes/class-sensei-autoloader.php
@@ -14,7 +14,7 @@
  *
  * @package Core
  * @since 1.9.0
- * @deprecated $$next-version$$
+ * @deprecated 4.13.1
  */
 class Sensei_Autoloader {
 	/**
@@ -22,18 +22,18 @@ class Sensei_Autoloader {
 	 * files within the includes directory
 	 *
 	 * @since 1.9.0
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 */
 	public function initialize_class_file_map() {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 	}
 
 	/**
 	 * Autoload all sensei files as the class names are used.
 	 *
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 */
 	public function autoload() {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 	}
 }
diff --git a/includes/class-sensei-bootstrap.php b/includes/class-sensei-bootstrap.php
index 4618442a23..14145196e5 100644
--- a/includes/class-sensei-bootstrap.php
+++ b/includes/class-sensei-bootstrap.php
@@ -12,7 +12,7 @@
 /**
  * Class Sensei_Bootstrap loads the functionality needed for Sensei_Main to initialize properly
  *
- * @deprecated $$next-version$$ Using Composer's autoloader now.
+ * @deprecated 4.13.1 Using Composer's autoloader now.
  *
  * @package Core
  */
@@ -27,24 +27,24 @@ class Sensei_Bootstrap {
 	/**
 	 * Set up Sensei class loaders and includes.
 	 *
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 *
 	 * @return $this
 	 */
 	public function bootstrap() {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 		return $this;
 	}
 
 	/**
 	 * Get singleton.
 	 *
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 *
 	 * @return Sensei_Bootstrap
 	 */
 	public static function get_instance() {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 		if ( null === self::$instance ) {
 			self::$instance = new self();
 		}
diff --git a/includes/class-sensei-settings.php b/includes/class-sensei-settings.php
index 6865426a5e..75dbebd88e 100755
--- a/includes/class-sensei-settings.php
+++ b/includes/class-sensei-settings.php
@@ -177,14 +177,14 @@ public function settings_screen() {
 	 * Add legacy options to alloptions if they don't exist.
 	 *
 	 * @since 3.0.1
-	 * @deprecated $$next-version$$
+	 * @deprecated 4.13.1
 	 *
 	 * @param array $alloptions All options that are preloaded by WordPress.
 	 *
 	 * @return array
 	 */
 	public function no_special_query_for_legacy_options( $alloptions ) {
-		_deprecated_function( __METHOD__, '$$next-version$$' );
+		_deprecated_function( __METHOD__, '4.13.1' );
 
 		return $alloptions;
 	}
diff --git a/includes/class-sensei.php b/includes/class-sensei.php
index 110f9f6ca0..a6064e38ba 100644
--- a/includes/class-sensei.php
+++ b/includes/class-sensei.php
@@ -611,7 +611,7 @@ private function initialize_cli() {
 	/**
 	 * Load the 3rd party compatibility tweaks.
 	 *
-	 * @since $$next-version$$
+	 * @since 4.13.1
 	 */
 	private function initialize_3rd_party_compatibility(): void {
 		require_once $this->resolve_path( 'includes/3rd-party/3rd-party.php' );
diff --git a/sensei-lms.php b/sensei-lms.php
index c5159bbe6f..13e52a87ca 100644
--- a/sensei-lms.php
+++ b/sensei-lms.php
@@ -3,7 +3,7 @@
  * Plugin Name: Sensei LMS
  * Plugin URI: https://senseilms.com/
  * Description: Share your knowledge, grow your network, and strengthen your brand by launching an online course.
- * Version: 4.13.0
+ * Version: 4.13.1
  * Author: Automattic
  * Author URI: https://automattic.com
  * License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -36,7 +36,7 @@
 }
 
 if ( ! defined( 'SENSEI_LMS_VERSION' ) ) {
-	define( 'SENSEI_LMS_VERSION', '4.13.0' ); // WRCS: DEFINED_VERSION.
+	define( 'SENSEI_LMS_VERSION', '4.13.1' ); // WRCS: DEFINED_VERSION.
 }
 
 if ( ! defined( 'SENSEI_LMS_PLUGIN_FILE' ) ) {

From 21a541bc95cbcf03fb7bce71b3c689face048c92 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 19 Apr 2023 19:46:18 +0600
Subject: [PATCH 18/41] Update pot

---
 lang/sensei-lms.pot | 2738 ++++++-------------------------------------
 1 file changed, 361 insertions(+), 2377 deletions(-)

diff --git a/lang/sensei-lms.pot b/lang/sensei-lms.pot
index f93022ea1a..be50436b58 100644
--- a/lang/sensei-lms.pot
+++ b/lang/sensei-lms.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 msgid ""
 msgstr ""
-"Project-Id-Version: Sensei LMS 4.12.0\n"
+"Project-Id-Version: Sensei LMS 4.13.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/sensei-lms\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-04-03T16:34:13+00:00\n"
+"POT-Creation-Date: 2023-04-19T13:21:01+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: sensei-lms\n"
@@ -80,15 +80,9 @@ msgstr ""
 #: assets/blocks/course-actions-block/course-status-options.js:13
 #: assets/blocks/course-outline/status-preview/status-control/index.js:17
 #: assets/blocks/lesson-actions/lesson-actions-block/lesson-actions-settings.js:40
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:265
 #: assets/dist/blocks/single-course.js:501
 #: assets/dist/blocks/single-lesson.js:270
-=======
-#: assets/dist/blocks/global-blocks.js:260
-#: assets/dist/blocks/single-course.js:467
-#: assets/dist/blocks/single-lesson.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "In Progress"
 msgstr ""
 
@@ -137,15 +131,9 @@ msgstr ""
 #: includes/class-sensei-modules.php:384
 #: includes/class-sensei-utils.php:2094
 #: assets/blocks/lesson-properties/constants.js:9
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:360
 #: assets/dist/course-theme/blocks/index.js:212
 #: assets/dist/js/admin/course-edit.js:58
-=======
-#: assets/dist/blocks/single-lesson.js:359
-#: assets/dist/course-theme/blocks/index.js:216
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:40
 msgid "None"
 msgstr ""
@@ -193,30 +181,18 @@ msgstr ""
 #: includes/admin/class-sensei-learners-admin-bulk-actions-controller.php:125
 #: assets/admin/students/student-action-menu/index.js:39
 #: assets/admin/students/student-modal/index.js:41
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:73
 #: assets/dist/admin/students/student-action-menu/index.js:274
 #: assets/dist/admin/students/student-bulk-action-button/index.js:59
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:62
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add to Course"
 msgstr ""
 
 #: includes/admin/class-sensei-learners-admin-bulk-actions-controller.php:126
 #: assets/admin/students/student-action-menu/index.js:43
 #: assets/admin/students/student-modal/index.js:77
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:75
 #: assets/dist/admin/students/student-action-menu/index.js:274
 #: assets/dist/admin/students/student-bulk-action-button/index.js:61
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:62
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Remove from Course"
 msgstr ""
 
@@ -225,15 +201,9 @@ msgstr ""
 #: includes/admin/class-sensei-learners-main.php:516
 #: assets/admin/students/student-action-menu/index.js:47
 #: assets/admin/students/student-modal/index.js:114
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:79
 #: assets/dist/admin/students/student-action-menu/index.js:274
 #: assets/dist/admin/students/student-bulk-action-button/index.js:65
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:62
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Reset Progress"
 msgstr ""
 
@@ -417,11 +387,7 @@ msgstr ""
 #: includes/admin/class-sensei-learners-main.php:169
 #: includes/admin/tools/views/html-enrolment-debug.php:78
 #: assets/blocks/conditional-content-block/conditional-content-edit.js:21
-<<<<<<< HEAD
 #: assets/dist/blocks/shared.js:163
-=======
-#: assets/dist/blocks/shared.js:161
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enrolled"
 msgstr ""
 
@@ -433,13 +399,8 @@ msgstr ""
 #: includes/class-sensei-grading-main.php:68
 #: assets/blocks/course-outline/lesson-block/lesson-settings.js:62
 #: assets/blocks/course-outline/module-block/module-status.js:72
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:342
 #: assets/dist/blocks/single-course.js:398
-=======
-#: assets/dist/blocks/single-course.js:302
-#: assets/dist/blocks/single-course.js:357
->>>>>>> 2f9355c58 (Bump version)
 msgid "Status"
 msgstr ""
 
@@ -479,7 +440,6 @@ msgstr ""
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:26
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:28
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:22
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:342
 #: assets/dist/blocks/single-course.js:360
 #: assets/dist/blocks/single-course.js:429
@@ -488,16 +448,6 @@ msgstr ""
 #: assets/dist/blocks/single-lesson.js:329
 #: assets/dist/blocks/single-lesson.js:341
 #: assets/dist/blocks/single-lesson.js:353
-=======
-#: assets/dist/blocks/single-course.js:302
-#: assets/dist/blocks/single-course.js:324
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/blocks/single-course.js:390
-#: assets/dist/blocks/single-lesson.js:205
-#: assets/dist/blocks/single-lesson.js:326
-#: assets/dist/blocks/single-lesson.js:337
-#: assets/dist/blocks/single-lesson.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lesson"
 msgstr ""
 
@@ -526,29 +476,17 @@ msgstr ""
 #: assets/blocks/course-completed-actions/index.js:23
 #: assets/blocks/course-list-block/index.js:41
 #: assets/blocks/take-course-block/index.js:30
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:217
 #: assets/dist/blocks/global-blocks.js:369
 #: assets/dist/blocks/global-blocks.js:646
 #: assets/dist/blocks/shared.js:239
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/global-blocks.js:205
-#: assets/dist/blocks/global-blocks.js:370
-#: assets/dist/blocks/global-blocks.js:502
-#: assets/dist/blocks/shared.js:238
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course"
 msgstr ""
 
 #: includes/admin/class-sensei-learners-main.php:372
 #: assets/data-port/import/done/import-success-results.js:16
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:411
-=======
-#: assets/dist/data-port/import.js:227
->>>>>>> 2f9355c58 (Bump version)
 msgid "lesson"
 msgid_plural "lessons"
 msgstr[0] ""
@@ -559,11 +497,7 @@ msgstr[1] ""
 #: includes/class-sensei-modules.php:1038
 #: includes/class-sensei-utils.php:1195
 #: assets/data-port/import/done/import-success-results.js:15
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:411
-=======
-#: assets/dist/data-port/import.js:227
->>>>>>> 2f9355c58 (Bump version)
 msgid "course"
 msgid_plural "courses"
 msgstr[0] ""
@@ -573,7 +507,7 @@ msgstr[1] ""
 #: includes/admin/tools/class-sensei-tool-enrolment-debug.php:217
 #: includes/blocks/class-sensei-course-outline-module-block.php:135
 #: includes/blocks/course-list/class-sensei-course-list-student-course-filter.php:43
-#: includes/blocks/course-theme/class-lesson-actions.php:77
+#: includes/blocks/course-theme/class-lesson-actions.php:79
 #: includes/class-sensei-analysis-course-list-table.php:129
 #: includes/class-sensei-analysis-course-list-table.php:333
 #: includes/class-sensei-analysis-course-list-table.php:407
@@ -592,34 +526,20 @@ msgstr[1] ""
 #: assets/blocks/course-outline/status-preview/status-control/index.js:18
 #: assets/blocks/lesson-actions/lesson-actions-block/lesson-actions-settings.js:44
 #: assets/data-port/import/done/done-page.js:91
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:265
 #: assets/dist/blocks/global-blocks.js:408
 #: assets/dist/blocks/single-course.js:501
 #: assets/dist/blocks/single-lesson.js:270
 #: assets/dist/blocks/single-page.js:213
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/blocks/global-blocks.js:260
-#: assets/dist/blocks/global-blocks.js:381
-#: assets/dist/blocks/single-course.js:467
-#: assets/dist/blocks/single-lesson.js:271
-#: assets/dist/blocks/single-page.js:194
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Completed"
 msgstr ""
 
 #: includes/admin/class-sensei-learners-main.php:387
 #: assets/blocks/course-actions-block/course-status-options.js:8
 #: assets/blocks/course-outline/status-preview/status-control/index.js:16
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:265
 #: assets/dist/blocks/single-course.js:501
-=======
-#: assets/dist/blocks/global-blocks.js:260
-#: assets/dist/blocks/single-course.js:467
->>>>>>> 2f9355c58 (Bump version)
 msgid "Not Started"
 msgstr ""
 
@@ -651,11 +571,7 @@ msgstr ""
 
 #: includes/admin/class-sensei-learners-main.php:471
 #: assets/blocks/take-course-block/index.js:29
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enroll"
 msgstr ""
 
@@ -674,11 +590,7 @@ msgstr ""
 #: includes/class-sensei-grading.php:71
 #: includes/class-sensei-grading.php:72
 #: assets/admin/students/student-action-menu/index.js:51
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:274
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:62
->>>>>>> 2f9355c58 (Bump version)
 msgid "Grading"
 msgstr ""
 
@@ -698,8 +610,8 @@ msgstr ""
 #: includes/admin/class-sensei-learners-main.php:973
 #: includes/class-sensei-analysis-user-profile-list-table.php:316
 #: assets/admin/students/student-modal/course-list.js:37
-#: assets/dist/admin/students/student-action-menu/index.js:73
-#: assets/dist/admin/students/student-bulk-action-button/index.js:62
+#: assets/dist/admin/students/student-action-menu/index.js:59
+#: assets/dist/admin/students/student-bulk-action-button/index.js:45
 msgid "No courses found."
 msgstr ""
 
@@ -741,19 +653,13 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:797
 #: includes/class-sensei-posttypes.php:1068
 #: includes/class-sensei-posttypes.php:1069
-#: includes/class-sensei-settings.php:227
+#: includes/class-sensei-settings.php:219
 #: templates/course-results/lessons.php:39
 #: templates/single-course/modules.php:102
 #: assets/blocks/course-outline/module-block/module-edit.js:240
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:382
 #: assets/dist/data-port/export.js:187
 #: assets/dist/data-port/import.js:625
-=======
-#: assets/dist/blocks/single-course.js:335
-#: assets/dist/data-port/export.js:183
-#: assets/dist/data-port/import.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/helpers/labels.js:8
 msgid "Lessons"
 msgstr ""
@@ -823,23 +729,15 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:792
 #: includes/class-sensei-posttypes.php:1052
 #: includes/class-sensei-posttypes.php:1053
-#: includes/class-sensei-settings.php:222
+#: includes/class-sensei-settings.php:214
 #: includes/unsupported-theme-handlers/class-sensei-unsupported-theme-handler-course-archive.php:55
 #: assets/blocks/course-completed-actions/index.js:49
 #: assets/blocks/course-list-block/index.js:43
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:369
 #: assets/dist/blocks/shared.js:239
 #: assets/dist/blocks/single-page.js:213
 #: assets/dist/data-port/export.js:187
 #: assets/dist/data-port/import.js:625
-=======
-#: assets/dist/blocks/global-blocks.js:370
-#: assets/dist/blocks/shared.js:238
-#: assets/dist/blocks/single-page.js:194
-#: assets/dist/data-port/export.js:183
-#: assets/dist/data-port/import.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/helpers/labels.js:7
 msgid "Courses"
 msgstr ""
@@ -861,14 +759,10 @@ msgid "course-completed"
 msgstr ""
 
 #: includes/admin/class-sensei-setup-wizard-pages.php:68
-#: includes/internal/emails/class-email-seeder-data.php:66
-#: includes/internal/emails/class-email-seeder-data.php:78
+#: includes/internal/emails/class-email-seeder-data.php:67
+#: includes/internal/emails/class-email-seeder-data.php:79
 #: assets/blocks/conditional-content-block/conditional-content-edit.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/shared.js:163
-=======
-#: assets/dist/blocks/shared.js:161
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Completed"
 msgstr ""
 
@@ -879,13 +773,8 @@ msgstr ""
 #: includes/internal/emails/patterns/course-welcome.php:32
 #: assets/blocks/course-actions-block/course-actions/course-actions-edit.js:29
 #: assets/blocks/course-actions-block/course-actions/index.js:22
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:224
 #: assets/dist/blocks/global-blocks.js:247
-=======
-#: assets/dist/blocks/global-blocks.js:216
-#: assets/dist/blocks/global-blocks.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Start Course"
 msgstr ""
 
@@ -904,7 +793,6 @@ msgstr ""
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:25
 #: assets/data-port/export/export-select-content-page.js:59
 #: assets/data-port/import/upload/upload-page.js:72
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:73
 #: assets/dist/admin/editor-wizard/index.js:107
 #: assets/dist/blocks/global-blocks.js:217
@@ -912,15 +800,6 @@ msgstr ""
 #: assets/dist/data-port/export.js:33
 #: assets/dist/data-port/import.js:532
 #: assets/dist/setup-wizard/index.js:339
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
-#: assets/dist/admin/editor-wizard/index.js:109
-#: assets/dist/blocks/global-blocks.js:205
-#: assets/dist/blocks/single-lesson.js:326
-#: assets/dist/data-port/export.js:62
-#: assets/dist/data-port/import.js:348
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:190
 msgid "Continue"
 msgstr ""
@@ -930,11 +809,7 @@ msgstr ""
 #: includes/block-patterns/course-list/class-sensei-course-list-block-patterns.php:104
 #: includes/block-patterns/course-list/class-sensei-course-list-block-patterns.php:168
 #: assets/blocks/course-actions-block/course-actions/course-actions-edit.js:36
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:224
-=======
-#: assets/dist/blocks/global-blocks.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Visit Results"
 msgstr ""
 
@@ -946,11 +821,7 @@ msgstr ""
 #: assets/blocks/course-completed-actions/index.js:11
 #: assets/blocks/course-completed-actions/index.js:27
 #: assets/blocks/course-completed-actions/index.js:43
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Find More Courses"
 msgstr ""
 
@@ -1045,13 +916,8 @@ msgstr ""
 #: templates/single-quiz/pagination.php:125
 #: assets/blocks/lesson-actions/complete-lesson-block/index.js:24
 #: assets/course-theme/blocks/quiz-blocks/index.js:121
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:202
 #: assets/dist/course-theme/blocks/index.js:264
-=======
-#: assets/dist/blocks/single-lesson.js:205
-#: assets/dist/course-theme/blocks/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 msgid "Complete"
 msgstr ""
 
@@ -1111,19 +977,11 @@ msgstr ""
 #: includes/internal/emails/class-email-list-table.php:241
 #: assets/blocks/quiz/ordering-promo/index.js:43
 #: assets/blocks/quiz/quiz-block/quiz-timer-promo.js:24
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:864
 #: assets/dist/blocks/quiz/ordering-promo/index.js:63
 #: assets/dist/js/admin/course-edit.js:49
 #: assets/dist/js/admin/course-edit.js:73
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/blocks/quiz/index.js:755
-#: assets/dist/blocks/quiz/ordering-promo/index.js:19
-#: assets/dist/js/admin/course-edit.js:49
-#: assets/dist/js/admin/course-edit.js:69
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-access-period-promo-sidebar.js:19
 #: assets/js/admin/course-general-sidebar.js:143
 #: assets/js/admin/course-pricing-promo-sidebar.js:39
@@ -1172,11 +1030,7 @@ msgstr ""
 
 #: includes/admin/home/notices/class-sensei-home-notices.php:373
 #: assets/course-theme/learning-mode-templates/template-actions.js:53
-<<<<<<< HEAD
 #: assets/dist/course-theme/learning-mode-templates/index.js:30
-=======
-#: assets/dist/course-theme/learning-mode-templates/index.js:51
->>>>>>> 2f9355c58 (Bump version)
 msgid "Activate"
 msgstr ""
 
@@ -1187,11 +1041,7 @@ msgstr ""
 
 #: includes/admin/home/notices/class-sensei-home-notices.php:404
 #: includes/class-sensei-lesson.php:1598
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
-=======
-#: assets/dist/home/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:70
 msgid "Update"
 msgstr ""
@@ -1224,7 +1074,7 @@ msgid "Learning mode"
 msgstr ""
 
 #: includes/admin/home/quick-links/class-sensei-home-quick-links-provider.php:37
-#: includes/class-sensei-settings.php:253
+#: includes/class-sensei-settings.php:245
 msgid "WooCommerce"
 msgstr ""
 
@@ -1256,11 +1106,11 @@ msgstr ""
 msgid "Integrations"
 msgstr ""
 
-#: includes/admin/home/quick-links/class-sensei-home-quick-links-provider.php:62
+#: includes/admin/home/quick-links/class-sensei-home-quick-links-provider.php:75
 msgid "Edit demo course"
 msgstr ""
 
-#: includes/admin/home/quick-links/class-sensei-home-quick-links-provider.php:65
+#: includes/admin/home/quick-links/class-sensei-home-quick-links-provider.php:78
 msgid "Install a demo course"
 msgstr ""
 
@@ -1417,11 +1267,7 @@ msgstr ""
 #: includes/admin/tools/views/html-enrolment-debug-form.php:26
 #: includes/admin/tools/views/html-enrolment-debug-form.php:55
 #: includes/admin/tools/views/html-recalculate-course-enrolment-form.php:25
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:44
 msgid "Required"
 msgstr ""
@@ -1461,11 +1307,7 @@ msgstr ""
 #: includes/internal/emails/patterns/student-completes-course.php:40
 #: includes/internal/emails/patterns/student-completes-lesson.php:40
 #: includes/internal/emails/patterns/student-starts-course.php:31
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:228
 msgid "Manage Students"
 msgstr ""
@@ -1476,11 +1318,7 @@ msgstr ""
 
 #: includes/admin/tools/views/html-enrolment-debug.php:82
 #: assets/blocks/conditional-content-block/conditional-content-edit.js:22
-<<<<<<< HEAD
 #: assets/dist/blocks/shared.js:163
-=======
-#: assets/dist/blocks/shared.js:161
->>>>>>> 2f9355c58 (Bump version)
 msgid "Not Enrolled"
 msgstr ""
 
@@ -1630,11 +1468,7 @@ msgstr ""
 #: includes/block-patterns/page/templates/landing-page-grid.php:68
 #: includes/block-patterns/page/templates/landing-page-list.php:78
 #: assets/blocks/take-course-block/index.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Start"
 msgstr ""
 
@@ -1647,13 +1481,8 @@ msgstr ""
 
 #: includes/block-patterns/course-list/class-sensei-course-list-block-patterns.php:231
 #: assets/blocks/course-list-block/index.js:36
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:369
 #: assets/dist/blocks/shared.js:239
-=======
-#: assets/dist/blocks/global-blocks.js:370
-#: assets/dist/blocks/shared.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course List"
 msgstr ""
 
@@ -1685,11 +1514,7 @@ msgstr ""
 #: includes/block-patterns/course/templates/video-hero.php:139
 #: includes/block-patterns/course/templates/video-hero.php:182
 #: assets/blocks/take-course-block/index.js:35
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Take Course"
 msgstr ""
 
@@ -1875,12 +1700,8 @@ msgstr ""
 #: includes/class-sensei-messages.php:274
 #: assets/blocks/contact-teacher-block/index.js:13
 #: assets/blocks/contact-teacher-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/shared.js:206
 #: assets/dist/blocks/shared.js:211
-=======
-#: assets/dist/blocks/shared.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Contact Teacher"
 msgstr ""
 
@@ -1965,11 +1786,7 @@ msgstr ""
 #: includes/block-patterns/lesson/templates/zoom-meeting.php:56
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:17
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:353
-=======
-#: assets/dist/blocks/single-lesson.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "View Quiz"
 msgstr ""
 
@@ -1983,11 +1800,9 @@ msgstr ""
 #: includes/class-sensei-frontend.php:880
 #: assets/blocks/lesson-actions/complete-lesson-block/index.js:18
 #: assets/blocks/lesson-actions/complete-lesson-block/index.js:31
-<<<<<<< HEAD
+#: assets/course-theme/blocks/lesson-blocks/index.js:128
 #: assets/dist/blocks/single-lesson.js:202
-=======
-#: assets/dist/blocks/single-lesson.js:205
->>>>>>> 2f9355c58 (Bump version)
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Complete Lesson"
 msgstr ""
 
@@ -1997,7 +1812,7 @@ msgstr ""
 #: includes/block-patterns/lesson/templates/files-to-download.php:29
 #: includes/block-patterns/lesson/templates/video-lesson.php:29
 #: includes/block-patterns/lesson/templates/zoom-meeting.php:64
-#: includes/blocks/course-theme/class-lesson-actions.php:99
+#: includes/blocks/course-theme/class-lesson-actions.php:109
 #: includes/blocks/course-theme/class-prev-next-lesson.php:98
 #: includes/class-sensei-utils.php:1125
 #: includes/internal/emails/patterns/student-no-progress-3-days.php:31
@@ -2005,11 +1820,7 @@ msgstr ""
 #: includes/internal/emails/patterns/student-no-progress-28-days.php:31
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:17
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:31
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:329
-=======
-#: assets/dist/blocks/single-lesson.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Next Lesson"
 msgstr ""
 
@@ -2023,13 +1834,8 @@ msgstr ""
 #: assets/blocks/lesson-actions/lesson-actions-block/lesson-actions-edit.js:56
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:17
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:33
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:251
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/single-lesson.js:249
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Reset Lesson"
 msgstr ""
 
@@ -2140,11 +1946,7 @@ msgstr ""
 
 #: includes/block-patterns/page/templates/landing-page-grid.php:185
 #: includes/block-patterns/page/templates/landing-page-list.php:188
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:366
-=======
-#: assets/dist/setup-wizard/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/big-screen.js:129
 msgid "Founder at BeautifulWriting.com"
 msgstr ""
@@ -2204,15 +2006,9 @@ msgstr ""
 #: assets/admin/emails/email-preview-button/email-preview-button.js:84
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:102
 #: assets/course-theme/learning-mode-templates/template-option/template-option-thumbnail.js:26
-<<<<<<< HEAD
 #: assets/dist/admin/emails/email-preview-button/index.js:18
 #: assets/dist/blocks/single-course.js:333
 #: assets/dist/course-theme/learning-mode-templates/index.js:46
-=======
-#: assets/dist/admin/emails/email-preview-button/index.js:19
-#: assets/dist/blocks/single-course.js:291
-#: assets/dist/course-theme/learning-mode-templates/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Preview"
 msgstr ""
 
@@ -2222,11 +2018,7 @@ msgstr ""
 
 #: includes/blocks/class-sensei-course-overview-block.php:51
 #: assets/blocks/course-overview-block/course-overview-edit.js:36
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:571
-=======
-#: assets/dist/blocks/global-blocks.js:425
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Overview"
 msgstr ""
 
@@ -2237,7 +2029,7 @@ msgstr ""
 
 #: includes/blocks/class-sensei-course-results-block.php:131
 #: assets/blocks/course-results-block/course-results-edit.js:138
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:225
 msgid "Your Total Grade"
 msgstr ""
 
@@ -2247,24 +2039,15 @@ msgstr ""
 #: includes/class-sensei-messages.php:918
 #: includes/class-sensei-messages.php:1009
 #: assets/blocks/learner-messages-button-block/index.js:14
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:283
-=======
-#: assets/dist/blocks/single-page.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "My Messages"
 msgstr ""
 
 #: includes/blocks/class-sensei-lesson-properties-block.php:71
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:48
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:101
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:382
 #: assets/dist/course-theme/blocks/index.js:234
-=======
-#: assets/dist/blocks/single-lesson.js:381
-#: assets/dist/course-theme/blocks/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Length"
 msgstr ""
 
@@ -2278,13 +2061,8 @@ msgstr[1] ""
 #: includes/blocks/class-sensei-lesson-properties-block.php:88
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:67
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:123
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:382
 #: assets/dist/course-theme/blocks/index.js:234
-=======
-#: assets/dist/blocks/single-lesson.js:381
-#: assets/dist/course-theme/blocks/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Difficulty"
 msgstr ""
 
@@ -2295,26 +2073,16 @@ msgstr ""
 #: assets/blocks/course-list-block/featured-label/index.js:36
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:45
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:52
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:350
 #: assets/dist/blocks/global-blocks.js:408
 #: assets/dist/blocks/shared.js:220
-=======
-#: assets/dist/blocks/global-blocks.js:348
-#: assets/dist/blocks/global-blocks.js:381
-#: assets/dist/blocks/shared.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Featured"
 msgstr ""
 
 #: includes/blocks/course-list/class-sensei-course-list-categories-filter.php:54
 #: includes/class-sensei-lesson.php:1762
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:37
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
-=======
-#: assets/dist/blocks/global-blocks.js:381
->>>>>>> 2f9355c58 (Bump version)
 msgid "All Categories"
 msgstr ""
 
@@ -2324,13 +2092,8 @@ msgstr ""
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:48
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:62
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:99
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
 #: assets/dist/blocks/single-page.js:264
-=======
-#: assets/dist/blocks/global-blocks.js:381
-#: assets/dist/blocks/single-page.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "All Courses"
 msgstr ""
 
@@ -2338,13 +2101,8 @@ msgstr ""
 #: includes/shortcodes/class-sensei-shortcode-user-courses.php:569
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:66
 #: assets/course-theme/learning-mode-templates/template-option/template-option-footer.js:40
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
 #: assets/dist/course-theme/learning-mode-templates/index.js:38
-=======
-#: assets/dist/blocks/global-blocks.js:381
-#: assets/dist/course-theme/learning-mode-templates/index.js:62
->>>>>>> 2f9355c58 (Bump version)
 msgid "Active"
 msgstr ""
 
@@ -2380,13 +2138,8 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:800
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:21
 #: assets/course-theme/blocks/course-navigation/index.js:124
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:353
 #: assets/dist/course-theme/blocks/index.js:241
-=======
-#: assets/dist/blocks/single-lesson.js:348
-#: assets/dist/course-theme/blocks/index.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz"
 msgstr ""
 
@@ -2401,9 +2154,9 @@ msgid "%s: back to course main page"
 msgstr ""
 
 #: includes/blocks/course-theme/class-exit-course.php:59
-#: assets/course-theme/blocks/lesson-blocks/index.js:174
-#: assets/course-theme/blocks/lesson-blocks/index.js:185
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:178
+#: assets/course-theme/blocks/lesson-blocks/index.js:189
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Exit Course"
 msgstr ""
 
@@ -2411,9 +2164,9 @@ msgstr ""
 msgid "Toggle focus mode"
 msgstr ""
 
-#: includes/blocks/course-theme/class-lesson-actions.php:117
-#: assets/course-theme/blocks/lesson-blocks/index.js:127
-#: assets/dist/course-theme/blocks/index.js:271
+#: includes/blocks/course-theme/class-lesson-actions.php:127
+#: assets/course-theme/blocks/lesson-blocks/index.js:133
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Take Quiz"
 msgstr ""
 
@@ -2422,11 +2175,7 @@ msgstr ""
 #: includes/class-sensei-course.php:2112
 #: includes/class-sensei-lesson.php:1810
 #: templates/single-quiz/pagination.php:98
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:380
-=======
-#: assets/dist/setup-wizard/index.js:348
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/carousel.js:139
 msgid "Previous"
 msgstr ""
@@ -2442,15 +2191,9 @@ msgstr ""
 #: templates/single-quiz/pagination.php:113
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:24
 #: assets/course-theme/blocks/quiz-blocks/index.js:109
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:329
 #: assets/dist/course-theme/blocks/index.js:264
 #: assets/dist/setup-wizard/index.js:380
-=======
-#: assets/dist/blocks/single-lesson.js:326
-#: assets/dist/course-theme/blocks/index.js:282
-#: assets/dist/setup-wizard/index.js:348
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/carousel.js:147
 msgid "Next"
 msgstr ""
@@ -2458,7 +2201,7 @@ msgstr ""
 #: includes/blocks/course-theme/class-quiz-back-to-lesson.php:62
 #: assets/course-theme/blocks/quiz-blocks/index.js:61
 #: assets/course-theme/blocks/quiz-blocks/index.js:69
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Back to lesson"
 msgstr ""
 
@@ -2625,13 +2368,8 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1290
 #: includes/class-sensei-lesson.php:1299
 #: assets/blocks/quiz/question-block/settings/question-grade-settings.js:28
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:682
 #: assets/dist/js/grading-general.js:68
-=======
-#: assets/dist/blocks/quiz/index.js:546
-#: assets/dist/js/grading-general.js:19
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/grading-general.js:64
 msgid "Grade"
 msgstr ""
@@ -2668,11 +2406,7 @@ msgstr ""
 #: includes/class-sensei-analysis-lesson-list-table.php:215
 #: includes/class-sensei-grading-main.php:248
 #: assets/data-port/import/done/done-page.js:38
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Failed"
 msgstr ""
 
@@ -2921,11 +2655,7 @@ msgstr ""
 
 #: includes/class-sensei-course.php:252
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:52
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "WooCommerce integration"
 msgstr ""
 
@@ -2935,11 +2665,7 @@ msgstr ""
 
 #: includes/class-sensei-course.php:254
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:58
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Set expiration date of courses"
 msgstr ""
 
@@ -2952,13 +2678,8 @@ msgstr ""
 #: includes/class-sensei-course.php:262
 #: includes/class-sensei-groups-landing-page.php:98
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:43
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:61
 msgid "%s USD"
 msgstr ""
@@ -2966,13 +2687,8 @@ msgstr ""
 #: includes/class-sensei-course.php:265
 #: includes/class-sensei-groups-landing-page.php:100
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:48
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:69
 msgid "per year, 1 site"
 msgstr ""
@@ -2983,13 +2699,8 @@ msgstr ""
 #: includes/class-sensei-settings-api.php:94
 #: includes/class-sensei-settings-api.php:111
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:125
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:92
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:120
 msgid "Get Sensei Pro"
 msgstr ""
@@ -3021,12 +2732,8 @@ msgid "New Course"
 msgstr ""
 
 #: includes/class-sensei-course.php:415
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:118
 #: assets/dist/js/admin/course-edit.js:121
-=======
-#: assets/dist/js/admin/course-edit.js:89
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-settings-plugin-sidebar.js:56
 #: assets/js/admin/course-settings-plugin-sidebar.js:60
 #: assets/js/admin/course-settings-plugin-sidebar.js:93
@@ -3034,21 +2741,13 @@ msgid "Course Settings"
 msgstr ""
 
 #: includes/class-sensei-course.php:706
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:155
 msgid "Course Prerequisite"
 msgstr ""
 
 #: includes/class-sensei-course.php:719
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:195
 msgid "Featured Course"
 msgstr ""
@@ -3058,31 +2757,19 @@ msgid "Course Video"
 msgstr ""
 
 #: includes/class-sensei-course.php:736
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:223
 msgid "Course Management"
 msgstr ""
 
 #: includes/class-sensei-course.php:752
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:209
 msgid "Course Notifications"
 msgstr ""
 
 #: includes/class-sensei-course.php:810
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:158
 msgid "No courses exist yet. Please add some first."
 msgstr ""
@@ -3131,11 +2818,7 @@ msgid "+ Add Another Lesson"
 msgstr ""
 
 #: includes/class-sensei-course.php:1138
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:235
 msgid "Manage Grading"
 msgstr ""
@@ -3199,13 +2882,8 @@ msgstr ""
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:180
 #: assets/blocks/view-results-block/index.js:24
 #: assets/blocks/view-results-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:661
 #: assets/dist/blocks/single-page.js:267
-=======
-#: assets/dist/blocks/global-blocks.js:513
-#: assets/dist/blocks/single-page.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "View Results"
 msgstr ""
 
@@ -3235,13 +2913,13 @@ msgstr ""
 
 #: includes/class-sensei-course.php:2162
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:103
-#: assets/dist/blocks/single-page.js:249
+#: assets/dist/blocks/single-page.js:264
 msgid "Active Courses"
 msgstr ""
 
 #: includes/class-sensei-course.php:2163
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:107
-#: assets/dist/blocks/single-page.js:249
+#: assets/dist/blocks/single-page.js:264
 msgid "Completed Courses"
 msgstr ""
 
@@ -3259,11 +2937,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: includes/class-sensei-course.php:2571
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:211
 msgid "Disable notifications on this course?"
 msgstr ""
@@ -3302,11 +2976,7 @@ msgstr ""
 #: includes/shortcodes/class-sensei-shortcode-user-courses.php:568
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:250
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:255
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "All"
 msgstr ""
 
@@ -3543,19 +3213,19 @@ msgid "Reset filter"
 msgstr ""
 
 #: includes/class-sensei-grading-user-quiz.php:107
-#: includes/class-sensei-grading-user-quiz.php:379
+#: includes/class-sensei-grading-user-quiz.php:380
 #: includes/class-sensei-lesson.php:1567
 #: includes/class-sensei-lesson.php:1709
 msgid "Grade:"
 msgstr ""
 
 #: includes/class-sensei-grading-user-quiz.php:111
-#: includes/class-sensei-grading-user-quiz.php:383
+#: includes/class-sensei-grading-user-quiz.php:384
 #: includes/class-sensei-quiz.php:1886
 #: templates/single-quiz/pagination.php:78
 #: assets/course-theme/blocks/quiz-blocks/index.js:114
-#: assets/dist/course-theme/blocks/index.js:282
-#: assets/dist/js/grading-general.js:19
+#: assets/dist/course-theme/blocks/index.js:264
+#: assets/dist/js/grading-general.js:68
 #: assets/js/grading-general.js:67
 msgid "Save"
 msgstr ""
@@ -3565,7 +3235,7 @@ msgid "Saves grades as currently marked on this page"
 msgstr ""
 
 #: includes/class-sensei-grading-user-quiz.php:112
-#: includes/class-sensei-grading-user-quiz.php:384
+#: includes/class-sensei-grading-user-quiz.php:385
 msgid "Auto grade"
 msgstr ""
 
@@ -3574,20 +3244,14 @@ msgid "Where possible, automatically grades questions that have not yet been gra
 msgstr ""
 
 #: includes/class-sensei-grading-user-quiz.php:113
-#: includes/class-sensei-grading-user-quiz.php:385
+#: includes/class-sensei-grading-user-quiz.php:386
 #: includes/class-sensei-quiz.php:1876
 #: templates/single-quiz/pagination.php:68
 #: assets/blocks/editor-components/number-control/index.js:77
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:24
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:186
 #: assets/dist/blocks/single-lesson.js:163
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/quiz/index.js:172
-#: assets/dist/blocks/single-lesson.js:161
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/dist/course-theme/blocks/index.js:205
 msgid "Reset"
 msgstr ""
@@ -3601,7 +3265,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:116
 #: assets/blocks/quiz/answer-blocks/index.js:39
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Multiple Choice"
 msgstr ""
 
@@ -3609,7 +3273,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:117
 #: assets/blocks/quiz/answer-blocks/index.js:84
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "True/False"
 msgstr ""
 
@@ -3617,7 +3281,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:118
 #: assets/blocks/quiz/answer-blocks/index.js:95
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Gap Fill"
 msgstr ""
 
@@ -3625,7 +3289,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:120
 #: assets/blocks/quiz/answer-blocks/index.js:138
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Multi Line"
 msgstr ""
 
@@ -3633,7 +3297,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:119
 #: assets/blocks/quiz/answer-blocks/index.js:128
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Single Line"
 msgstr ""
 
@@ -3641,7 +3305,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1511
 #: includes/class-sensei-question.php:121
 #: assets/blocks/quiz/answer-blocks/index.js:148
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "File Upload"
 msgstr ""
 
@@ -3656,18 +3320,18 @@ msgstr ""
 msgid "Question %d: "
 msgstr ""
 
-#: includes/class-sensei-grading-user-quiz.php:339
+#: includes/class-sensei-grading-user-quiz.php:340
 msgid "Correct answer"
 msgstr ""
 
-#: includes/class-sensei-grading-user-quiz.php:355
+#: includes/class-sensei-grading-user-quiz.php:356
 #: includes/class-sensei-lesson.php:2311
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback-toggle.js:42
-#: assets/dist/blocks/quiz/index.js:293
+#: assets/dist/blocks/quiz/index.js:349
 msgid "Answer Feedback"
 msgstr ""
 
-#: includes/class-sensei-grading-user-quiz.php:358
+#: includes/class-sensei-grading-user-quiz.php:359
 msgid "Add custom feedback here..."
 msgstr ""
 
@@ -3719,7 +3383,7 @@ msgid "Guest Student"
 msgstr ""
 
 #: includes/class-sensei-learner-profiles.php:28
-#: includes/class-sensei-settings.php:642
+#: includes/class-sensei-settings.php:634
 msgid "learner"
 msgstr ""
 
@@ -3781,7 +3445,7 @@ msgid "Prerequisite"
 msgstr ""
 
 #: includes/class-sensei-lesson.php:300
-#: includes/class-sensei-settings.php:270
+#: includes/class-sensei-settings.php:262
 msgid "Content Drip"
 msgstr ""
 
@@ -3800,11 +3464,7 @@ msgstr ""
 
 #: includes/class-sensei-lesson.php:336
 #: includes/course-theme/class-sensei-course-theme-template-selection.php:121
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:27
 msgid "Video"
 msgstr ""
@@ -3854,11 +3514,7 @@ msgstr ""
 
 #: includes/class-sensei-lesson.php:590
 #: assets/course-theme/learning-mode-templates/template-actions.js:59
-<<<<<<< HEAD
 #: assets/dist/course-theme/learning-mode-templates/index.js:30
-=======
-#: assets/dist/course-theme/learning-mode-templates/index.js:51
->>>>>>> 2f9355c58 (Bump version)
 msgid "Customize"
 msgstr ""
 
@@ -3881,11 +3537,7 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:805
 #: includes/class-sensei-question.php:212
 #: assets/blocks/quiz/quiz-block/questions-modal/questions.js:146
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:819
-=======
-#: assets/dist/blocks/quiz/index.js:700
->>>>>>> 2f9355c58 (Bump version)
 msgid "Question"
 msgstr ""
 
@@ -3895,13 +3547,8 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1785
 #: assets/blocks/quiz/quiz-block/questions-modal/filter.js:45
 #: assets/blocks/quiz/quiz-block/questions-modal/questions.js:147
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:798
 #: assets/dist/blocks/quiz/index.js:819
-=======
-#: assets/dist/blocks/quiz/index.js:678
-#: assets/dist/blocks/quiz/index.js:700
->>>>>>> 2f9355c58 (Bump version)
 msgid "Type"
 msgstr ""
 
@@ -3971,11 +3618,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1574
 #: includes/class-sensei-lesson.php:1714
 #: assets/blocks/quiz/question-block/settings/question-multiple-choice-settings.js:20
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:700
-=======
-#: assets/dist/blocks/quiz/index.js:568
->>>>>>> 2f9355c58 (Bump version)
 msgid "Random Order"
 msgstr ""
 
@@ -4003,13 +3646,8 @@ msgstr ""
 #: assets/blocks/editor-components/confirm-dialog/confirm-dialog.js:29
 #: assets/course-theme/learning-mode-templates/template-preview.js:41
 #: assets/data-port/export/export-progress-page.js:57
-<<<<<<< HEAD
 #: assets/dist/course-theme/learning-mode-templates/index.js:70
 #: assets/dist/data-port/export.js:25
-=======
-#: assets/dist/course-theme/learning-mode-templates/index.js:106
-#: assets/dist/data-port/export.js:51
->>>>>>> 2f9355c58 (Bump version)
 msgid "Cancel"
 msgstr ""
 
@@ -4020,11 +3658,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:1659
 #: includes/class-sensei-question.php:103
 #: assets/blocks/quiz/quiz-block/quiz-appender.js:51
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:828
-=======
-#: assets/dist/blocks/quiz/index.js:711
->>>>>>> 2f9355c58 (Bump version)
 msgid "New Question"
 msgstr ""
 
@@ -4080,17 +3714,10 @@ msgstr ""
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:112
 #: assets/blocks/quiz/quiz-block/questions-modal/filter.js:56
 #: assets/blocks/quiz/quiz-block/questions-modal/questions.js:148
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:387
 #: assets/dist/blocks/quiz/index.js:798
 #: assets/dist/blocks/quiz/index.js:819
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/quiz/index.js:337
-#: assets/dist/blocks/quiz/index.js:678
-#: assets/dist/blocks/quiz/index.js:700
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Category"
 msgstr ""
 
@@ -4142,7 +3769,8 @@ msgstr ""
 #: templates/single-quiz/question-type-boolean.php:82
 #: assets/blocks/quiz/answer-blocks/true-false.js:27
 #: assets/blocks/quiz/answer-blocks/true-false.js:74
-#: assets/dist/blocks/quiz/index.js:282
+#: assets/dist/blocks/quiz/index.js:332
+#: assets/dist/blocks/quiz/index.js:341
 msgid "True"
 msgstr ""
 
@@ -4151,7 +3779,8 @@ msgstr ""
 #: templates/single-quiz/question-type-boolean.php:86
 #: assets/blocks/quiz/answer-blocks/true-false.js:28
 #: assets/blocks/quiz/answer-blocks/true-false.js:75
-#: assets/dist/blocks/quiz/index.js:282
+#: assets/dist/blocks/quiz/index.js:332
+#: assets/dist/blocks/quiz/index.js:341
 msgid "False"
 msgstr ""
 
@@ -4181,11 +3810,7 @@ msgstr ""
 #: includes/class-sensei-lesson.php:2224
 #: includes/class-sensei-lesson.php:2248
 #: assets/blocks/quiz/question-block/settings/question-grading-notes-settings.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:691
-=======
-#: assets/dist/blocks/quiz/index.js:557
->>>>>>> 2f9355c58 (Bump version)
 msgid "Displayed to the teacher when grading the question."
 msgstr ""
 
@@ -4283,37 +3908,22 @@ msgstr ""
 
 #: includes/class-sensei-lesson.php:3473
 #: assets/blocks/lesson-properties/constants.js:13
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:360
 #: assets/dist/course-theme/blocks/index.js:212
-=======
-#: assets/dist/blocks/single-lesson.js:359
-#: assets/dist/course-theme/blocks/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Easy"
 msgstr ""
 
 #: includes/class-sensei-lesson.php:3474
 #: assets/blocks/lesson-properties/constants.js:17
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:360
 #: assets/dist/course-theme/blocks/index.js:212
-=======
-#: assets/dist/blocks/single-lesson.js:359
-#: assets/dist/course-theme/blocks/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Standard"
 msgstr ""
 
 #: includes/class-sensei-lesson.php:3475
 #: assets/blocks/lesson-properties/constants.js:21
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:360
 #: assets/dist/course-theme/blocks/index.js:212
-=======
-#: assets/dist/blocks/single-lesson.js:359
-#: assets/dist/course-theme/blocks/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Hard"
 msgstr ""
 
@@ -4510,13 +4120,8 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:1061
 #: assets/blocks/course-outline/outline-block/outline-settings.js:26
 #: assets/blocks/course-results-block/course-results-settings.js:22
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:475
 #: assets/dist/blocks/single-page.js:234
-=======
-#: assets/dist/blocks/single-course.js:434
-#: assets/dist/blocks/single-page.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Modules"
 msgstr ""
 
@@ -4537,15 +4142,9 @@ msgstr ""
 #: assets/blocks/course-outline/module-block/index.js:21
 #: assets/blocks/course-outline/outline-block/index.js:36
 #: assets/blocks/course-outline/outline-block/outline-appender.js:43
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:360
 #: assets/dist/blocks/single-course.js:429
 #: assets/dist/blocks/single-course.js:438
-=======
-#: assets/dist/blocks/single-course.js:324
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/blocks/single-course.js:390
->>>>>>> 2f9355c58 (Bump version)
 msgid "Module"
 msgstr ""
 
@@ -4655,7 +4254,7 @@ msgid "&larr; Back to Modules"
 msgstr ""
 
 #. translators: %s: add new taxonomy label
-#: includes/class-sensei-modules.php:2357
+#: includes/class-sensei-modules.php:2366
 msgid "+ %s"
 msgstr ""
 
@@ -4889,11 +4488,7 @@ msgstr ""
 
 #: includes/class-sensei-posttypes.php:708
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:34
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
-=======
-#: assets/dist/blocks/global-blocks.js:381
->>>>>>> 2f9355c58 (Bump version)
 msgid "Categories"
 msgstr ""
 
@@ -4966,15 +4561,9 @@ msgstr ""
 #: includes/class-sensei-posttypes.php:1076
 #: includes/class-sensei-posttypes.php:1077
 #: assets/blocks/quiz/quiz-block/questions-modal/index.js:45
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:807
 #: assets/dist/data-port/export.js:187
 #: assets/dist/data-port/import.js:625
-=======
-#: assets/dist/blocks/quiz/index.js:689
-#: assets/dist/data-port/export.js:183
-#: assets/dist/data-port/import.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/helpers/labels.js:9
 msgid "Questions"
 msgstr ""
@@ -5086,11 +4675,7 @@ msgstr ""
 
 #: includes/class-sensei-posttypes.php:936
 #: assets/blocks/course-outline/outline-block/outline-appender.js:35
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:438
-=======
-#: assets/dist/blocks/single-course.js:390
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lesson name"
 msgstr ""
 
@@ -5148,14 +4733,14 @@ msgstr ""
 
 #: includes/class-sensei-question.php:926
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback.js:19
-#: assets/dist/blocks/quiz/index.js:304
+#: assets/dist/blocks/quiz/index.js:357
 msgid "Correct"
 msgstr ""
 
 #: includes/class-sensei-question.php:928
 #: includes/class-sensei-question.php:1119
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback.js:26
-#: assets/dist/blocks/quiz/index.js:304
+#: assets/dist/blocks/quiz/index.js:357
 msgid "Incorrect"
 msgstr ""
 
@@ -5212,545 +4797,529 @@ msgstr ""
 msgid "Sensei LMS Settings"
 msgstr ""
 
-#: includes/class-sensei-settings.php:211
-<<<<<<< HEAD
+#: includes/class-sensei-settings.php:203
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:120
 msgid "General"
 msgstr ""
 
-#: includes/class-sensei-settings.php:212
-#: includes/class-sensei-settings.php:217
+#: includes/class-sensei-settings.php:204
+#: includes/class-sensei-settings.php:209
 msgid "Settings that apply to the entire plugin."
 msgstr ""
 
-#: includes/class-sensei-settings.php:216
+#: includes/class-sensei-settings.php:208
 msgid "Appearance"
 msgstr ""
 
-#: includes/class-sensei-settings.php:218
+#: includes/class-sensei-settings.php:210
 msgid "new"
 msgstr ""
 
-#: includes/class-sensei-settings.php:223
+#: includes/class-sensei-settings.php:215
 msgid "Settings that apply to all Courses."
 msgstr ""
 
-#: includes/class-sensei-settings.php:228
+#: includes/class-sensei-settings.php:220
 msgid "Settings that apply to all Lessons."
 msgstr ""
 
-#: includes/class-sensei-settings.php:232
+#: includes/class-sensei-settings.php:224
 msgid "Email Notifications"
 msgstr ""
 
-#: includes/class-sensei-settings.php:233
+#: includes/class-sensei-settings.php:225
 #: includes/internal/emails/class-settings-menu.php:45
 msgid "Settings for email notifications sent from your site."
 msgstr ""
 
-#: includes/class-sensei-settings.php:237
+#: includes/class-sensei-settings.php:229
 msgid "Student Profiles"
 msgstr ""
 
-#: includes/class-sensei-settings.php:238
+#: includes/class-sensei-settings.php:230
 msgid "Settings for public Student Profiles."
 msgstr ""
 
-#: includes/class-sensei-settings.php:254
+#: includes/class-sensei-settings.php:246
 msgid "Optional settings for WooCommerce functions."
 msgstr ""
 
-#: includes/class-sensei-settings.php:271
+#: includes/class-sensei-settings.php:263
 msgid "Optional settings for the Content Drip extension."
 msgstr ""
 
-#: includes/class-sensei-settings.php:312
+#: includes/class-sensei-settings.php:304
 msgid "Once all the course lessons have been completed"
 msgstr ""
 
-#: includes/class-sensei-settings.php:313
+#: includes/class-sensei-settings.php:305
 msgid "At any time (by clicking the 'Complete Course' button)"
 msgstr ""
 
-#: includes/class-sensei-settings.php:316
+#: includes/class-sensei-settings.php:308
 msgid "Don't show quiz question points"
 msgstr ""
 
-#: includes/class-sensei-settings.php:317
+#: includes/class-sensei-settings.php:309
 msgid "Number (e.g. 1. Default)"
 msgstr ""
 
-#: includes/class-sensei-settings.php:318
+#: includes/class-sensei-settings.php:310
 msgid "Brackets (e.g. [1])"
 msgstr ""
 
-#: includes/class-sensei-settings.php:319
+#: includes/class-sensei-settings.php:311
 msgid "Text (e.g. Points: 1)"
 msgstr ""
 
-#: includes/class-sensei-settings.php:320
+#: includes/class-sensei-settings.php:312
 msgid "Text and Brackets (e.g. [Points: 1])"
 msgstr ""
 
-#: includes/class-sensei-settings.php:325
+#: includes/class-sensei-settings.php:317
 msgid "Access Permissions"
 msgstr ""
 
-#: includes/class-sensei-settings.php:326
+#: includes/class-sensei-settings.php:318
 msgid "Users must be logged in to view lesson content."
 msgstr ""
 
-#: includes/class-sensei-settings.php:333
+#: includes/class-sensei-settings.php:325
 msgid "Disable Private Messages"
 msgstr ""
 
-#: includes/class-sensei-settings.php:334
+#: includes/class-sensei-settings.php:326
 msgid "Disable the private message functions between students and teachers."
 msgstr ""
 
-#: includes/class-sensei-settings.php:341
+#: includes/class-sensei-settings.php:333
 msgid "Course Archive Page"
 msgstr ""
 
-#: includes/class-sensei-settings.php:342
+#: includes/class-sensei-settings.php:334
 msgid "The page to use to display courses. If you leave this blank the default custom post type archive will apply."
 msgstr ""
 
-#: includes/class-sensei-settings.php:351
+#: includes/class-sensei-settings.php:343
 msgid "My Courses Page"
 msgstr ""
 
-#: includes/class-sensei-settings.php:352
+#: includes/class-sensei-settings.php:344
 msgid "The page to use to display the courses that a user is currently taking as well as the courses a user has complete."
 msgstr ""
 
-#: includes/class-sensei-settings.php:361
+#: includes/class-sensei-settings.php:353
 msgid "Course Completed Page"
 msgstr ""
 
-#: includes/class-sensei-settings.php:362
+#: includes/class-sensei-settings.php:354
 msgid "The page that is displayed after a student completes a course."
 msgstr ""
 
-#: includes/class-sensei-settings.php:371
+#: includes/class-sensei-settings.php:363
 msgid "Use placeholder images"
 msgstr ""
 
-#: includes/class-sensei-settings.php:372
+#: includes/class-sensei-settings.php:364
 msgid "Output a placeholder image when no featured image has been specified for Courses and Lessons."
 msgstr ""
 
-#: includes/class-sensei-settings.php:379
+#: includes/class-sensei-settings.php:371
 msgid "Disable Sensei LMS Styles"
 msgstr ""
 
-#: includes/class-sensei-settings.php:380
+#: includes/class-sensei-settings.php:372
 msgid "Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei LMS elements."
 msgstr ""
 
-#: includes/class-sensei-settings.php:386
+#: includes/class-sensei-settings.php:378
 msgid "Quiz question points format"
 msgstr ""
 
-#: includes/class-sensei-settings.php:387
+#: includes/class-sensei-settings.php:379
 msgid "Set the quiz question points format"
 msgstr ""
 
-#: includes/class-sensei-settings.php:395
+#: includes/class-sensei-settings.php:387
 msgid "Disable Sensei LMS Javascript"
 msgstr ""
 
-#: includes/class-sensei-settings.php:396
+#: includes/class-sensei-settings.php:388
 msgid "Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs."
 msgstr ""
 
-#: includes/class-sensei-settings.php:403
+#: includes/class-sensei-settings.php:395
 msgid "Disable HTML security"
 msgstr ""
 
-#: includes/class-sensei-settings.php:404
+#: includes/class-sensei-settings.php:396
 msgid "Allow any HTML tags in the Video Embed field. Warning: Enabling this may leave your site more vulnerable to XSS attacks"
 msgstr ""
 
-#: includes/class-sensei-settings.php:411
+#: includes/class-sensei-settings.php:403
 msgid "Delete data on uninstall"
 msgstr ""
 
-#: includes/class-sensei-settings.php:412
+#: includes/class-sensei-settings.php:404
 msgid "Delete Sensei LMS data when the plugin is deleted. Once removed, this data cannot be restored."
 msgstr ""
 
-#: includes/class-sensei-settings.php:419
+#: includes/class-sensei-settings.php:411
 msgid "Courses are complete:"
 msgstr ""
 
-#: includes/class-sensei-settings.php:420
+#: includes/class-sensei-settings.php:412
 msgid "This will determine when courses are marked as complete."
 msgstr ""
 
-#: includes/class-sensei-settings.php:429
+#: includes/class-sensei-settings.php:421
 msgid "Display Course Author"
 msgstr ""
 
-#: includes/class-sensei-settings.php:430
+#: includes/class-sensei-settings.php:422
 msgid "Output the Course Author on Course archive and My Courses page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:437
+#: includes/class-sensei-settings.php:429
 msgid "My Courses Pagination"
 msgstr ""
 
-#: includes/class-sensei-settings.php:438
+#: includes/class-sensei-settings.php:430
 msgid "The number of courses to output for the my courses page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:447
+#: includes/class-sensei-settings.php:439
 msgid "Course Archive Image"
 msgstr ""
 
-#: includes/class-sensei-settings.php:448
+#: includes/class-sensei-settings.php:440
 msgid "Output the Course Image on the Course Archive Page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:455
+#: includes/class-sensei-settings.php:447
 msgid "Image Width - Archive"
 msgstr ""
 
-#: includes/class-sensei-settings.php:456
+#: includes/class-sensei-settings.php:448
 msgid "The width in pixels of the featured image for the Course Archive page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:464
+#: includes/class-sensei-settings.php:456
 msgid "Image Height - Archive"
 msgstr ""
 
-#: includes/class-sensei-settings.php:465
+#: includes/class-sensei-settings.php:457
 msgid "The height in pixels of the featured image for the Course Archive page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:473
+#: includes/class-sensei-settings.php:465
 msgid "Image Hard Crop - Archive"
 msgstr ""
 
 #. translators: Placeholders are an opening and closing <a> tag linking to the documentation page.
-#: includes/class-sensei-settings.php:475
-#: includes/class-sensei-settings.php:510
-#: includes/class-sensei-settings.php:600
-#: includes/class-sensei-settings.php:635
+#: includes/class-sensei-settings.php:467
+#: includes/class-sensei-settings.php:502
+#: includes/class-sensei-settings.php:592
+#: includes/class-sensei-settings.php:627
 msgid "After changing this setting, you may need to %1$sregenerate your thumbnails%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:482
+#: includes/class-sensei-settings.php:474
 msgid "Single Course Image"
 msgstr ""
 
-#: includes/class-sensei-settings.php:483
+#: includes/class-sensei-settings.php:475
 msgid "Output the Course Image on the Single Course Page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:490
-#: includes/class-sensei-settings.php:615
+#: includes/class-sensei-settings.php:482
+#: includes/class-sensei-settings.php:607
 msgid "Image Width - Single"
 msgstr ""
 
-#: includes/class-sensei-settings.php:491
+#: includes/class-sensei-settings.php:483
 msgid "The width in pixels of the featured image for the Course single post page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:499
-#: includes/class-sensei-settings.php:624
+#: includes/class-sensei-settings.php:491
+#: includes/class-sensei-settings.php:616
 msgid "Image Height - Single"
 msgstr ""
 
-#: includes/class-sensei-settings.php:500
+#: includes/class-sensei-settings.php:492
 msgid "The height in pixels of the featured image for the Course single post page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:508
-#: includes/class-sensei-settings.php:633
+#: includes/class-sensei-settings.php:500
+#: includes/class-sensei-settings.php:625
 msgid "Image Hard Crop - Single"
 msgstr ""
 
-#: includes/class-sensei-settings.php:517
+#: includes/class-sensei-settings.php:509
 msgid "Featured Courses Panel"
 msgstr ""
 
-#: includes/class-sensei-settings.php:518
+#: includes/class-sensei-settings.php:510
 msgid "Output the Featured Courses Panel on the Course Archive Page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:525
+#: includes/class-sensei-settings.php:517
 msgid "More link text"
 msgstr ""
 
-#: includes/class-sensei-settings.php:526
+#: includes/class-sensei-settings.php:518
 msgid "The text that will be displayed on the Course Archive for the more courses link."
 msgstr ""
 
-#: includes/class-sensei-settings.php:528
+#: includes/class-sensei-settings.php:520
 msgid "More"
 msgstr ""
 
-#: includes/class-sensei-settings.php:535
-<<<<<<< HEAD
+#: includes/class-sensei-settings.php:527
 #: assets/dist/js/admin/course-edit.js:140
-=======
-#: assets/dist/js/admin/course-edit.js:109
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-theme/course-theme-sidebar.js:33
 msgid "Learning Mode"
 msgstr ""
 
-#: includes/class-sensei-settings.php:536
-<<<<<<< HEAD
+#: includes/class-sensei-settings.php:528
 #: assets/dist/js/admin/course-edit.js:140
-=======
-#: assets/dist/js/admin/course-edit.js:109
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-theme/course-theme-sidebar.js:49
 msgid "Show an immersive and distraction-free view for lessons and quizzes."
 msgstr ""
 
-#: includes/class-sensei-settings.php:545
+#: includes/class-sensei-settings.php:537
 msgid "Learning Mode Templates"
 msgstr ""
 
-#: includes/class-sensei-settings.php:546
+#: includes/class-sensei-settings.php:538
 msgid "Choose a learning mode template that is most suited for your type of content and the style you want to offer to your students."
 msgstr ""
 
-#: includes/class-sensei-settings.php:556
+#: includes/class-sensei-settings.php:548
 msgid "Allow Comments for Lessons"
 msgstr ""
 
-#: includes/class-sensei-settings.php:557
+#: includes/class-sensei-settings.php:549
 msgid "This will allow students to post comments on the single Lesson page, only student who have access to the Lesson will be allowed to comment."
 msgstr ""
 
-#: includes/class-sensei-settings.php:564
+#: includes/class-sensei-settings.php:556
 msgid "Display Lesson Author"
 msgstr ""
 
-#: includes/class-sensei-settings.php:565
+#: includes/class-sensei-settings.php:557
 msgid "Output the Lesson Author on Course single page & Lesson archive page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:572
+#: includes/class-sensei-settings.php:564
 msgid "Course Lesson Images"
 msgstr ""
 
-#: includes/class-sensei-settings.php:573
+#: includes/class-sensei-settings.php:565
 msgid "Output the Lesson Image on the Single Course Page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:580
+#: includes/class-sensei-settings.php:572
 msgid "Image Width - Course Lessons"
 msgstr ""
 
-#: includes/class-sensei-settings.php:581
+#: includes/class-sensei-settings.php:573
 msgid "The width in pixels of the featured image for the Lessons on the Course Single page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:589
+#: includes/class-sensei-settings.php:581
 msgid "Image Height - Course Lessons"
 msgstr ""
 
-#: includes/class-sensei-settings.php:590
+#: includes/class-sensei-settings.php:582
 msgid "The height in pixels of the featured image for the Lessons on the Course Single page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:598
+#: includes/class-sensei-settings.php:590
 msgid "Image Hard Crop - Course Lessons"
 msgstr ""
 
-#: includes/class-sensei-settings.php:607
+#: includes/class-sensei-settings.php:599
 msgid "Single Lesson Images"
 msgstr ""
 
-#: includes/class-sensei-settings.php:608
+#: includes/class-sensei-settings.php:600
 msgid "Output the Lesson Image on the Single Lesson Page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:616
+#: includes/class-sensei-settings.php:608
 msgid "The width in pixels of the featured image for the Lessons single post page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:625
+#: includes/class-sensei-settings.php:617
 msgid "The height in pixels of the featured image for the Lessons single post page."
 msgstr ""
 
-#: includes/class-sensei-settings.php:646
+#: includes/class-sensei-settings.php:638
 msgid "Public student profiles"
 msgstr ""
 
 #. translators: Placeholder is a profile URL example.
-#: includes/class-sensei-settings.php:648
+#: includes/class-sensei-settings.php:640
 msgid "Enable public student profiles that will be accessible to everyone. Profile URL format: %s"
 msgstr ""
 
-#: includes/class-sensei-settings.php:655
+#: includes/class-sensei-settings.php:647
 msgid "Show student's courses"
 msgstr ""
 
-#: includes/class-sensei-settings.php:656
+#: includes/class-sensei-settings.php:648
 msgid "Display the student's active and completed courses on their profile."
 msgstr ""
 
-#: includes/class-sensei-settings.php:664
+#: includes/class-sensei-settings.php:656
 msgid "Their quiz is graded (auto and manual grading)"
 msgstr ""
 
-#: includes/class-sensei-settings.php:665
+#: includes/class-sensei-settings.php:657
 msgid "They complete a course"
 msgstr ""
 
-#: includes/class-sensei-settings.php:669
+#: includes/class-sensei-settings.php:661
 msgid "A student starts their course"
 msgstr ""
 
-#: includes/class-sensei-settings.php:670
+#: includes/class-sensei-settings.php:662
 msgid "A student completes their course"
 msgstr ""
 
-#: includes/class-sensei-settings.php:671
+#: includes/class-sensei-settings.php:663
 msgid "A student completes a lesson"
 msgstr ""
 
-#: includes/class-sensei-settings.php:672
+#: includes/class-sensei-settings.php:664
 msgid "A student submits a quiz for grading"
 msgstr ""
 
-#: includes/class-sensei-settings.php:673
+#: includes/class-sensei-settings.php:665
 msgid "A student sends a private message to a teacher"
 msgstr ""
 
-#: includes/class-sensei-settings.php:677
+#: includes/class-sensei-settings.php:669
 msgid "They receive a reply to their private message"
 msgstr ""
 
-#: includes/class-sensei-settings.php:681
+#: includes/class-sensei-settings.php:673
 msgid "Emails Sent to Students"
 msgstr ""
 
-#: includes/class-sensei-settings.php:682
+#: includes/class-sensei-settings.php:674
 msgid "Select the notifications that will be sent to students."
 msgstr ""
 
-#: includes/class-sensei-settings.php:690
+#: includes/class-sensei-settings.php:682
 msgid "Emails Sent to Teachers"
 msgstr ""
 
-#: includes/class-sensei-settings.php:691
+#: includes/class-sensei-settings.php:683
 msgid "Select the notifications that will be sent to teachers."
 msgstr ""
 
-#: includes/class-sensei-settings.php:699
+#: includes/class-sensei-settings.php:691
 msgid "Emails Sent to All Users"
 msgstr ""
 
-#: includes/class-sensei-settings.php:700
+#: includes/class-sensei-settings.php:692
 msgid "Select the notifications that will be sent to all users."
 msgstr ""
 
-#: includes/class-sensei-settings.php:708
+#: includes/class-sensei-settings.php:700
 msgid "\"From\" Name"
 msgstr ""
 
-#: includes/class-sensei-settings.php:709
+#: includes/class-sensei-settings.php:701
 msgid "The name from which all emails will be sent."
 msgstr ""
 
-#: includes/class-sensei-settings.php:717
+#: includes/class-sensei-settings.php:709
 msgid "\"From\" Address"
 msgstr ""
 
-#: includes/class-sensei-settings.php:718
+#: includes/class-sensei-settings.php:710
 msgid "The address from which all emails will be sent."
 msgstr ""
 
-#: includes/class-sensei-settings.php:726
+#: includes/class-sensei-settings.php:718
 msgid "Header Image"
 msgstr ""
 
 #. translators: Placeholders are opening and closing <a> tags linking to the media uploader.
-#: includes/class-sensei-settings.php:728
+#: includes/class-sensei-settings.php:720
 msgid "Enter a URL to an image you want to show in the email's header. Upload your image using the %1$smedia uploader%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:736
+#: includes/class-sensei-settings.php:728
 msgid "Email Footer Text"
 msgstr ""
 
-#: includes/class-sensei-settings.php:737
+#: includes/class-sensei-settings.php:729
 msgid "The text to appear in the footer of Sensei LMS emails."
 msgstr ""
 
 #. translators: Placeholder is the blog name.
-#: includes/class-sensei-settings.php:740
+#: includes/class-sensei-settings.php:732
 #: templates/emails/footer.php:26
 msgid "%1$s - Powered by Sensei LMS"
 msgstr ""
 
-#: includes/class-sensei-settings.php:746
+#: includes/class-sensei-settings.php:738
 msgid "Base Colour"
 msgstr ""
 
 #. translators: Placeholders are opening and closing <code> tags.
-#: includes/class-sensei-settings.php:748
+#: includes/class-sensei-settings.php:740
 msgid "The base colour for Sensei LMS email templates. Default %1$s#557da1%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:756
+#: includes/class-sensei-settings.php:748
 msgid "Background Colour"
 msgstr ""
 
 #. translators: Placeholders are opening and closing <code> tags.
-#: includes/class-sensei-settings.php:758
+#: includes/class-sensei-settings.php:750
 msgid "The background colour for Sensei LMS email templates. Default %1$s#f5f5f5%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:766
+#: includes/class-sensei-settings.php:758
 msgid "Body Background Colour"
 msgstr ""
 
 #. translators: Placeholders are opening and closing <code> tags.
-#: includes/class-sensei-settings.php:768
+#: includes/class-sensei-settings.php:760
 msgid "The main body background colour for Sensei LMS email templates. Default %1$s#fdfdfd%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:776
+#: includes/class-sensei-settings.php:768
 msgid "Body Text Colour"
 msgstr ""
 
 #. translators: Placeholders are opening and closing <code> tags.
-#: includes/class-sensei-settings.php:778
+#: includes/class-sensei-settings.php:770
 msgid "The main body text colour for Sensei LMS email templates. Default %1$s#505050%2$s."
 msgstr ""
 
-#: includes/class-sensei-settings.php:852
+#: includes/class-sensei-settings.php:844
 msgid "Select a Page:"
 msgstr ""
 
-#: includes/class-sensei-settings.php:1003
+#: includes/class-sensei-settings.php:995
 msgid "Enable for all courses"
 msgstr ""
 
-#: includes/class-sensei-settings.php:1012
+#: includes/class-sensei-settings.php:1004
 msgid "Customize Colors"
 msgstr ""
 
 #: includes/class-sensei-teacher.php:134
 #: includes/class-sensei-teacher.php:249
 #: includes/class-sensei-teacher.php:1273
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:121
 msgid "Teacher"
 msgstr ""
@@ -5901,17 +5470,17 @@ msgstr ""
 msgid "Points: %s"
 msgstr ""
 
-#: includes/class-sensei.php:404
-#: includes/class-sensei.php:413
+#: includes/class-sensei.php:408
+#: includes/class-sensei.php:417
 msgid "Cheatin&#8217; huh?"
 msgstr ""
 
 #. translators: Docs as in Documentation
-#: includes/class-sensei.php:1385
+#: includes/class-sensei.php:1398
 msgid "Docs"
 msgstr ""
 
-#: includes/class-sensei.php:1403
+#: includes/class-sensei.php:1416
 msgctxt "plugin action link"
 msgid "Configure"
 msgstr ""
@@ -5983,11 +5552,7 @@ msgstr ""
 #: includes/course-theme/class-sensei-course-theme-lesson.php:279
 #: includes/course-theme/class-sensei-course-theme-lesson.php:315
 #: assets/blocks/take-course-block/index.js:31
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Take course"
 msgstr ""
 
@@ -6190,11 +5755,7 @@ msgstr ""
 
 #: includes/data-port/class-sensei-import.php:62
 #: assets/data-port/import/steps.js:22
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:481
-=======
-#: assets/dist/data-port/import.js:304
->>>>>>> 2f9355c58 (Bump version)
 msgid "Import"
 msgstr ""
 
@@ -6569,17 +6130,17 @@ msgid "Email sent to the teacher when a student sends a new message"
 msgstr ""
 
 #: includes/internal/emails/class-email-patterns.php:162
-#: includes/internal/emails/class-email-seeder-data.php:126
+#: includes/internal/emails/class-email-seeder-data.php:127
 msgid "Where have you been?"
 msgstr ""
 
 #: includes/internal/emails/class-email-patterns.php:168
-#: includes/internal/emails/class-email-seeder-data.php:133
+#: includes/internal/emails/class-email-seeder-data.php:135
 msgid "We missed you this week"
 msgstr ""
 
 #: includes/internal/emails/class-email-patterns.php:174
-#: includes/internal/emails/class-email-seeder-data.php:140
+#: includes/internal/emails/class-email-seeder-data.php:143
 msgid "It has been a month"
 msgstr ""
 
@@ -6684,113 +6245,113 @@ msgstr ""
 msgid "Welcome to Course"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:59
+#: includes/internal/emails/class-email-seeder-data.php:60
 msgid "Quiz Graded - [lesson:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:60
+#: includes/internal/emails/class-email-seeder-data.php:61
 msgid "Quiz Graded"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:65
+#: includes/internal/emails/class-email-seeder-data.php:66
 msgid "You have completed [course:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:71
+#: includes/internal/emails/class-email-seeder-data.php:72
 msgid "[student:displayname] started [course:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:72
+#: includes/internal/emails/class-email-seeder-data.php:73
 msgid "Course Started"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:77
+#: includes/internal/emails/class-email-seeder-data.php:78
 msgid "[student:displayname] completed [course:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:83
+#: includes/internal/emails/class-email-seeder-data.php:84
 msgid "[student:displayname] completed [lesson:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:84
+#: includes/internal/emails/class-email-seeder-data.php:85
 msgid "Lesson Completed"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:89
+#: includes/internal/emails/class-email-seeder-data.php:90
 msgid "[student:displayname] has submitted a quiz"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:90
+#: includes/internal/emails/class-email-seeder-data.php:91
 msgid "Quiz Submitted"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:95
-#: includes/internal/emails/class-email-seeder-data.php:113
+#: includes/internal/emails/class-email-seeder-data.php:96
+#: includes/internal/emails/class-email-seeder-data.php:114
 msgid "[student:displayname] - [subject:displaysubject]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:96
+#: includes/internal/emails/class-email-seeder-data.php:97
 msgid "Student Sent Message"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:101
+#: includes/internal/emails/class-email-seeder-data.php:102
 msgid "New Course Assigned: [course:name]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:102
+#: includes/internal/emails/class-email-seeder-data.php:103
 msgid "Course Assigned"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:107
+#: includes/internal/emails/class-email-seeder-data.php:108
 msgid "[teacher:displayname] - [subject:displaysubject]"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:108
-#: includes/internal/emails/class-email-seeder-data.php:114
+#: includes/internal/emails/class-email-seeder-data.php:109
+#: includes/internal/emails/class-email-seeder-data.php:115
 msgid "Message Reply Received"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:119
+#: includes/internal/emails/class-email-seeder-data.php:120
 msgid "Get ready - [lesson:name] - starts [date:dtext]!"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:120
+#: includes/internal/emails/class-email-seeder-data.php:121
 msgid "Lessons Available (Content Drip)"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:127
+#: includes/internal/emails/class-email-seeder-data.php:128
 msgid "No Progress Reminder - 3 days"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:134
+#: includes/internal/emails/class-email-seeder-data.php:136
 msgid "No Progress Reminder - 7 days"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:141
+#: includes/internal/emails/class-email-seeder-data.php:144
 msgid "No Progress Reminder - 28 days"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:147
+#: includes/internal/emails/class-email-seeder-data.php:151
 msgid "[course:name] expires today!"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:148
+#: includes/internal/emails/class-email-seeder-data.php:152
 msgid "Course Expiration - Today"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:154
+#: includes/internal/emails/class-email-seeder-data.php:158
 msgid "[course:name] expires in 3 days!"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:155
+#: includes/internal/emails/class-email-seeder-data.php:159
 msgid "Course Expiration - in 3 days"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:161
+#: includes/internal/emails/class-email-seeder-data.php:165
 msgid "[course:name] expires in 7 days!"
 msgstr ""
 
-#: includes/internal/emails/class-email-seeder-data.php:162
+#: includes/internal/emails/class-email-seeder-data.php:166
 msgid "Course Expiration - in 7 days"
 msgstr ""
 
@@ -6952,7 +6513,7 @@ msgid "Send an email to all students in a course or a group."
 msgstr ""
 
 #: includes/internal/emails/views/html-settings.php:62
-msgid "MailPoet Settings"
+msgid "MailPoet Lists"
 msgstr ""
 
 #: includes/internal/emails/views/html-settings.php:66
@@ -6961,11 +6522,7 @@ msgstr ""
 
 #: includes/internal/emails/views/html-settings.php:69
 #: includes/internal/emails/views/html-settings.php:96
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:131
 msgid "Learn More"
 msgstr ""
@@ -7041,11 +6598,7 @@ msgstr ""
 
 #: includes/rest-api/class-sensei-rest-api-course-structure-controller.php:287
 #: assets/blocks/course-outline/module-block/module-edit.js:231
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:382
-=======
-#: assets/dist/blocks/single-course.js:335
->>>>>>> 2f9355c58 (Bump version)
 msgid "Module description"
 msgstr ""
 
@@ -7308,12 +6861,12 @@ msgid "The requested theme `%s` could not be installed."
 msgstr ""
 
 #. translators: Placeholders are the hook tag and the version which it was deprecated, respectively.
-#: includes/sensei-functions.php:301
+#: includes/sensei-functions.php:296
 msgid "SENSEI: The hook '%1$s', has been deprecated since '%2$s'."
 msgstr ""
 
 #. translators: Placeholder is the alternative action name.
-#: includes/sensei-functions.php:306
+#: includes/sensei-functions.php:301
 msgid "Please use '%s' instead."
 msgstr ""
 
@@ -7498,8 +7051,8 @@ msgstr ""
 #: templates/single-quiz/question-type-single-line.php:28
 #: assets/blocks/quiz/answer-blocks/multi-line.js:13
 #: assets/blocks/quiz/answer-blocks/single-line.js:16
-#: assets/dist/blocks/quiz/index.js:227
-#: assets/dist/blocks/quiz/index.js:271
+#: assets/dist/blocks/quiz/index.js:261
+#: assets/dist/blocks/quiz/index.js:325
 msgid "Answer:"
 msgstr ""
 
@@ -7617,29 +7170,17 @@ msgid "More Lessons"
 msgstr ""
 
 #: assets/admin/editor-wizard/patterns-list.js:78
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:64
-=======
-#: assets/dist/admin/editor-wizard/index.js:69
->>>>>>> 2f9355c58 (Bump version)
 msgid "Sensei block patterns"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-details-step.js:42
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:72
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
->>>>>>> 2f9355c58 (Bump version)
 msgid "Create your course"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-details-step.js:45
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:72
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
->>>>>>> 2f9355c58 (Bump version)
 msgid "Keep your Course Title short as it will get displayed in different places around your website. You can easily change both later."
 msgstr ""
 
@@ -7648,334 +7189,219 @@ msgstr ""
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:140
 #: assets/course-theme/blocks/lesson-blocks/index.js:45
 #: assets/course-theme/blocks/lesson-blocks/index.js:54
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:72
 #: assets/dist/blocks/single-page.js:225
 #: assets/dist/blocks/single-page.js:267
 #: assets/dist/course-theme/blocks/index.js:255
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
-#: assets/dist/blocks/single-page.js:205
-#: assets/dist/blocks/single-page.js:249
-#: assets/dist/course-theme/blocks/index.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Title"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-details-step.js:60
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:72
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Description"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-details-step.js:71
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:72
-=======
-#: assets/dist/admin/editor-wizard/index.js:79
->>>>>>> 2f9355c58 (Bump version)
 msgid "Illustration of course sample with some placeholders."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-patterns-step.js:38
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:81
-=======
-#: assets/dist/admin/editor-wizard/index.js:89
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Layout"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:32
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:90
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Sell with Sensei Pro"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:35
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:90
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Do you want to sell this course? This requires Sensei Pro which also unlocks many useful features."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:55
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Schedule 'drip' content"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:61
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz timer"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:64
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Flashcards, Image Hotspots, and Checklists"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:70
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "1 year of updates & support"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:77
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:91
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Illustration of a course listing with the pricing defined and with the button \"Purchase Button\""
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/course-upgrade-step.js:117
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:92
-=======
-#: assets/dist/admin/editor-wizard/index.js:99
->>>>>>> 2f9355c58 (Bump version)
 msgid "Continue with Sensei Free"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-details-step.js:32
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:100
-=======
-#: assets/dist/admin/editor-wizard/index.js:109
->>>>>>> 2f9355c58 (Bump version)
 msgid "Create your lesson"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-details-step.js:35
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:100
-=======
-#: assets/dist/admin/editor-wizard/index.js:109
->>>>>>> 2f9355c58 (Bump version)
 msgid "It is best to keep your Lesson Title short because it will show in your course outline and navigation. You can easily change both later."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-details-step.js:43
-#: assets/course-theme/blocks/lesson-blocks/index.js:215
-<<<<<<< HEAD
+#: assets/course-theme/blocks/lesson-blocks/index.js:219
 #: assets/dist/admin/editor-wizard/index.js:100
 #: assets/dist/course-theme/blocks/index.js:255
-=======
-#: assets/dist/admin/editor-wizard/index.js:109
-#: assets/dist/course-theme/blocks/index.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lesson Title"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-details-step.js:54
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:100
-=======
-#: assets/dist/admin/editor-wizard/index.js:109
->>>>>>> 2f9355c58 (Bump version)
 msgid "Illustration of lesson sample with some placeholders."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-patterns-step.js:32
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:122
-=======
-#: assets/dist/admin/editor-wizard/index.js:119
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lesson Type"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-patterns-step.js:51
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:122
-=======
-#: assets/dist/admin/editor-wizard/index.js:119
->>>>>>> 2f9355c58 (Bump version)
 msgid "Want More Lesson Types?"
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-patterns-step.js:54
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:122
-=======
-#: assets/dist/admin/editor-wizard/index.js:119
->>>>>>> 2f9355c58 (Bump version)
 msgid "Get flashcards, timed quizzes, image hotspots, and more with Sensei Pro."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/lesson-patterns-step.js:64
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:122
-=======
-#: assets/dist/admin/editor-wizard/index.js:119
->>>>>>> 2f9355c58 (Bump version)
 msgid "Learn more."
 msgstr ""
 
 #: assets/admin/editor-wizard/steps/patterns-step.js:80
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:133
-=======
-#: assets/dist/admin/editor-wizard/index.js:129
->>>>>>> 2f9355c58 (Bump version)
 msgid "Start with default layout"
 msgstr ""
 
 #. translators: %1$d Current step number, %2$d Number of steps.
 #: assets/admin/editor-wizard/wizard.js:52
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:157
-=======
-#: assets/dist/admin/editor-wizard/index.js:149
->>>>>>> 2f9355c58 (Bump version)
 msgid "Step %1$d of %2$d"
 msgstr ""
 
 #: assets/admin/exit-survey/form.js:63
-#: assets/dist/admin/exit-survey/index.js:29
+#: assets/dist/admin/exit-survey/index.js:17
 msgid "Quick Feedback"
 msgstr ""
 
 #: assets/admin/exit-survey/form.js:65
-#: assets/dist/admin/exit-survey/index.js:29
+#: assets/dist/admin/exit-survey/index.js:17
 msgid "If you have a moment, please let us know why you are deactivating so that we can work to improve our product."
 msgstr ""
 
 #: assets/admin/exit-survey/form.js:80
-#: assets/dist/admin/exit-survey/index.js:29
+#: assets/dist/admin/exit-survey/index.js:17
 msgid "Submit Feedback"
 msgstr ""
 
 #: assets/admin/exit-survey/form.js:87
-#: assets/dist/admin/exit-survey/index.js:29
+#: assets/dist/admin/exit-survey/index.js:17
 msgid "Skip Feedback"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:12
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "I no longer need the plugin"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:16
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "The plugin isn't working"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:17
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "What isn't working properly?"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:21
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "I'm looking for different functionality"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:22
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "What functionality is missing?"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:26
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "I found a better plugin"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:27
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "What's the name of the plugin?"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:31
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "It's a temporary deactivation"
 msgstr ""
 
 #: assets/admin/exit-survey/reasons.js:36
-#: assets/dist/admin/exit-survey/index.js:49
+#: assets/dist/admin/exit-survey/index.js:25
 msgid "Why are you deactivating?"
 msgstr ""
 
 #: assets/admin/students/student-action-menu/index.js:116
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:274
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:62
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select an action"
 msgstr ""
 
 #: assets/admin/students/student-bulk-action-button/index.js:137
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-bulk-action-button/index.js:260
-=======
-#: assets/dist/admin/students/student-bulk-action-button/index.js:51
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select Action"
 msgstr ""
 
 #: assets/admin/students/student-modal/course-list.js:135
-#: assets/dist/admin/students/student-action-menu/index.js:73
-#: assets/dist/admin/students/student-bulk-action-button/index.js:62
+#: assets/dist/admin/students/student-action-menu/index.js:61
+#: assets/dist/admin/students/student-bulk-action-button/index.js:47
 msgid "Your Courses"
 msgstr ""
 
 #. Translators: placeholder is the number of selected students.
 #: assets/admin/students/student-modal/index.js:27
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:72
 #: assets/dist/admin/students/student-bulk-action-button/index.js:58
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to add <strong>%d students</strong> to:"
 msgstr ""
 
 #. Translators: placeholder is the student's name.
 #: assets/admin/students/student-modal/index.js:35
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:73
 #: assets/dist/admin/students/student-bulk-action-button/index.js:59
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to add <strong>%s</strong> to:"
 msgstr ""
 
 #: assets/admin/students/student-modal/index.js:43
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:73
 #: assets/dist/admin/students/student-bulk-action-button/index.js:59
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Unable to add student. Please try again."
 msgid_plural "Unable to add students. Please try again."
 msgstr[0] ""
@@ -7983,36 +7409,21 @@ msgstr[1] ""
 
 #. Translators: placeholder is the number of selected students.
 #: assets/admin/students/student-modal/index.js:63
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:74
 #: assets/dist/admin/students/student-bulk-action-button/index.js:60
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to remove <strong>%d students</strong> from:"
 msgstr ""
 
 #. Translators: placeholder is the student's name.
 #: assets/admin/students/student-modal/index.js:71
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:75
 #: assets/dist/admin/students/student-bulk-action-button/index.js:61
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to remove <strong>%s</strong> from:"
 msgstr ""
 
 #: assets/admin/students/student-modal/index.js:79
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:75
 #: assets/dist/admin/students/student-bulk-action-button/index.js:61
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Unable to remove student. Please try again."
 msgid_plural "Unable to remove students. Please try again."
 msgstr[0] ""
@@ -8020,136 +7431,84 @@ msgstr[1] ""
 
 #. Translators: placeholder is the number of selected students.
 #: assets/admin/students/student-modal/index.js:100
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:78
 #: assets/dist/admin/students/student-bulk-action-button/index.js:64
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to reset progress from for <strong>%d students</strong>:"
 msgstr ""
 
 #. Translators: placeholder is the student's name.
 #: assets/admin/students/student-modal/index.js:108
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:79
 #: assets/dist/admin/students/student-bulk-action-button/index.js:65
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Select the course(s) you would like to reset progress from for <strong>%s</strong>:"
 msgstr ""
 
 #: assets/admin/students/student-modal/index.js:116
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:79
 #: assets/dist/admin/students/student-bulk-action-button/index.js:65
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Unable to reset progress for this student. Please try again."
 msgid_plural "Unable to reset progress for these students. Please try again."
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/admin/students/student-modal/index.js:187
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:79
 #: assets/dist/admin/students/student-bulk-action-button/index.js:65
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Choose Course"
 msgstr ""
 
 #: assets/admin/students/student-modal/index.js:195
-<<<<<<< HEAD
 #: assets/dist/admin/students/student-action-menu/index.js:79
 #: assets/dist/admin/students/student-bulk-action-button/index.js:65
-=======
-#: assets/dist/admin/students/student-action-menu/index.js:84
-#: assets/dist/admin/students/student-bulk-action-button/index.js:73
->>>>>>> 2f9355c58 (Bump version)
 msgid "Search courses"
 msgstr ""
 
 #: assets/blocks/button/button-edit.js:36
-#: assets/dist/blocks/global-blocks.js:128
-#: assets/dist/blocks/shared.js:84
-#: assets/dist/blocks/single-lesson.js:84
-#: assets/dist/blocks/single-page.js:117
+#: assets/dist/blocks/global-blocks.js:125
+#: assets/dist/blocks/shared.js:77
+#: assets/dist/blocks/single-lesson.js:77
+#: assets/dist/blocks/single-page.js:129
 msgid "Add text…"
 msgstr ""
 
 #: assets/blocks/button/button-settings.js:24
 #: assets/blocks/course-outline/module-block/module-settings.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:174
 #: assets/dist/blocks/shared.js:126
 #: assets/dist/blocks/single-course.js:391
 #: assets/dist/blocks/single-lesson.js:126
 #: assets/dist/blocks/single-page.js:178
-=======
-#: assets/dist/blocks/global-blocks.js:161
-#: assets/dist/blocks/shared.js:117
-#: assets/dist/blocks/single-course.js:346
-#: assets/dist/blocks/single-lesson.js:117
-#: assets/dist/blocks/single-page.js:150
->>>>>>> 2f9355c58 (Bump version)
 msgid "Border settings"
 msgstr ""
 
 #: assets/blocks/button/button-settings.js:28
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:174
 #: assets/dist/blocks/global-blocks.js:694
 #: assets/dist/blocks/shared.js:126
 #: assets/dist/blocks/single-lesson.js:126
 #: assets/dist/blocks/single-page.js:178
 #: assets/dist/blocks/single-page.js:346
-=======
-#: assets/dist/blocks/global-blocks.js:161
-#: assets/dist/blocks/global-blocks.js:546
-#: assets/dist/blocks/quiz/index.js:876
-#: assets/dist/blocks/shared.js:117
-#: assets/dist/blocks/single-lesson.js:117
-#: assets/dist/blocks/single-page.js:150
-#: assets/dist/blocks/single-page.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/blocks/progress-bar/progress-bar-settings.js:39
 msgid "Border radius"
 msgstr ""
 
 #: assets/blocks/button/button-settings.js:55
-#: assets/dist/blocks/global-blocks.js:161
-#: assets/dist/blocks/shared.js:117
-#: assets/dist/blocks/single-lesson.js:117
-#: assets/dist/blocks/single-page.js:150
+#: assets/dist/blocks/global-blocks.js:176
+#: assets/dist/blocks/shared.js:128
+#: assets/dist/blocks/single-lesson.js:128
+#: assets/dist/blocks/single-page.js:180
 msgid "Change button alignment"
 msgstr ""
 
 #: assets/blocks/button/color-hooks.js:43
 #: assets/blocks/course-categories-block/course-categories-edit.js:135
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:123
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:182
 #: assets/dist/blocks/global-blocks.js:297
 #: assets/dist/blocks/shared.js:134
 #: assets/dist/blocks/single-course.js:328
 #: assets/dist/blocks/single-lesson.js:134
 #: assets/dist/blocks/single-page.js:186
-=======
-#: assets/dist/blocks/global-blocks.js:172
-#: assets/dist/blocks/global-blocks.js:293
-#: assets/dist/blocks/shared.js:128
-#: assets/dist/blocks/single-course.js:291
-#: assets/dist/blocks/single-lesson.js:128
-#: assets/dist/blocks/single-page.js:161
->>>>>>> 2f9355c58 (Bump version)
 msgid "Background color"
 msgstr ""
 
@@ -8158,7 +7517,6 @@ msgstr ""
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:127
 #: assets/blocks/course-outline/module-block/module-edit.js:259
 #: assets/blocks/course-progress-block/course-progress-edit.js:131
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:182
 #: assets/dist/blocks/global-blocks.js:297
 #: assets/dist/blocks/global-blocks.js:596
@@ -8167,76 +7525,38 @@ msgstr ""
 #: assets/dist/blocks/single-course.js:370
 #: assets/dist/blocks/single-lesson.js:134
 #: assets/dist/blocks/single-page.js:186
-=======
-#: assets/dist/blocks/global-blocks.js:172
-#: assets/dist/blocks/global-blocks.js:293
-#: assets/dist/blocks/global-blocks.js:447
-#: assets/dist/blocks/shared.js:128
-#: assets/dist/blocks/single-course.js:291
-#: assets/dist/blocks/single-course.js:335
-#: assets/dist/blocks/single-lesson.js:128
-#: assets/dist/blocks/single-page.js:161
->>>>>>> 2f9355c58 (Bump version)
 msgid "Text color"
 msgstr ""
 
 #: assets/blocks/button/index.js:29
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:201
 #: assets/dist/blocks/shared.js:153
 #: assets/dist/blocks/single-lesson.js:153
 #: assets/dist/blocks/single-page.js:205
-=======
-#: assets/dist/blocks/global-blocks.js:194
-#: assets/dist/blocks/shared.js:150
-#: assets/dist/blocks/single-lesson.js:150
-#: assets/dist/blocks/single-page.js:183
->>>>>>> 2f9355c58 (Bump version)
 msgid "Fill"
 msgstr ""
 
 #: assets/blocks/button/index.js:33
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:201
 #: assets/dist/blocks/shared.js:153
 #: assets/dist/blocks/single-lesson.js:153
 #: assets/dist/blocks/single-page.js:205
-=======
-#: assets/dist/blocks/global-blocks.js:194
-#: assets/dist/blocks/shared.js:150
-#: assets/dist/blocks/single-lesson.js:150
-#: assets/dist/blocks/single-page.js:183
->>>>>>> 2f9355c58 (Bump version)
 msgid "Outline"
 msgstr ""
 
 #: assets/blocks/button/index.js:37
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:201
 #: assets/dist/blocks/shared.js:153
 #: assets/dist/blocks/single-lesson.js:153
 #: assets/dist/blocks/single-page.js:205
-=======
-#: assets/dist/blocks/global-blocks.js:194
-#: assets/dist/blocks/shared.js:150
-#: assets/dist/blocks/single-lesson.js:150
-#: assets/dist/blocks/single-page.js:183
->>>>>>> 2f9355c58 (Bump version)
 msgid "Link"
 msgstr ""
 
 #: assets/blocks/button/index.js:145
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:201
 #: assets/dist/blocks/shared.js:153
 #: assets/dist/blocks/single-lesson.js:153
 #: assets/dist/blocks/single-page.js:205
-=======
-#: assets/dist/blocks/global-blocks.js:194
-#: assets/dist/blocks/shared.js:150
-#: assets/dist/blocks/single-lesson.js:150
-#: assets/dist/blocks/single-page.js:183
->>>>>>> 2f9355c58 (Bump version)
 msgid "This block can only be used inside the Course List block."
 msgstr ""
 
@@ -8251,29 +7571,17 @@ msgid "Remove condition"
 msgstr ""
 
 #: assets/blocks/contact-teacher-block/index.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/shared.js:211
-=======
-#: assets/dist/blocks/shared.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a registered user to contact the teacher. This block is only displayed if the user is logged in and private messaging is enabled."
 msgstr ""
 
 #: assets/blocks/course-actions-block/continue-course/index.js:21
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:217
-=======
-#: assets/dist/blocks/global-blocks.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Continue Course"
 msgstr ""
 
 #: assets/blocks/course-actions-block/continue-course/index.js:22
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:217
-=======
-#: assets/dist/blocks/global-blocks.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to pick up where they left off in a course."
 msgstr ""
 
@@ -8282,581 +7590,348 @@ msgstr ""
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:27
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:29
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:217
 #: assets/dist/blocks/single-lesson.js:202
 #: assets/dist/blocks/single-lesson.js:329
 #: assets/dist/blocks/single-lesson.js:341
 #: assets/dist/blocks/single-lesson.js:353
-=======
-#: assets/dist/blocks/global-blocks.js:205
-#: assets/dist/blocks/single-lesson.js:205
-#: assets/dist/blocks/single-lesson.js:326
-#: assets/dist/blocks/single-lesson.js:337
-#: assets/dist/blocks/single-lesson.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "Button"
 msgstr ""
 
 #: assets/blocks/course-actions-block/course-actions/course-actions-edit.js:120
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:226
-=======
-#: assets/dist/blocks/global-blocks.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course Actions block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/course-categories-block/course-categories-edit.js:102
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:305
-=======
-#: assets/dist/blocks/global-blocks.js:293
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course Categories block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/course-categories-block/index.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:333
-=======
-#: assets/dist/blocks/global-blocks.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Music"
 msgstr ""
 
 #: assets/blocks/course-categories-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:333
-=======
-#: assets/dist/blocks/global-blocks.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Movies"
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:16
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Completed Actions"
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:17
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Prompt students to take action after completing a course."
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Actions"
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:26
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Buttons"
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:28
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "View Certificate"
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:44
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Prompt students to find more courses."
 msgstr ""
 
 #: assets/blocks/course-completed-actions/index.js:50
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:213
-=======
-#: assets/dist/blocks/single-page.js:194
->>>>>>> 2f9355c58 (Bump version)
 msgid "Archive"
 msgstr ""
 
 #: assets/blocks/course-list-block/hooks.js:88
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:60
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:357
 #: assets/dist/blocks/shared.js:227
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/global-blocks.js:359
-#: assets/dist/blocks/shared.js:227
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Grid view"
 msgstr ""
 
 #: assets/blocks/course-list-block/index.js:37
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:369
 #: assets/dist/blocks/shared.js:239
-=======
-#: assets/dist/blocks/global-blocks.js:370
-#: assets/dist/blocks/shared.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Show a list of courses."
 msgstr ""
 
 #: assets/blocks/course-list-block/index.js:42
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:369
 #: assets/dist/blocks/shared.js:239
-=======
-#: assets/dist/blocks/global-blocks.js:370
-#: assets/dist/blocks/shared.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "List"
 msgstr ""
 
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:59
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
-=======
-#: assets/dist/blocks/global-blocks.js:381
->>>>>>> 2f9355c58 (Bump version)
 msgid "Student Courses"
 msgstr ""
 
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:118
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
-=======
-#: assets/dist/blocks/global-blocks.js:381
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course List Filter block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/course-list-filter-block/course-list-filter-edit.js:129
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:408
-=======
-#: assets/dist/blocks/global-blocks.js:381
->>>>>>> 2f9355c58 (Bump version)
 msgid "Filter Type"
 msgstr ""
 
 #. translators: Error message.
 #: assets/blocks/course-outline/course-outline-store.js:69
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:259
-=======
-#: assets/dist/blocks/single-course.js:236
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course modules and lessons could not be updated. %s"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:303
-=======
-#: assets/dist/blocks/single-course.js:269
->>>>>>> 2f9355c58 (Bump version)
 msgid "Start learning"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-edit-toolbar.js:35
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:311
-=======
-#: assets/dist/blocks/single-course.js:280
->>>>>>> 2f9355c58 (Bump version)
 msgid "Edit lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-edit-toolbar.js:67
-#: assets/dist/blocks/single-course.js:280
+#: assets/dist/blocks/single-course.js:317
 msgid "Save to edit lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:60
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:333
-=======
-#: assets/dist/blocks/single-course.js:291
->>>>>>> 2f9355c58 (Bump version)
 msgid "Unsaved"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:62
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:333
-=======
-#: assets/dist/blocks/single-course.js:291
->>>>>>> 2f9355c58 (Bump version)
 msgid "Draft"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-edit.js:92
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:333
-=======
-#: assets/dist/blocks/single-course.js:291
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add Lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-settings.js:45
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:342
-=======
-#: assets/dist/blocks/single-course.js:302
->>>>>>> 2f9355c58 (Bump version)
 msgid "Edit details such as lesson content, prerequisite, quiz settings and more."
 msgstr ""
 
 #: assets/blocks/course-outline/lesson-block/lesson-settings.js:52
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:342
-=======
-#: assets/dist/blocks/single-course.js:302
->>>>>>> 2f9355c58 (Bump version)
 msgid "Typography"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/index.js:22
 #: assets/blocks/course-outline/outline-block/index.js:37
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:360
 #: assets/dist/blocks/single-course.js:429
-=======
-#: assets/dist/blocks/single-course.js:324
-#: assets/dist/blocks/single-course.js:379
->>>>>>> 2f9355c58 (Bump version)
 msgid "About Module"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/index.js:39
 #: assets/blocks/course-outline/outline-block/index.js:20
 #: assets/blocks/course-results-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:360
 #: assets/dist/blocks/single-course.js:429
 #: assets/dist/blocks/single-page.js:243
-=======
-#: assets/dist/blocks/single-course.js:324
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/blocks/single-page.js:227
->>>>>>> 2f9355c58 (Bump version)
 msgid "Filled"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/index.js:44
 #: assets/blocks/course-outline/outline-block/index.js:25
 #: assets/blocks/course-results-block/index.js:24
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:360
 #: assets/dist/blocks/single-course.js:429
 #: assets/dist/blocks/single-page.js:243
-=======
-#: assets/dist/blocks/single-course.js:324
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/blocks/single-page.js:227
->>>>>>> 2f9355c58 (Bump version)
 msgid "Minimal"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-edit.js:190
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:382
-=======
-#: assets/dist/blocks/single-course.js:335
->>>>>>> 2f9355c58 (Bump version)
 msgid "Module name"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-edit.js:216
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:382
-=======
-#: assets/dist/blocks/single-course.js:335
->>>>>>> 2f9355c58 (Bump version)
 msgid "Toggle module content"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-edit.js:257
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:370
-=======
-#: assets/dist/blocks/single-course.js:335
->>>>>>> 2f9355c58 (Bump version)
 msgid "Main color"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-edit.js:262
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:370
-=======
-#: assets/dist/blocks/single-course.js:335
->>>>>>> 2f9355c58 (Bump version)
 msgid "Border color"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-settings.js:31
 #: assets/blocks/course-outline/outline-block/outline-settings.js:43
 #: assets/blocks/course-results-block/course-results-settings.js:30
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:391
 #: assets/dist/blocks/single-course.js:475
 #: assets/dist/blocks/single-page.js:234
-=======
-#: assets/dist/blocks/single-course.js:346
-#: assets/dist/blocks/single-course.js:434
-#: assets/dist/blocks/single-page.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Border"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-settings.js:32
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:391
-=======
-#: assets/dist/blocks/single-course.js:346
->>>>>>> 2f9355c58 (Bump version)
 msgid "Toggle to enable the border."
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-settings.js:36
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:391
-=======
-#: assets/dist/blocks/single-course.js:346
->>>>>>> 2f9355c58 (Bump version)
 msgid "Custom slug"
 msgstr ""
 
 #: assets/blocks/course-outline/module-block/module-settings.js:41
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:391
-=======
-#: assets/dist/blocks/single-course.js:346
->>>>>>> 2f9355c58 (Bump version)
 msgid "Optional, keep empty for default"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/index.js:54
 #: assets/course-theme/blocks/course-navigation/index.js:34
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:429
 #: assets/dist/course-theme/blocks/index.js:241
-=======
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/course-theme/blocks/index.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "First Lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/index.js:63
 #: assets/course-theme/blocks/course-navigation/index.js:38
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:429
 #: assets/dist/course-theme/blocks/index.js:241
-=======
-#: assets/dist/blocks/single-course.js:379
-#: assets/dist/course-theme/blocks/index.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "Second Lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-appender.js:55
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:438
-=======
-#: assets/dist/blocks/single-course.js:390
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add Module or Lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-placeholder.js:21
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:457
-=======
-#: assets/dist/blocks/single-course.js:412
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Outline"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-placeholder.js:23
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:457
-=======
-#: assets/dist/blocks/single-course.js:412
->>>>>>> 2f9355c58 (Bump version)
 msgid "Build and display a course outline. A course is made up of modules (optional) and lessons. You can use modules to group related lessons together."
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-placeholder.js:33
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:457
-=======
-#: assets/dist/blocks/single-course.js:412
->>>>>>> 2f9355c58 (Bump version)
 msgid "Create a module"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-placeholder.js:40
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:457
-=======
-#: assets/dist/blocks/single-course.js:412
->>>>>>> 2f9355c58 (Bump version)
 msgid "Create a lesson"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-settings.js:34
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:475
-=======
-#: assets/dist/blocks/single-course.js:434
->>>>>>> 2f9355c58 (Bump version)
 msgid "Collapsible modules"
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-settings.js:35
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:475
-=======
-#: assets/dist/blocks/single-course.js:434
->>>>>>> 2f9355c58 (Bump version)
 msgid "Modules can be collapsed or expanded."
 msgstr ""
 
 #: assets/blocks/course-outline/outline-block/outline-settings.js:44
 #: assets/blocks/course-results-block/course-results-settings.js:31
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:475
 #: assets/dist/blocks/single-page.js:234
-=======
-#: assets/dist/blocks/single-course.js:434
-#: assets/dist/blocks/single-page.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Toggle the border for all modules."
 msgstr ""
 
 #: assets/blocks/course-outline/status-preview/status-control/index.js:45
-<<<<<<< HEAD
 #: assets/dist/blocks/single-course.js:501
-=======
-#: assets/dist/blocks/single-course.js:467
->>>>>>> 2f9355c58 (Bump version)
 msgid "Preview a status. The actual status that the student sees is determined by their progress in the course."
 msgstr ""
 
 #: assets/blocks/course-overview-block/course-overview-edit.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:571
-=======
-#: assets/dist/blocks/global-blocks.js:425
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course Overview block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/course-progress-block/course-progress-edit.js:85
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:596
-=======
-#: assets/dist/blocks/global-blocks.js:447
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course Progress block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/course-progress-block/course-progress-edit.js:102
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:168
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:596
 #: assets/dist/blocks/single-page.js:267
-=======
-#: assets/dist/blocks/global-blocks.js:447
-#: assets/dist/blocks/single-page.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "lessons"
 msgstr ""
 
 #: assets/blocks/course-progress-block/course-progress-edit.js:123
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:297
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:596
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/global-blocks.js:447
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Progress bar color"
 msgstr ""
 
 #: assets/blocks/course-progress-block/course-progress-edit.js:127
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:306
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:596
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/global-blocks.js:447
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Progress bar background color"
 msgstr ""
 
 #. translators: Mock lesson number.
 #: assets/blocks/course-results-block/course-results-edit.js:36
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:223
 msgid "Lesson %s"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:148
 #: assets/course-theme/blocks/course-navigation/index.js:31
-#: assets/dist/blocks/single-page.js:205
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/blocks/single-page.js:225
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Module A"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:154
 #: assets/course-theme/blocks/course-navigation/index.js:55
-#: assets/dist/blocks/single-page.js:205
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/blocks/single-page.js:225
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Module B"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:160
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:225
 msgid "Module C"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:175
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:225
 msgid "Module color"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:179
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:225
 msgid "Module text color"
 msgstr ""
 
 #: assets/blocks/course-results-block/course-results-edit.js:183
-#: assets/dist/blocks/single-page.js:205
+#: assets/dist/blocks/single-page.js:225
 msgid "Module border color"
 msgstr ""
 
@@ -8866,119 +7941,69 @@ msgstr ""
 
 #. translators: %1$d number of characters introduced, %2$d number of total characters allowed.
 #: assets/blocks/editor-components/limited-text-control/index.js:27
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:167
-=======
-#: assets/dist/admin/editor-wizard/index.js:159
->>>>>>> 2f9355c58 (Bump version)
 msgid "Characters: %1$d/%2$d"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:146
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:267
-=======
-#: assets/dist/blocks/single-page.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "Category Name"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-edit.js:152
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:267
-=======
-#: assets/dist/blocks/single-page.js:249
->>>>>>> 2f9355c58 (Bump version)
 msgid "This is a preview of the course description…"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:36
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Featured image"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:44
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
 #: assets/dist/setup-wizard/index.js:338
-=======
-#: assets/dist/blocks/single-page.js:260
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:149
 msgid "Description"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:48
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Progress bar"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:55
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "List view"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:68
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Primary color"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:73
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Accent color"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:82
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course settings"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:101
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Styling"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:106
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:276
-=======
-#: assets/dist/blocks/single-page.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Layout"
 msgstr ""
 
 #: assets/blocks/learner-courses-block/learner-courses-settings.js:138
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:275
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:714
 #: assets/dist/blocks/quiz/index.js:855
 #: assets/dist/blocks/shared.js:309
@@ -8986,2220 +8011,1423 @@ msgstr ""
 #: assets/dist/blocks/single-lesson.js:417
 #: assets/dist/blocks/single-page.js:276
 #: assets/dist/blocks/single-page.js:366
-=======
-#: assets/dist/blocks/global-blocks.js:568
-#: assets/dist/blocks/quiz/index.js:744
-#: assets/dist/blocks/shared.js:293
-#: assets/dist/blocks/single-course.js:544
-#: assets/dist/blocks/single-lesson.js:425
-#: assets/dist/blocks/single-page.js:260
-#: assets/dist/blocks/single-page.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/blocks/settings.js:82
 msgid "Color settings"
 msgstr ""
 
 #: assets/blocks/learner-messages-button-block/index.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:288
-=======
-#: assets/dist/blocks/single-page.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to view their messages. This block is only displayed if the student is logged in and private messaging is enabled."
 msgstr ""
 
 #: assets/blocks/learner-messages-button-block/index.js:29
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:288
-=======
-#: assets/dist/blocks/single-page.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Student Messages Button"
 msgstr ""
 
 #: assets/blocks/learner-messages-button-block/messages-disabled-notice.js:33
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:297
-=======
-#: assets/dist/blocks/single-page.js:282
->>>>>>> 2f9355c58 (Bump version)
 msgid "You have added the \"Student Messages Button\" block to your editor, but messages are disabled in your settings."
 msgstr ""
 
 #: assets/blocks/learner-messages-button-block/messages-disabled-notice.js:42
-<<<<<<< HEAD
 #: assets/dist/blocks/single-page.js:297
-=======
-#: assets/dist/blocks/single-page.js:282
->>>>>>> 2f9355c58 (Bump version)
 msgid "Go to disabled messages setting"
 msgstr ""
 
 #: assets/blocks/lesson-actions/complete-lesson-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:202
-=======
-#: assets/dist/blocks/single-lesson.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to mark the lesson as complete. This block is only displayed if the lesson has no quiz or the quiz is optional."
 msgstr ""
 
 #: assets/blocks/lesson-actions/complete-lesson-block/index.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:202
-=======
-#: assets/dist/blocks/single-lesson.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Finish"
 msgstr ""
 
 #: assets/blocks/lesson-actions/lesson-actions-block/lesson-actions-settings.js:48
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:270
-=======
-#: assets/dist/blocks/single-lesson.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Preview lesson state"
 msgstr ""
 
 #: assets/blocks/lesson-actions/lesson-actions-block/lesson-actions-settings.js:55
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:270
-=======
-#: assets/dist/blocks/single-lesson.js:271
->>>>>>> 2f9355c58 (Bump version)
 msgid "Additional Actions"
 msgstr ""
 
 #: assets/blocks/lesson-actions/next-lesson-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:329
-=======
-#: assets/dist/blocks/single-lesson.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to move to the next lesson. This block is only displayed if the current lesson has been completed."
 msgstr ""
 
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to reset their progress. This block is only displayed if the lesson is completed and has no quiz, or the quiz is completed and retakes are enabled."
 msgstr ""
 
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Restart"
 msgstr ""
 
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:26
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Revert"
 msgstr ""
 
 #: assets/blocks/lesson-actions/reset-lesson-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:341
-=======
-#: assets/dist/blocks/single-lesson.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Progress"
 msgstr ""
 
 #: assets/blocks/lesson-actions/view-quiz-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:353
-=======
-#: assets/dist/blocks/single-lesson.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to view the quiz."
 msgstr ""
 
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:45
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:382
 #: assets/dist/course-theme/blocks/index.js:234
-=======
-#: assets/dist/blocks/single-lesson.js:381
-#: assets/dist/course-theme/blocks/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Properties"
 msgstr ""
 
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:58
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:105
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:382
 #: assets/dist/course-theme/blocks/index.js:234
-=======
-#: assets/dist/blocks/single-lesson.js:381
-#: assets/dist/course-theme/blocks/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/lesson-properties/lesson-properties-edit.js:88
-<<<<<<< HEAD
 #: assets/dist/blocks/single-lesson.js:382
 #: assets/dist/course-theme/blocks/index.js:234
-=======
-#: assets/dist/blocks/single-lesson.js:381
-#: assets/dist/course-theme/blocks/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 msgid "Since Learning Mode is activated, use this block to add the properties to each lesson and make sure your Lesson template contains the Lesson Properties block."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/file-upload.js:13
-#: assets/dist/blocks/quiz/index.js:194
+#: assets/dist/blocks/quiz/index.js:204
 msgid "Browse…"
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/gap-fill.js:41
-#: assets/dist/blocks/quiz/index.js:205
+#: assets/dist/blocks/quiz/index.js:211
 msgid "Text before the gap"
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/gap-fill.js:64
-#: assets/dist/blocks/quiz/index.js:205
+#: assets/dist/blocks/quiz/index.js:211
 msgid "Add right answers. Separate with commas or the Enter key."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/gap-fill.js:74
-#: assets/dist/blocks/quiz/index.js:205
+#: assets/dist/blocks/quiz/index.js:211
 msgid "Text after the gap"
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:40
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Select from a list of options."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:61
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Add at least one right and one wrong answer."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:65
 #: assets/blocks/quiz/answer-blocks/index.js:112
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Add a right answer to this question."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:69
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "The value of the right answer can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:73
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Add a wrong answer to this question. Value can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:77
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "The value of the wrong answer can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:85
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Select whether a statement is true or false."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:96
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Fill in the blank."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:113
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "The value of a right answer can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:117
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Add text before or after the gap. Value can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:121
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Value of the text before or after the gap can not be blank space."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:129
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Short answer to an open-ended question."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:139
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Long answer to an open-ended question."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/index.js:149
-#: assets/dist/blocks/quiz/index.js:216
+#: assets/dist/blocks/quiz/index.js:237
 msgid "Upload a file or document."
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/multiple-choice-answer-option.js:54
-#: assets/dist/blocks/quiz/index.js:238
+#: assets/dist/blocks/quiz/index.js:270
 msgid "Add Answer"
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/multiple-choice-answer-option.js:69
 #: assets/blocks/quiz/answer-blocks/true-false.js:53
-#: assets/dist/blocks/quiz/index.js:238
-#: assets/dist/blocks/quiz/index.js:282
+#: assets/dist/blocks/quiz/index.js:270
+#: assets/dist/blocks/quiz/index.js:332
 msgid "Right"
 msgstr ""
 
 #: assets/blocks/quiz/answer-blocks/multiple-choice-answer-option.js:70
 #: assets/blocks/quiz/answer-blocks/true-false.js:55
-#: assets/dist/blocks/quiz/index.js:238
-#: assets/dist/blocks/quiz/index.js:282
+#: assets/dist/blocks/quiz/index.js:270
+#: assets/dist/blocks/quiz/index.js:332
 msgid "Wrong"
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback-toggle.js:50
-#: assets/dist/blocks/quiz/index.js:293
+#: assets/dist/blocks/quiz/index.js:349
 msgid "Show feedback once the question is answered."
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback.js:20
-#: assets/dist/blocks/quiz/index.js:304
+#: assets/dist/blocks/quiz/index.js:357
 msgid "Show a message when the question is answered correctly. Type / to choose a block."
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/answer-feedback.js:27
-#: assets/dist/blocks/quiz/index.js:304
+#: assets/dist/blocks/quiz/index.js:357
 msgid "Show a message when the question is answered incorrectly. Type / to choose a block."
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/index.js:32
-#: assets/dist/blocks/quiz/index.js:315
+#: assets/dist/blocks/quiz/index.js:367
 msgid "Correct Answer Feedback"
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/index.js:34
-#: assets/dist/blocks/quiz/index.js:315
+#: assets/dist/blocks/quiz/index.js:367
 msgid "Display correct answer feedback."
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/index.js:45
-#: assets/dist/blocks/quiz/index.js:315
+#: assets/dist/blocks/quiz/index.js:367
 msgid "Incorrect Answer Feedback"
 msgstr ""
 
 #: assets/blocks/quiz/answer-feedback-block/index.js:47
-#: assets/dist/blocks/quiz/index.js:315
+#: assets/dist/blocks/quiz/index.js:367
 msgid "Display incorrect answer feedback."
 msgstr ""
 
 #: assets/blocks/quiz/category-question-block/category-question-edit.js:75
-#: assets/dist/blocks/quiz/index.js:326
+#: assets/dist/blocks/quiz/index.js:377
 msgid "Category Question"
 msgstr ""
 
 #. translators: placeholder is number of questions to show from category.
 #: assets/blocks/quiz/category-question-block/category-question-edit.js:82
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:378
-=======
-#: assets/dist/blocks/quiz/index.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "%d question"
 msgid_plural "%d questions"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:101
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:387
-=======
-#: assets/dist/blocks/quiz/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "Category Question Settings"
 msgstr ""
 
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:106
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:387
-=======
-#: assets/dist/blocks/quiz/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "No question categories exist."
 msgstr ""
 
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:134
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:53
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:241
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:387
 #: assets/dist/blocks/quiz/index.js:777
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:337
-#: assets/dist/blocks/quiz/index.js:656
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Number of Questions"
 msgstr ""
 
 #. translators: The underlying error message.
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:149
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:388
-=======
-#: assets/dist/blocks/quiz/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "An error occurred while retrieving questions: %s"
 msgstr ""
 
 #. translators: Placeholder is number of questions in category.
 #: assets/blocks/quiz/category-question-block/category-question-settings.js:166
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:389
-=======
-#: assets/dist/blocks/quiz/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 msgid "The selected category has %d question."
 msgid_plural "The selected category has %d questions."
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/category-question-block/index.js:24
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:418
-=======
-#: assets/dist/blocks/quiz/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 msgid "Example Category"
 msgstr ""
 
 #: assets/blocks/quiz/category-question-block/index.js:30
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:418
-=======
-#: assets/dist/blocks/quiz/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 msgid "Assign a category to this question."
 msgstr ""
 
 #: assets/blocks/quiz/ordering-promo/index.js:13
 #: assets/blocks/quiz/ordering-promo/index.js:18
-#: assets/dist/blocks/quiz/ordering-promo/index.js:19
+#: assets/dist/blocks/quiz/ordering-promo/index.js:63
 msgid "Ordering"
 msgstr ""
 
 #: assets/blocks/quiz/ordering-promo/index.js:14
-#: assets/dist/blocks/quiz/ordering-promo/index.js:19
+#: assets/dist/blocks/quiz/ordering-promo/index.js:63
 msgid "Place the answers in the correct order."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:553
-=======
-#: assets/dist/blocks/quiz/index.js:414
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add a title to this question."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-block-helpers.js:20
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:562
-=======
-#: assets/dist/blocks/quiz/index.js:425
->>>>>>> 2f9355c58 (Bump version)
 msgid "Any updates made to this question will also update it in any other quiz that includes it."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-block-helpers.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:562
-=======
-#: assets/dist/blocks/quiz/index.js:425
->>>>>>> 2f9355c58 (Bump version)
 msgid "Shared Question"
 msgstr ""
 
 #. Translators: placeholder is the grade for the questions.
 #: assets/blocks/quiz/question-block/question-edit.js:75
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:603
-=======
-#: assets/dist/blocks/quiz/index.js:458
->>>>>>> 2f9355c58 (Bump version)
 msgid "%d point"
 msgid_plural "%d points"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/question-block/question-edit.js:194
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:603
-=======
-#: assets/dist/blocks/quiz/index.js:458
->>>>>>> 2f9355c58 (Bump version)
 msgid "Question Title"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-grade-control.js:28
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:610
-=======
-#: assets/dist/blocks/quiz/index.js:469
->>>>>>> 2f9355c58 (Bump version)
 msgid "Point"
 msgid_plural "Points"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/question-block/question-settings.js:34
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:628
-=======
-#: assets/dist/blocks/quiz/index.js:491
->>>>>>> 2f9355c58 (Bump version)
 msgid "Question settings"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-settings.js:47
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:628
-=======
-#: assets/dist/blocks/quiz/index.js:491
->>>>>>> 2f9355c58 (Bump version)
 msgid "Hide Answer Feedback"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-settings.js:52
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:628
-=======
-#: assets/dist/blocks/quiz/index.js:491
->>>>>>> 2f9355c58 (Bump version)
 msgid "Do not show any feedback when the student answers this question."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-type-toolbar.js:26
 #: assets/blocks/quiz/question-block/question-type-toolbar.js:30
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:635
-=======
-#: assets/dist/blocks/quiz/index.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Question Type"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-view.js:56
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:661
-=======
-#: assets/dist/blocks/quiz/index.js:524
->>>>>>> 2f9355c58 (Bump version)
 msgid "Locked"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-view.js:62
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:661
-=======
-#: assets/dist/blocks/quiz/index.js:524
->>>>>>> 2f9355c58 (Bump version)
 msgid "Question Details"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/question-view.js:66
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:661
-=======
-#: assets/dist/blocks/quiz/index.js:524
->>>>>>> 2f9355c58 (Bump version)
 msgid "You are not allowed to edit this question."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/settings/question-grading-notes-settings.js:20
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:691
-=======
-#: assets/dist/blocks/quiz/index.js:557
->>>>>>> 2f9355c58 (Bump version)
 msgid "Grading Notes"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/single-question.js:51
 #: assets/blocks/quiz/quiz-block/quiz-validation.js:34
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:709
 #: assets/dist/blocks/quiz/index.js:871
-=======
-#: assets/dist/blocks/quiz/index.js:579
-#: assets/dist/blocks/quiz/index.js:766
->>>>>>> 2f9355c58 (Bump version)
 msgid "View issues"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/single-question.js:58
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:709
-=======
-#: assets/dist/blocks/quiz/index.js:579
->>>>>>> 2f9355c58 (Bump version)
 msgid "This question is incomplete."
 msgstr ""
 
 #: assets/blocks/quiz/question-block/single-question.js:66
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:709
-=======
-#: assets/dist/blocks/quiz/index.js:579
->>>>>>> 2f9355c58 (Bump version)
 msgid "Validation"
 msgstr ""
 
 #: assets/blocks/quiz/question-block/single-question.js:72
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:709
-=======
-#: assets/dist/blocks/quiz/index.js:579
->>>>>>> 2f9355c58 (Bump version)
 msgid "Incomplete questions added to a quiz won't be displayed to the student."
 msgstr ""
 
 #: assets/blocks/quiz/question-description-block/question-description.js:30
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:744
-=======
-#: assets/dist/blocks/quiz/index.js:612
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add question description or type / to choose a block."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:25
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Single page"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:29
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Multi-page"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:57
 #: assets/data-port/import/done/import-success-results.js:17
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
 #: assets/dist/data-port/import.js:411
-=======
-#: assets/dist/blocks/quiz/index.js:656
-#: assets/dist/data-port/import.js:227
->>>>>>> 2f9355c58 (Bump version)
 msgid "question"
 msgid_plural "questions"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:69
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "per page"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:92
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:97
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Pagination"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:117
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Show Progress Bar"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:131
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Radius"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:134
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:146
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "PX"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:143
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:694
 #: assets/dist/blocks/quiz/index.js:777
 #: assets/dist/blocks/single-page.js:346
-=======
-#: assets/dist/blocks/global-blocks.js:546
-#: assets/dist/blocks/quiz/index.js:656
-#: assets/dist/blocks/quiz/index.js:876
-#: assets/dist/blocks/single-page.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/blocks/progress-bar/progress-bar-settings.js:50
 msgid "Height"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/pagination-settings.js:177
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:777
-=======
-#: assets/dist/blocks/quiz/index.js:656
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz pagination"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/actions.js:43
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:787
-=======
-#: assets/dist/blocks/quiz/index.js:667
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add Selected"
 msgstr ""
 
 #. translators: Number of selected questions.
 #: assets/blocks/quiz/quiz-block/questions-modal/actions.js:46
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:789
-=======
-#: assets/dist/blocks/quiz/index.js:667
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add Selected (%s)"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/actions.js:55
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:789
-=======
-#: assets/dist/blocks/quiz/index.js:667
->>>>>>> 2f9355c58 (Bump version)
 msgid "Clear Selected"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/filter.js:86
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:798
-=======
-#: assets/dist/blocks/quiz/index.js:678
->>>>>>> 2f9355c58 (Bump version)
 msgid "Search questions"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/index.js:54
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:807
-=======
-#: assets/dist/blocks/quiz/index.js:689
->>>>>>> 2f9355c58 (Bump version)
 msgid "Unable to add the selected question(s). Please make sure you are still logged in and try again."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/questions.js:138
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:819
-=======
-#: assets/dist/blocks/quiz/index.js:700
->>>>>>> 2f9355c58 (Bump version)
 msgid "Toggle all visible questions selection."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/questions-modal/questions.js:156
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:819
-=======
-#: assets/dist/blocks/quiz/index.js:700
->>>>>>> 2f9355c58 (Bump version)
 msgid "No questions found."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-appender.js:57
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:828
-=======
-#: assets/dist/blocks/quiz/index.js:711
->>>>>>> 2f9355c58 (Bump version)
 msgid "Category Question(s)"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-appender.js:63
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:828
-=======
-#: assets/dist/blocks/quiz/index.js:711
->>>>>>> 2f9355c58 (Bump version)
 msgid "Existing Question(s)"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-appender.js:69
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:828
-=======
-#: assets/dist/blocks/quiz/index.js:711
->>>>>>> 2f9355c58 (Bump version)
 msgid "Add new or existing question(s)"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-edit.js:74
 #: assets/blocks/quiz/quiz-block/quiz-validation.js:114
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:837
 #: assets/dist/blocks/quiz/index.js:874
-=======
-#: assets/dist/blocks/quiz/index.js:722
-#: assets/dist/blocks/quiz/index.js:766
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lesson Quiz"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-progress-bar-edit.js:47
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:846
-=======
-#: assets/dist/blocks/quiz/index.js:733
->>>>>>> 2f9355c58 (Bump version)
 msgid "questions"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:122
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:127
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz settings"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:134
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Pass Required"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:141
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Passing Grade (%)"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:159
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "What students see when reviewing their quiz after grading."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:165
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "If student does not pass quiz"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:176
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Indicate which questions are incorrect."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:186
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Show correct answers."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:196
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Show “Answer Feedback” text."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:210
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Auto Grade"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:211
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Automatically grade Multiple Choice, True/False and Gap Fill questions that have a non-zero point value."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:221
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Allow Retakes"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:230
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Random Question Order"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:245
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Display a random selection of questions."
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:281
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Button text color"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-settings.js:288
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:855
-=======
-#: assets/dist/blocks/quiz/index.js:744
->>>>>>> 2f9355c58 (Bump version)
 msgid "Button background color"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-timer-promo.js:15
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:864
-=======
-#: assets/dist/blocks/quiz/index.js:755
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz Timer"
 msgstr ""
 
 #: assets/blocks/quiz/quiz-block/quiz-timer-promo.js:16
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:864
-=======
-#: assets/dist/blocks/quiz/index.js:755
->>>>>>> 2f9355c58 (Bump version)
 msgid "The quiz timer enables you to control how much time a student has to complete the quiz."
 msgstr ""
 
 #. Translators: placeholder is the numer of incomplete questions.
 #: assets/blocks/quiz/quiz-block/quiz-validation.js:42
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:872
-=======
-#: assets/dist/blocks/quiz/index.js:766
->>>>>>> 2f9355c58 (Bump version)
 msgid "There is %d incomplete question in this lesson's quiz."
 msgid_plural "There are %d incomplete questions in this lesson's quiz."
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/blocks/quiz/quiz-block/quiz-validation.js:120
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:874
-=======
-#: assets/dist/blocks/quiz/index.js:766
->>>>>>> 2f9355c58 (Bump version)
 msgid "Incomplete questions won't be displayed to the student when taking the quiz."
 msgstr ""
 
 #. translators: Error message.
 #: assets/blocks/quiz/quiz-store.js:166
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:946
-=======
-#: assets/dist/blocks/quiz/index.js:821
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz settings and questions could not be loaded. %s"
 msgstr ""
 
 #. translators: Error message.
 #: assets/blocks/quiz/quiz-store.js:185
-<<<<<<< HEAD
 #: assets/dist/blocks/quiz/index.js:954
-=======
-#: assets/dist/blocks/quiz/index.js:821
->>>>>>> 2f9355c58 (Bump version)
 msgid "Quiz settings and questions could not be updated. %s"
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:19
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Course Signup"
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:20
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a registered user to start the course. This block is only displayed if the user is not already enrolled."
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:26
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Sign up"
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:27
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Signup"
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:28
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enrol"
 msgstr ""
 
 #: assets/blocks/take-course-block/index.js:40
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:646
-=======
-#: assets/dist/blocks/global-blocks.js:502
->>>>>>> 2f9355c58 (Bump version)
 msgid "The Course Signup block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/blocks/view-results-block/index.js:20
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:661
-=======
-#: assets/dist/blocks/global-blocks.js:513
->>>>>>> 2f9355c58 (Bump version)
 msgid "Enable a student to view their course results."
 msgstr ""
 
 #: assets/blocks/view-results-block/index.js:37
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:661
-=======
-#: assets/dist/blocks/global-blocks.js:513
->>>>>>> 2f9355c58 (Bump version)
 msgid "The View Results block can only be used inside the Course List block."
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:43
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Third Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:48
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Fourth Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:58
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Fifth Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:63
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Sixth Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:67
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "Seventh Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:97
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:241
 msgid "2 lessons, 0 quizzes"
 msgstr ""
 
 #: assets/course-theme/blocks/course-navigation/index.js:141
-#: assets/dist/course-theme/blocks/index.js:249
+#: assets/dist/course-theme/blocks/index.js:246
 msgid "Course Navigation"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:46
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display title of the course the current lesson or quiz belongs to."
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:62
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Course Progress"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:63
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display number of completed and total lessons in the course."
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:73
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "2 of 10 lessons complete (20%)"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:81
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Previous & Next Lesson"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:82
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Link to the previous and next lessons."
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:102
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Sidebar Menu Toggle"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:103
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Turn the Sidebar block into an overlay menu on mobile screens."
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:118
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Lesson Actions (Learning Mode)"
 msgstr ""
 
 #: assets/course-theme/blocks/lesson-blocks/index.js:119
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display buttons for actions the learner can take for the current lesson."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:130
-#: assets/dist/course-theme/blocks/index.js:271
-msgid "Complete Course"
-msgstr ""
-
-#: assets/course-theme/blocks/lesson-blocks/index.js:139
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:143
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Course Progress Bar"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:140
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:144
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display course progress."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:158
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:162
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Focus Mode Toggle"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:159
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:163
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Toggle a minimalized view of Learning Mode."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:175
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:179
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Exit Learning Mode and return to the course page."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:193
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:197
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Module Title"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:194
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:198
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display title of the module the current lesson belongs to."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:202
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:206
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "MODULE"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:209
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:213
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Post Title"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:210
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:214
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display title of the current lesson or quiz."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:221
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:225
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Course Content"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:222
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:226
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display lesson or quiz content, if the learner has access to it."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:227
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:231
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Course Content."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:233
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:237
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Notices"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:234
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:238
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display Sensei notices about the current lesson or quiz."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:242
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:246
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Notice"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:251
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:255
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Page Actions"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:252
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:256
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Display pagination and related actions for the current page."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:274
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:278
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Lesson Video"
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:275
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:279
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Displays the featured video if there is one for the lesson."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:310
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:314
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "Displays the lesson properties such as length and difficulty."
 msgstr ""
 
-#: assets/course-theme/blocks/lesson-blocks/index.js:321
-#: assets/dist/course-theme/blocks/index.js:271
+#: assets/course-theme/blocks/lesson-blocks/index.js:325
+#: assets/dist/course-theme/blocks/index.js:255
 msgid "The Learning Mode Lesson Properties block will display the lesson complexity and length. To set these properties, you need to add a Lesson Properties block to each individual lesson."
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:27
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Quiz Progress Bar"
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:28
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Display progress of questions answered in a quiz."
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:36
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "2 of 10 questions complete (20%)"
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:62
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Return to the lesson the quiz belongs to."
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:77
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Quiz Actions and Pagination"
 msgstr ""
 
 #: assets/course-theme/blocks/quiz-blocks/index.js:78
-#: assets/dist/course-theme/blocks/index.js:282
+#: assets/dist/course-theme/blocks/index.js:264
 msgid "Display pagination and actions the learner can take for the current quiz page."
 msgstr ""
 
 #: assets/course-theme/blocks/template-style/template-style-block.js:19
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:297
-=======
-#: assets/dist/course-theme/blocks/index.js:320
->>>>>>> 2f9355c58 (Bump version)
 msgid "Template Style"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/spacer-block.js:34
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:322
-=======
-#: assets/dist/course-theme/blocks/index.js:342
->>>>>>> 2f9355c58 (Bump version)
 msgid "Spacer (Auto)"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/spacer-block.js:40
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:322
-=======
-#: assets/dist/course-theme/blocks/index.js:342
->>>>>>> 2f9355c58 (Bump version)
 msgid "Automatically fill space between blocks."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.js:86
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:331
-=======
-#: assets/dist/course-theme/blocks/index.js:353
->>>>>>> 2f9355c58 (Bump version)
 msgid "Interface Element"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:57
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Fixed Header"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:58
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Header area that stays fixed on top of the screen."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:78
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Sidebar Menu"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:79
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "A sidebar displayed as an overlay menu on mobile screens. Add the \"Sidebar Toggle\" block to a header to allow opening and closing."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:97
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Main Content"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:98
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:339
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Content Area."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:113
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Two-column Layout"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:114
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Layout with a fixed left or right sidebar."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:151
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Video Container"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:152
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Container for a video with a sidebar."
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:179
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Content Footer"
 msgstr ""
 
 #: assets/course-theme/blocks/ui/ui-block.variations.js:180
-<<<<<<< HEAD
 #: assets/dist/course-theme/blocks/index.js:341
-=======
-#: assets/dist/course-theme/blocks/index.js:364
->>>>>>> 2f9355c58 (Bump version)
 msgid "Navigation area below the content."
 msgstr ""
 
-#: assets/course-theme/complete-lesson-button.js:79
-<<<<<<< HEAD
-#: assets/dist/course-theme/learning-mode.js:305
-=======
-#: assets/dist/course-theme/learning-mode.js:170
->>>>>>> 2f9355c58 (Bump version)
-msgid "Lesson complete"
-msgstr ""
-
 #. translators: The %1$s is the name of the Learning Mode template.
 #: assets/course-theme/learning-mode-templates/template-preview.js:27
-<<<<<<< HEAD
 #: assets/dist/course-theme/learning-mode-templates/index.js:70
-=======
-#: assets/dist/course-theme/learning-mode-templates/index.js:106
->>>>>>> 2f9355c58 (Bump version)
 msgid "Preview %1$s"
 msgstr ""
 
 #: assets/data-port/export/export-page.js:32
-#: assets/dist/data-port/export.js:40
+#: assets/dist/data-port/export.js:17
 msgid "Export content to a CSV file"
 msgstr ""
 
 #: assets/data-port/export/export-progress-page.js:67
-#: assets/dist/data-port/export.js:51
+#: assets/dist/data-port/export.js:25
 msgid "The following file was exported:"
 msgid_plural "The following files were exported:"
 msgstr[0] ""
 msgstr[1] ""
 
 #: assets/data-port/export/export-progress-page.js:96
-#: assets/dist/data-port/export.js:51
+#: assets/dist/data-port/export.js:25
 msgid "Export More Content"
 msgstr ""
 
 #: assets/data-port/export/export-select-content-page.js:32
-#: assets/dist/data-port/export.js:62
+#: assets/dist/data-port/export.js:33
 msgid "Which type of content would you like to export?"
 msgstr ""
 
 #: assets/data-port/import.js:42
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:809
 #: assets/dist/home/index.js:381
 #: assets/dist/setup-wizard/index.js:793
-=======
-#: assets/dist/data-port/import.js:106
-#: assets/dist/home/index.js:304
-#: assets/dist/setup-wizard/index.js:260
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/main.js:58
 #: assets/setup-wizard/index.js:72
 msgid "An error has occurred while fetching the data. Please try again later!"
 msgstr ""
 
 #: assets/data-port/import.js:47
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:809
 #: assets/dist/home/index.js:381
 #: assets/dist/setup-wizard/index.js:793
-=======
-#: assets/dist/data-port/import.js:106
-#: assets/dist/home/index.js:304
-#: assets/dist/setup-wizard/index.js:260
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/main.js:63
 #: assets/setup-wizard/index.js:77
 msgid "Error details:"
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:40
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "The following content was not imported. Please make the necessary corrections to the import file and try again."
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:54
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Partial"
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:56
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "The following content was partially imported. The import process encountered some issues that you can resolve manually by clicking the link and making the necessary adjustments."
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:72
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Fetching log details…"
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:78
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Failed to load import log."
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:81
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
 #: assets/dist/setup-wizard/index.js:299
-=======
-#: assets/dist/data-port/import.js:205
-#: assets/dist/setup-wizard/index.js:249
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/use-actions-navigator.js:76
 msgid "Retry"
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:95
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "The following content was imported:"
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:107
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "No content was imported."
 msgstr ""
 
 #: assets/data-port/import/done/done-page.js:113
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:393
-=======
-#: assets/dist/data-port/import.js:205
->>>>>>> 2f9355c58 (Bump version)
 msgid "Import More Content"
 msgstr ""
 
 #: assets/data-port/import/done/import-log.js:47
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:401
-=======
-#: assets/dist/data-port/import.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "File"
 msgstr ""
 
 #: assets/data-port/import/done/import-log.js:49
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:401
-=======
-#: assets/dist/data-port/import.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Title"
 msgstr ""
 
 #: assets/data-port/import/done/import-log.js:50
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:401
-=======
-#: assets/dist/data-port/import.js:216
->>>>>>> 2f9355c58 (Bump version)
 msgid "Line #"
 msgstr ""
 
 #: assets/data-port/import/import-progress/import-progress-page.js:26
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:441
-=======
-#: assets/dist/data-port/import.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Importing"
 msgstr ""
 
 #: assets/data-port/import/import-progress/import-progress-page.js:28
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:441
-=======
-#: assets/dist/data-port/import.js:260
->>>>>>> 2f9355c58 (Bump version)
 msgid "Your content is now being imported…"
 msgstr ""
 
 #: assets/data-port/import/levels.js:9
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:473
-=======
-#: assets/dist/data-port/import.js:293
->>>>>>> 2f9355c58 (Bump version)
 msgid "Courses CSV File"
 msgstr ""
 
 #: assets/data-port/import/levels.js:13
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:473
-=======
-#: assets/dist/data-port/import.js:293
->>>>>>> 2f9355c58 (Bump version)
 msgid "Lessons CSV File"
 msgstr ""
 
 #: assets/data-port/import/levels.js:17
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:473
-=======
-#: assets/dist/data-port/import.js:293
->>>>>>> 2f9355c58 (Bump version)
 msgid "Questions CSV File"
 msgstr ""
 
 #: assets/data-port/import/steps.js:17
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:481
-=======
-#: assets/dist/data-port/import.js:304
->>>>>>> 2f9355c58 (Bump version)
 msgid "Upload CSV Files"
 msgstr ""
 
 #: assets/data-port/import/steps.js:27
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:481
-=======
-#: assets/dist/data-port/import.js:304
->>>>>>> 2f9355c58 (Bump version)
 msgid "Done"
 msgstr ""
 
 #: assets/data-port/import/upload-level/upload-level.js:41
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:506
-=======
-#: assets/dist/data-port/import.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Only CSV files are supported."
 msgstr ""
 
 #: assets/data-port/import/upload-level/upload-level.js:97
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:506
-=======
-#: assets/dist/data-port/import.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Delete File"
 msgstr ""
 
 #: assets/data-port/import/upload-level/upload-level.js:139
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:506
-=======
-#: assets/dist/data-port/import.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Uploading…"
 msgstr ""
 
 #: assets/data-port/import/upload-level/upload-level.js:140
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:506
-=======
-#: assets/dist/data-port/import.js:326
->>>>>>> 2f9355c58 (Bump version)
 msgid "Upload"
 msgstr ""
 
 #: assets/data-port/import/upload/upload-page.js:29
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:531
-=======
-#: assets/dist/data-port/import.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "Import content from a CSV file"
 msgstr ""
 
 #: assets/data-port/import/upload/upload-page.js:32
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:531
-=======
-#: assets/dist/data-port/import.js:348
->>>>>>> 2f9355c58 (Bump version)
 msgid "This tool enables you to import courses, lessons, and questions from a CSV file. Please review the {{link}}documentation{{/link}} to learn more about the expected file structure."
 msgstr ""
 
 #: assets/data-port/import/upload/upload-page.js:56
-<<<<<<< HEAD
 #: assets/dist/data-port/import.js:532
 msgid "Choose one or more CSV files to upload from your computer."
 msgstr ""
 
 #: assets/dist/admin/editor-wizard/index.js:207
 #: assets/dist/home/index.js:249
-=======
-#: assets/dist/data-port/import.js:348
-msgid "Choose one or more CSV files to upload from your computer."
-msgstr ""
-
-#: assets/dist/admin/editor-wizard/index.js:169
-#: assets/dist/home/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 #: assets/extensions/store.js:139
 msgid "Update completed successfully!"
 msgstr ""
 
 #. translators: Placeholder is the underlying error message.
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:208
 #: assets/dist/home/index.js:250
-=======
-#: assets/dist/admin/editor-wizard/index.js:169
-#: assets/dist/home/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 #: assets/extensions/store.js:144
 msgid "There was an error while updating the plugin: %1$s"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:208
 #: assets/dist/home/index.js:250
-=======
-#: assets/dist/admin/editor-wizard/index.js:169
-#: assets/dist/home/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 #: assets/extensions/store.js:150
 msgid "Installation completed successfully!"
 msgstr ""
 
 #. translators: Placeholder is the underlying error message.
-<<<<<<< HEAD
 #: assets/dist/admin/editor-wizard/index.js:209
 #: assets/dist/home/index.js:251
-=======
-#: assets/dist/admin/editor-wizard/index.js:169
-#: assets/dist/home/index.js:216
->>>>>>> 2f9355c58 (Bump version)
 #: assets/extensions/store.js:155
 msgid "There was an error while installing the plugin: %1$s"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:694
 #: assets/dist/blocks/single-page.js:346
-=======
-#: assets/dist/blocks/global-blocks.js:546
-#: assets/dist/blocks/quiz/index.js:876
-#: assets/dist/blocks/single-page.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/blocks/progress-bar/progress-bar-settings.js:33
 msgid "Progress bar settings"
 msgstr ""
 
 #. translators: Placeholder %1$d is the completed progress count, %2$d is the total count and %3$s is the label for progress bar.
-<<<<<<< HEAD
 #: assets/dist/blocks/global-blocks.js:704
 #: assets/dist/blocks/quiz/index.js:1056
 #: assets/dist/blocks/single-page.js:356
-=======
-#: assets/dist/blocks/global-blocks.js:557
-#: assets/dist/blocks/quiz/index.js:887
-#: assets/dist/blocks/single-page.js:348
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/blocks/progress-bar/progress-bar.js:60
 msgid "%1$d of %2$d %3$s completed"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/data-port/export.js:17
 msgid "This tool enables you to export courses, lessons, and questions to CSV files. These files are bundled together and downloaded to your computer in .zip format."
 msgstr ""
 
 #: assets/dist/data-port/export.js:188
 #: assets/dist/data-port/import.js:625
-=======
-#: assets/dist/data-port/export.js:183
-#: assets/dist/data-port/import.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/helpers/labels.js:13
 msgid "Error"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/data-port/export.js:188
 #: assets/dist/data-port/import.js:625
-=======
-#: assets/dist/data-port/export.js:183
-#: assets/dist/data-port/import.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/shared/helpers/labels.js:14
 msgid "Warning"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:309
-=======
-#: assets/dist/home/index.js:227
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/card.js:53
 msgid "New version"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
-=======
-#: assets/dist/home/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:62
 msgid "In progress…"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
 #: assets/dist/home/index.js:363
-=======
-#: assets/dist/home/index.js:238
-#: assets/dist/home/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:77
 #: assets/home/install-demo-course.js:96
 msgid "Installed"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
-=======
-#: assets/dist/home/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:86
 msgid "Free"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
-=======
-#: assets/dist/home/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:89
 msgid "Install"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:326
-=======
-#: assets/dist/home/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/extension-actions.js:112
 msgid "More details"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:344
-=======
-#: assets/dist/home/index.js:260
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/header.js:16
 msgid "Sensei"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:363
-=======
-#: assets/dist/home/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/install-demo-course.js:84
 msgid "Error while installing. Try again."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:363
-=======
-#: assets/dist/home/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/install-demo-course.js:91
 msgid "Edit Demo Course"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:363
-=======
-#: assets/dist/home/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/install-demo-course.js:101
 msgid "Installing"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:415
-=======
-#: assets/dist/home/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/extensions.js:49
 msgid "Extensions"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:424
-=======
-#: assets/dist/home/index.js:348
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/get-help.js:97
 msgid "Get Help"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:433
-=======
-#: assets/dist/home/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/latest-news.js:25
 msgid "Latest News"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:433
 #: assets/dist/home/index.js:451
-=======
-#: assets/dist/home/index.js:359
-#: assets/dist/home/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/latest-news.js:41
 #: assets/home/sections/sensei-guides.js:38
 msgid "See more"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:442
-=======
-#: assets/dist/home/index.js:370
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/quick-links.js:105
 msgid "Quick Links"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:451
-=======
-#: assets/dist/home/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-guides.js:25
 msgid "Sensei Guides"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:460
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:42
 msgid "Better courses with Sensei Pro"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:460
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:51
 msgid "Get everything you need to sell courses and take your lessons to the next level."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:75
 msgid "Sell courses with WooCommerce"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:81
 msgid "Schedule and drip courses and lessons"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:87
 msgid "Manage groups and cohorts"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:93
 msgid "Create interactive videos and lessons"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:99
 msgid "Add advanced quiz features"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:105
 msgid "Contact our experts for help"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:146
 msgid "Photo of Gonzalo de la Campa smiling"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:153
 msgid "Thanks to Sensei Pro, I have been able to generate recurring income every month."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:160
 msgid "WordPress Educator"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:461
-=======
-#: assets/dist/home/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/sections/sensei-pro-ad.js:166
 msgid "Image containing five stars, representing the rating of the plugin"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:488
 #: assets/dist/setup-wizard/index.js:286
 #: assets/dist/setup-wizard/index.js:308
-=======
-#: assets/dist/home/index.js:425
-#: assets/dist/setup-wizard/index.js:238
-#: assets/dist/setup-wizard/index.js:271
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/progress.js:25
 #: assets/setup-wizard/features/index.js:174
 #: assets/setup-wizard/navigation-bar/index.js:32
 msgid "Sensei Onboarding Progress"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:497
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:42
 msgid "My new course is ready!"
 msgstr ""
 
 #. translators: placeholder is the share link.
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:47
 msgid "My new course is ready! Check it here: %s"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:56
 msgid "Dismiss tasks"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:67
 msgid "Your new course is ready to meet its students! Share it with the world."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:83
 msgid "Facebook"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:96
 msgid "Twitter"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:498
-=======
-#: assets/dist/home/index.js:436
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/ready.js:109
 msgid "Tumblr"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:516
-=======
-#: assets/dist/home/index.js:458
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/tasks.js:20
 msgid "Welcome to your new Sensei course site."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/home/index.js:516
-=======
-#: assets/dist/home/index.js:458
->>>>>>> 2f9355c58 (Bump version)
 #: assets/home/tasks-section/tasks.js:24
 msgid "Keep the momentum going and let’s get your first Course in front of your students."
 msgstr ""
@@ -11235,321 +9463,183 @@ msgstr ""
 msgid "Expires after"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:141
 msgid "Multiple teachers?"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:178
 msgid "Access"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:180
 msgid "Open Access"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:185
 msgid "Visitors can take this course without signing up. Not available for paid courses."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:73
-=======
-#: assets/dist/js/admin/course-edit.js:69
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-general-sidebar.js:197
 msgid "Feature this course."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-pricing-promo-sidebar.js:24
 msgid "Sell this course using WooCommerce - integrates with subscriptions, memberships, affiliates, and more."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-pricing-promo-sidebar.js:31
 msgid "Pricing"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-pricing-promo-sidebar.js:43
 msgid "To access this course, learners will need to purchase one of the assigned products."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-pricing-promo-sidebar.js:50
 msgid "You don't have any products yet. Get started by creating a new WooCommerce product."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:91
-=======
-#: assets/dist/js/admin/course-edit.js:79
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-pricing-promo-sidebar.js:59
 msgid "Create a product"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:140
-=======
-#: assets/dist/js/admin/course-edit.js:109
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-theme/course-theme-sidebar.js:39
 msgid "Learning Mode is enabled globally."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:140
-=======
-#: assets/dist/js/admin/course-edit.js:109
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-theme/course-theme-sidebar.js:48
 msgid "Enable Learning Mode"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:140
-=======
-#: assets/dist/js/admin/course-edit.js:109
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-theme/course-theme-sidebar.js:60
 msgid "Change Template"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:29
 msgid "Autocomplete Lesson"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:32
 msgid "Complete lesson when video ends."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:35
 msgid "Autopause"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:38
 msgid "Pause video when student navigates away."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/js/admin/course-edit.js:149
-=======
-#: assets/dist/js/admin/course-edit.js:119
->>>>>>> 2f9355c58 (Bump version)
 #: assets/js/admin/course-video-sidebar.js:47
 msgid "Video must be viewed before completing the lesson."
 msgstr ""
 
-#: assets/dist/js/learners-bulk-actions.js:18
+#: assets/dist/js/learners-bulk-actions.js:1
 #: assets/js/learners-bulk-actions.js:228
 msgid "There was an error fetching courses: "
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:284
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:19
 msgid "Installing WooCommerce"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:284
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:20
 msgid "Installing Certificates"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:286
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:59
 msgid "Installing the Course theme"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:286
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:97
 msgid "Applying your choices"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:286
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:101
 msgid "Setting up your new Sensei Home"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:286
-=======
-#: assets/dist/setup-wizard/index.js:238
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/index.js:158
 msgid "Go to Sensei Home"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:299
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:249
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/features/use-actions-navigator.js:80
 #: assets/setup-wizard/theme/index.js:95
 msgid "Skip"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:317
-=======
-#: assets/dist/setup-wizard/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/newsletter/index.js:27
 msgid "Be the first to know about new features"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:317
-=======
-#: assets/dist/setup-wizard/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/newsletter/index.js:33
 msgid "Sensei is growing fast and we’re constantly releasing new features. Join on our mailing list to know first."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:317
-=======
-#: assets/dist/setup-wizard/index.js:282
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/newsletter/index.js:45
 msgid "Skip newsletter signup"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:328
-=======
-#: assets/dist/setup-wizard/index.js:293
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/newsletter/signup-form.js:88
 msgid "Your email address"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:328
-=======
-#: assets/dist/setup-wizard/index.js:293
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/newsletter/signup-form.js:101
 msgid "Nice! Sign me up"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:335
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:19
 msgid "Sell courses and generate income"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:335
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:24
 msgid "Provide certification"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:335
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:29
 msgid "Educate students"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:335
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:33
 msgid "Train employees"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:337
 #: assets/setup-wizard/purpose/index.js:116
 msgid "Choose the purpose of your site"
@@ -11561,85 +9651,43 @@ msgid "Select your goals for offering courses, and we will help you set everythi
 msgstr ""
 
 #: assets/dist/setup-wizard/index.js:337
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:50
 msgid "activated"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:337
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:51
 msgid "installed for free"
 msgstr ""
 
 #. translators: %1$s Plugin name, %2$s Action that will be done.
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:338
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:55
 msgid "%1$s will be %2$s."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:338
-=======
-#: assets/dist/setup-wizard/index.js:304
-#: assets/setup-wizard/purpose/index.js:116
-msgid "Choose the purpose of your site"
-msgstr ""
-
-#: assets/dist/setup-wizard/index.js:304
-#: assets/setup-wizard/purpose/index.js:119
-msgid "Select your goals for offering courses, and we will help you set everything up."
-msgstr ""
-
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:142
 msgid "Other"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:339
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:169
 msgid "Refresh the page"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:339
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:177
 msgid "An error happened while loading the Sensei extensions."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:339
-=======
-#: assets/dist/setup-wizard/index.js:304
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/purpose/index.js:198
 msgid "Skip customization"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:366
 #: assets/dist/setup-wizard/index.js:401
-=======
-#: assets/dist/setup-wizard/index.js:337
-#: assets/dist/setup-wizard/index.js:370
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/big-screen.js:31
 #: assets/setup-wizard/theme/big-screen.js:50
 #: assets/setup-wizard/theme/big-screen.js:62
@@ -11656,147 +9704,83 @@ msgstr ""
 msgid "Sensei theme illustration"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:366
-=======
-#: assets/dist/setup-wizard/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/big-screen.js:39
 msgid "Mobile optimized so it looks great on any screen size"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:366
-=======
-#: assets/dist/setup-wizard/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/big-screen.js:119
 msgid "I always wanted to write, and thanks to Course, I got it right. My writing is clearer, and I can finally get my message across."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:366
-=======
-#: assets/dist/setup-wizard/index.js:337
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/big-screen.js:140
 msgid "All new and improved Learning Mode to help keep your students focused"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/index.js:103
 #: assets/setup-wizard/theme/index.js:137
 msgid "Get the Course theme"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/index.js:119
 msgid "Use our default theme"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/index.js:122
 msgid "'Course' is a free WordPress theme built to work perfectly with Sensei and courses. You can use any WordPress theme with Sensei, or activate 'Course'."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/index.js:144
 msgid "Explore the theme"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:392
-=======
-#: assets/dist/setup-wizard/index.js:359
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/theme/index.js:154
 msgid "Keep my current theme"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:410
-=======
-#: assets/dist/setup-wizard/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/usage-tracking/index.js:41
 msgid "Help us improve your Sensei experience"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:410
-=======
-#: assets/dist/setup-wizard/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/usage-tracking/index.js:47
 msgid "Help us build a better Sensei by sharing anonymous and non-sensitive data with our team. No personal data will be tracked or stored."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:410
-=======
-#: assets/dist/setup-wizard/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/usage-tracking/index.js:59
 msgid "Exciting, count me in!"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:410
-=======
-#: assets/dist/setup-wizard/index.js:381
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/usage-tracking/index.js:67
 msgid "No thanks"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:419
-=======
-#: assets/dist/setup-wizard/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/welcome/index.js:44
 msgid "Welcome to Sensei LMS"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:419
-=======
-#: assets/dist/setup-wizard/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/welcome/index.js:58
 msgid "Let’s set up your site to launch your first course."
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:419
-=======
-#: assets/dist/setup-wizard/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/welcome/index.js:76
 msgid "Get started"
 msgstr ""
 
-<<<<<<< HEAD
 #: assets/dist/setup-wizard/index.js:419
-=======
-#: assets/dist/setup-wizard/index.js:392
->>>>>>> 2f9355c58 (Bump version)
 #: assets/setup-wizard/welcome/index.js:80
 msgid "Skip onboarding"
 msgstr ""

From 38ab292e4a17d1c94e0ec356ed51065a420e4f35 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Wed, 19 Apr 2023 11:03:46 -0400
Subject: [PATCH 19/41] Course navigation module title

---
 assets/css/sensei-course-theme/blocks/course-navigation.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/css/sensei-course-theme/blocks/course-navigation.scss b/assets/css/sensei-course-theme/blocks/course-navigation.scss
index a128b5846e..7562086d2b 100644
--- a/assets/css/sensei-course-theme/blocks/course-navigation.scss
+++ b/assets/css/sensei-course-theme/blocks/course-navigation.scss
@@ -19,6 +19,7 @@
 	}
 }
 
+.editor-styles-wrapper .sensei-lms-course-navigation-module,
 .sensei-lms-course-navigation-module {
 	.sensei-collapsible__toggle {
 		align-items: flex-start;

From 46952f4c41f53ae8eaf23031b4d3e548fe9f1b7c Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Wed, 19 Apr 2023 16:27:22 -0400
Subject: [PATCH 20/41] Fix all buttons in the editor

---
 assets/css/sensei-course-theme/buttons.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/sensei-course-theme/buttons.scss b/assets/css/sensei-course-theme/buttons.scss
index 506aee3a85..0f5d387f1f 100644
--- a/assets/css/sensei-course-theme/buttons.scss
+++ b/assets/css/sensei-course-theme/buttons.scss
@@ -11,7 +11,7 @@
 	}
 }
 
-.editor-styles-wrapper .wp-block-button .wp-block-button__link.sensei-course-theme__button,
+.editor-styles-wrapper .sensei-course-theme__main-content .wp-block-button,
 .sensei-course-theme .wp-block-button,
 .sensei-course-theme__button,
 .sensei-course-theme__button[type=submit],

From c172fc075d9ed438c2ec37d3265eb03708bc3221 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Wed, 19 Apr 2023 16:30:28 -0400
Subject: [PATCH 21/41] Fix sidebar and content styling

---
 assets/css/learning-mode-compat.scss       | 9 +++++++++
 assets/css/sensei-course-theme/base.scss   | 2 ++
 assets/css/sensei-course-theme/editor.scss | 4 ----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/assets/css/learning-mode-compat.scss b/assets/css/learning-mode-compat.scss
index 354a60f1e0..7e9d0635c4 100644
--- a/assets/css/learning-mode-compat.scss
+++ b/assets/css/learning-mode-compat.scss
@@ -11,6 +11,7 @@
 	font-size: 100%;
 }
 
+.editor-styles-wrapper .sensei-course-theme__main-content,
 .sensei-course-theme {
 	--wp--preset--font-family--body-font: -apple-system, BlinkMacSystemFont, Inter, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	font-family: var(--wp--preset--font-family--body-font);
@@ -25,6 +26,7 @@
 	}
 }
 
+.editor-styles-wrapper .sensei-course-theme__sidebar,
 .sensei-course-theme__sidebar {
 	a, [class*='sensei-'] a, a[class*='sensei-'] {
 		text-decoration: none;
@@ -60,6 +62,7 @@
 }
 
 /* Course Navigation */
+.editor-styles-wrapper .sensei-lms-course-navigation-module__title,
 .sensei-lms-course-navigation-module__title {
 	color: var(--sensei-primary-color);
 
@@ -72,10 +75,16 @@
 	color: var(--sensei-lesson-meta-color);
 }
 
+.editor-styles-wrapper .sensei-lms-course-navigation-lesson__link,
 .sensei-lms-course-navigation-lesson__link {
 	color: var(--sensei-module-lesson-color);
 }
 
+.status-locked .sensei-lms-course-navigation-lesson__link {
+	color: var(--sensei-locked-lesson-color);
+}
+
+.editor-styles-wrapper .sensei-lms-course-navigation-lesson__extra,
 .sensei-lms-course-navigation-lesson__extra {
 	color: var(--sensei-lesson-meta-color);
 }
diff --git a/assets/css/sensei-course-theme/base.scss b/assets/css/sensei-course-theme/base.scss
index 16a0490e5b..fc1e90a93e 100644
--- a/assets/css/sensei-course-theme/base.scss
+++ b/assets/css/sensei-course-theme/base.scss
@@ -5,6 +5,7 @@ body {
 	--sensei-background-color: var(--sensei-background-color-global, var(--sensei-course-theme-background-color, var(--wp--preset--color--background, #FFFFFF)));
 	--sensei-button-hover-color: #F0F0F0;
 	--sensei-lesson-meta-color: #787C82;
+	--sensei-locked-lesson-color: #646970;
 	--sensei-module-lesson-color: #101517;
 	--sensei-pagination-color: #191E23;
 	--sensei-primary-color: var(--sensei-primary-color-global, var(--sensei-course-theme-primary-color, var(--wp--preset--color--primary, #155E65)));
@@ -13,6 +14,7 @@ body {
 	--sensei-text-color: var(--sensei-text-color-global, var(--sensei-course-theme-foreground-color, var(--wp--preset--color--text, var(--wp--preset--color--foreground, #1E1E1E))));
 
 	--border-color: rgba(125, 125, 125, 0.3);
+
 	background-color: var(--sensei-background-color);
 	color: var(--sensei-text-color);
 }
diff --git a/assets/css/sensei-course-theme/editor.scss b/assets/css/sensei-course-theme/editor.scss
index 64ca858149..adeeb4391e 100644
--- a/assets/css/sensei-course-theme/editor.scss
+++ b/assets/css/sensei-course-theme/editor.scss
@@ -51,10 +51,6 @@ body {
 	padding: 12px 0;
 }
 
-.wp-block-post-title {
-	font-size: 48px !important;
-}
-
 input, textarea {
 	border: none;
 	padding: 0;

From 9ffaa1535afc2397560dcd17e317cc9b399ca84e Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Wed, 19 Apr 2023 16:30:42 -0400
Subject: [PATCH 22/41] Fix lesson module styling

---
 assets/css/sensei-course-theme/blocks/lesson-module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/css/sensei-course-theme/blocks/lesson-module.scss b/assets/css/sensei-course-theme/blocks/lesson-module.scss
index 9b79181954..d8de77f9d0 100644
--- a/assets/css/sensei-course-theme/blocks/lesson-module.scss
+++ b/assets/css/sensei-course-theme/blocks/lesson-module.scss
@@ -1,3 +1,4 @@
+.editor-styles-wrapper .wp-block-sensei-lms-course-theme-lesson-module,
 .wp-block-sensei-lms-course-theme-lesson-module {
 	border-left: solid 2px var(--sensei-text-color);
 	color: var(--sensei-text-color);

From f723e84b13bff20982d83b77e86222037e2ea7f4 Mon Sep 17 00:00:00 2001
From: Fernando Jorge Mota <contato@fjorgemota.com>
Date: Wed, 19 Apr 2023 23:31:30 -0300
Subject: [PATCH 23/41] Add changelog entry

---
 changelog/change-svg-xlink-href-to-href | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/change-svg-xlink-href-to-href

diff --git a/changelog/change-svg-xlink-href-to-href b/changelog/change-svg-xlink-href-to-href
new file mode 100644
index 0000000000..a640472f09
--- /dev/null
+++ b/changelog/change-svg-xlink-href-to-href
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Use non-deprecated attribute to load SVG icons.

From 997bbf8e6f1e8a07b501fa6e23bd6f83d2169845 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 09:04:08 -0400
Subject: [PATCH 24/41] Fix Astra in editor

---
 assets/css/learning-mode-compat.scss                     | 4 ++--
 assets/css/sensei-course-theme/base.scss                 | 6 +++++-
 assets/css/sensei-course-theme/blocks/exit-course.scss   | 2 +-
 assets/css/sensei-course-theme/blocks/lesson-module.scss | 6 +++---
 assets/css/sensei-course-theme/buttons.scss              | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/assets/css/learning-mode-compat.scss b/assets/css/learning-mode-compat.scss
index 7e9d0635c4..53c99b66e2 100644
--- a/assets/css/learning-mode-compat.scss
+++ b/assets/css/learning-mode-compat.scss
@@ -11,7 +11,7 @@
 	font-size: 100%;
 }
 
-.editor-styles-wrapper .sensei-course-theme__main-content,
+.editor-styles-wrapper .wp-block,
 .sensei-course-theme {
 	--wp--preset--font-family--body-font: -apple-system, BlinkMacSystemFont, Inter, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	font-family: var(--wp--preset--font-family--body-font);
@@ -44,7 +44,7 @@
 	padding: 1px 2px;
 }
 
-.editor-styles-wrapper .wp-block-sensei-lms-course-theme-course-progress-counter,
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-theme-course-progress-counter,
 .wp-block-sensei-lms-course-theme-course-progress-counter {
 	color: var(--sensei-lesson-meta-color);
 	font-size: 1rem;
diff --git a/assets/css/sensei-course-theme/base.scss b/assets/css/sensei-course-theme/base.scss
index fc1e90a93e..9e66a7eb7a 100644
--- a/assets/css/sensei-course-theme/base.scss
+++ b/assets/css/sensei-course-theme/base.scss
@@ -1,9 +1,11 @@
 $breakpoint: 783px;
 
-body {
+body,
+.editor-styles-wrapper .wp-block {
 	// Try to pick up global styles, customizer or theme colors.
 	--sensei-background-color: var(--sensei-background-color-global, var(--sensei-course-theme-background-color, var(--wp--preset--color--background, #FFFFFF)));
 	--sensei-button-hover-color: #F0F0F0;
+	--sensei-button-text-color: #26212E;
 	--sensei-lesson-meta-color: #787C82;
 	--sensei-locked-lesson-color: #646970;
 	--sensei-module-lesson-color: #101517;
@@ -14,6 +16,8 @@ body {
 	--sensei-text-color: var(--sensei-text-color-global, var(--sensei-course-theme-foreground-color, var(--wp--preset--color--text, var(--wp--preset--color--foreground, #1E1E1E))));
 
 	--border-color: rgba(125, 125, 125, 0.3);
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 
 	background-color: var(--sensei-background-color);
 	color: var(--sensei-text-color);
diff --git a/assets/css/sensei-course-theme/blocks/exit-course.scss b/assets/css/sensei-course-theme/blocks/exit-course.scss
index 01532ae189..1ef9729bff 100644
--- a/assets/css/sensei-course-theme/blocks/exit-course.scss
+++ b/assets/css/sensei-course-theme/blocks/exit-course.scss
@@ -1,4 +1,4 @@
-.editor-styles-wrapper .wp-block-sensei-lms-exit-course,
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-exit-course,
 .wp-block-sensei-lms-exit-course {
 	color: var(--sensei-primary-color);
 	font-size: 1rem;
diff --git a/assets/css/sensei-course-theme/blocks/lesson-module.scss b/assets/css/sensei-course-theme/blocks/lesson-module.scss
index d8de77f9d0..e73603d8ba 100644
--- a/assets/css/sensei-course-theme/blocks/lesson-module.scss
+++ b/assets/css/sensei-course-theme/blocks/lesson-module.scss
@@ -1,7 +1,7 @@
-.editor-styles-wrapper .wp-block-sensei-lms-course-theme-lesson-module,
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-theme-lesson-module,
 .wp-block-sensei-lms-course-theme-lesson-module {
-	border-left: solid 2px var(--sensei-text-color);
-	color: var(--sensei-text-color);
+	border-left: solid 2px var(--sensei-module-lesson-color);
+	color: var(--sensei-module-lesson-color);
 	font-size: 0.875rem;
 	line-height: 1.2;
 	padding-left: 0.5em;
diff --git a/assets/css/sensei-course-theme/buttons.scss b/assets/css/sensei-course-theme/buttons.scss
index 0f5d387f1f..b0071a73b1 100644
--- a/assets/css/sensei-course-theme/buttons.scss
+++ b/assets/css/sensei-course-theme/buttons.scss
@@ -73,7 +73,7 @@
 	&.is-primary,
 	&.wp-block-button:not(.is-style-outline, .is-style-link) {
 		background-color: var(--sensei-secondary-color);
-		color: #26212E;
+		color: var(--sensei-button-text-color);
 
 		&:hover {
 			color: #FFFFFF;

From cce15dac237b83e1e8270f7cc80c2e3cd22615d5 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 10:18:40 -0400
Subject: [PATCH 25/41] Add some missing line heights

---
 assets/css/learning-mode-compat.scss                         | 2 ++
 assets/css/sensei-course-theme/blocks/course-navigation.scss | 1 +
 assets/css/sensei-course-theme/blocks/exit-course.scss       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/assets/css/learning-mode-compat.scss b/assets/css/learning-mode-compat.scss
index 53c99b66e2..88dc7d413d 100644
--- a/assets/css/learning-mode-compat.scss
+++ b/assets/css/learning-mode-compat.scss
@@ -23,6 +23,7 @@
 		color: var(--sensei-text-color);
 		font-weight: 300;
 		font-size: clamp(2.25rem, 1.536rem + 1.905vw, 3.25rem);
+		line-height: 1.23;
 	}
 }
 
@@ -54,6 +55,7 @@
 /* Lesson Actions & Pagination */
 .wp-block-sensei-lms-page-actions .post-page-numbers {
 	color: var(--sensei-pagination-color);
+	line-height: 2.667;
 }
 
 .sensei-course-theme-lesson-actions {
diff --git a/assets/css/sensei-course-theme/blocks/course-navigation.scss b/assets/css/sensei-course-theme/blocks/course-navigation.scss
index 7562086d2b..61a93d79cf 100644
--- a/assets/css/sensei-course-theme/blocks/course-navigation.scss
+++ b/assets/css/sensei-course-theme/blocks/course-navigation.scss
@@ -88,6 +88,7 @@
 		flex: 1;
 		font-size: 0.875rem;
 		font-weight: 300;
+		line-height: 1.214;
 		padding: 0 12px;
 	}
 
diff --git a/assets/css/sensei-course-theme/blocks/exit-course.scss b/assets/css/sensei-course-theme/blocks/exit-course.scss
index 1ef9729bff..e080dbd006 100644
--- a/assets/css/sensei-course-theme/blocks/exit-course.scss
+++ b/assets/css/sensei-course-theme/blocks/exit-course.scss
@@ -2,5 +2,6 @@
 .wp-block-sensei-lms-exit-course {
 	color: var(--sensei-primary-color);
 	font-size: 1rem;
+	line-height: 1.1875;
 	text-decoration: underline;
 }

From c899f28ef6eac59e8efb87d76a1e738b313d5118 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 10:18:56 -0400
Subject: [PATCH 26/41] Fix course title on Divi

---
 assets/css/sensei-course-theme/blocks/course-title.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/sensei-course-theme/blocks/course-title.scss b/assets/css/sensei-course-theme/blocks/course-title.scss
index ae639ac967..11331dbf53 100644
--- a/assets/css/sensei-course-theme/blocks/course-title.scss
+++ b/assets/css/sensei-course-theme/blocks/course-title.scss
@@ -1,4 +1,4 @@
-.editor-styles-wrapper .wp-block-sensei-lms-course-title,
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-title,
 .wp-block-sensei-lms-course-title {
 	font-size: clamp(0.875rem, 0.696rem + 0.476vw, 1.125rem);
 	font-weight: 600;

From dc3fd34000afbb50ff58f46687dada7fc78952fe Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 10:28:39 -0400
Subject: [PATCH 27/41] Move hard-coded button hover color to CSS variable

---
 assets/css/sensei-course-theme/base.scss    | 3 ++-
 assets/css/sensei-course-theme/buttons.scss | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assets/css/sensei-course-theme/base.scss b/assets/css/sensei-course-theme/base.scss
index 9e66a7eb7a..ce7028a1e8 100644
--- a/assets/css/sensei-course-theme/base.scss
+++ b/assets/css/sensei-course-theme/base.scss
@@ -4,7 +4,8 @@ body,
 .editor-styles-wrapper .wp-block {
 	// Try to pick up global styles, customizer or theme colors.
 	--sensei-background-color: var(--sensei-background-color-global, var(--sensei-course-theme-background-color, var(--wp--preset--color--background, #FFFFFF)));
-	--sensei-button-hover-color: #F0F0F0;
+	--sensei-button-fill-hover-color: #FFFFFF;
+	--sensei-button-outline-hover-color: #F0F0F0;
 	--sensei-button-text-color: #26212E;
 	--sensei-lesson-meta-color: #787C82;
 	--sensei-locked-lesson-color: #646970;
diff --git a/assets/css/sensei-course-theme/buttons.scss b/assets/css/sensei-course-theme/buttons.scss
index b0071a73b1..e475fdd8de 100644
--- a/assets/css/sensei-course-theme/buttons.scss
+++ b/assets/css/sensei-course-theme/buttons.scss
@@ -76,13 +76,13 @@
 		color: var(--sensei-button-text-color);
 
 		&:hover {
-			color: #FFFFFF;
+			color: var(--sensei-button-fill-hover-color);
 			background-color: var(--sensei-primary-color);
 			border-color: var(--sensei-primary-color);
 		}
 
 		&:focus {
-			border: 1px solid #FFFFFF;
+			border: 1px solid var(--sensei-button-fill-hover-color);
 			box-shadow: 0px 0px 0px 1.5px var(--sensei-secondary-color);
 		}
 	}
@@ -94,7 +94,7 @@
 		flex-shrink: 0;
 
 		&:hover {
-			background-color: var(--sensei-button-hover-color);
+			background-color: var(--sensei-button-outline-hover-color);
 			color: var(--sensei-primary-color);
 
 			.wp-block-button__link {
@@ -114,7 +114,7 @@
 		padding: 0.83em 1.11em;
 
 		&:hover {
-			background-color: var(--sensei-button-hover-color);
+			background-color: var(--sensei-button-outline-hover-color);
 			color: var(--sensei-primary-color) !important;
 		}
 

From 316ec2f2ae49baa82b23c7ad8e28f776832ab491 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 10:44:40 -0400
Subject: [PATCH 28/41] Fix incorrect colors for lesson module in Course theme

---
 assets/css/learning-mode-compat.scss                     | 7 +++++++
 assets/css/sensei-course-theme/blocks/lesson-module.scss | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/css/learning-mode-compat.scss b/assets/css/learning-mode-compat.scss
index 88dc7d413d..fa247208db 100644
--- a/assets/css/learning-mode-compat.scss
+++ b/assets/css/learning-mode-compat.scss
@@ -52,6 +52,13 @@
 	line-height: 1.1875;
 }
 
+/* Content */
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-theme-lesson-module,
+.wp-block-sensei-lms-course-theme-lesson-module {
+	border-color: var(--sensei-module-lesson-color);
+	color: var(--sensei-module-lesson-color);
+}
+
 /* Lesson Actions & Pagination */
 .wp-block-sensei-lms-page-actions .post-page-numbers {
 	color: var(--sensei-pagination-color);
diff --git a/assets/css/sensei-course-theme/blocks/lesson-module.scss b/assets/css/sensei-course-theme/blocks/lesson-module.scss
index e73603d8ba..f734fd87ff 100644
--- a/assets/css/sensei-course-theme/blocks/lesson-module.scss
+++ b/assets/css/sensei-course-theme/blocks/lesson-module.scss
@@ -1,7 +1,6 @@
 .editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-theme-lesson-module,
 .wp-block-sensei-lms-course-theme-lesson-module {
-	border-left: solid 2px var(--sensei-module-lesson-color);
-	color: var(--sensei-module-lesson-color);
+	border-left: solid 2px;
 	font-size: 0.875rem;
 	line-height: 1.2;
 	padding-left: 0.5em;

From 8064b8c2c87cefc9a3a99d3c1c7ed8ecf1ee1b48 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Thu, 20 Apr 2023 11:05:23 -0400
Subject: [PATCH 29/41] Tweak size of notice text

---
 assets/css/sensei-course-theme/notices.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/css/sensei-course-theme/notices.scss b/assets/css/sensei-course-theme/notices.scss
index 1bdece8c2e..e129b96cc7 100644
--- a/assets/css/sensei-course-theme/notices.scss
+++ b/assets/css/sensei-course-theme/notices.scss
@@ -9,10 +9,10 @@
 
 .sensei-course-theme-lesson-quiz-notice {
 	display: flex;
-	justify-content: space-between;
 	flex-flow: wrap;
+	font-size: 1.125rem;
 	gap: 15px;
-	font-size: 14px;
+	justify-content: space-between;
 
 	&__content {
 		display: flex;

From d18d2c1ba291e563aaf0e27e87bf2b97531c2659 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Fri, 21 Apr 2023 10:36:11 -0400
Subject: [PATCH 30/41] Fix global background color not working

---
 assets/css/sensei-course-theme/fixed-sidebar.scss | 1 -
 assets/css/sensei-course-theme/ui-blocks.scss     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/assets/css/sensei-course-theme/fixed-sidebar.scss b/assets/css/sensei-course-theme/fixed-sidebar.scss
index ffd090d311..d19da99b0a 100644
--- a/assets/css/sensei-course-theme/fixed-sidebar.scss
+++ b/assets/css/sensei-course-theme/fixed-sidebar.scss
@@ -19,7 +19,6 @@ $breakpoint: 783px;
 			left: 0;
 			width: var(--sensei-lm-sidebar-width, 300px);
 			border-right: 1px solid var(--border-color);
-			background-color: var(--sensei-background-color);
 			overflow: auto;
 			overscroll-behavior: contain;
 			display: flex;
diff --git a/assets/css/sensei-course-theme/ui-blocks.scss b/assets/css/sensei-course-theme/ui-blocks.scss
index dee393025d..66e43b81b4 100644
--- a/assets/css/sensei-course-theme/ui-blocks.scss
+++ b/assets/css/sensei-course-theme/ui-blocks.scss
@@ -35,7 +35,6 @@ body.sensei-course-theme {
 		right: 0;
 		height: var(--sensei-lm-header-height);
 		top: var(--top-offset);
-		background-color: var(--sensei-background-color);
 		z-index: 100;
 		display: flex;
 		flex-direction: column;

From 51935af8fd22d31dcff89286d9a318ba23c37eaa Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Fri, 21 Apr 2023 15:00:07 -0400
Subject: [PATCH 31/41] Fix global colors in editor

---
 assets/css/learning-mode-compat.scss          | 19 +++++++++++++++++++
 assets/css/sensei-course-theme/base.scss      |  5 ++---
 .../blocks/course-progress-bar.scss           |  6 ------
 .../blocks/course-title.scss                  |  3 ---
 .../blocks/exit-course.scss                   |  2 --
 .../css/sensei-course-theme/theme-fixes.scss  |  5 -----
 assets/css/sensei-course-theme/ui-blocks.scss |  1 +
 7 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/assets/css/learning-mode-compat.scss b/assets/css/learning-mode-compat.scss
index fa247208db..8161e38aae 100644
--- a/assets/css/learning-mode-compat.scss
+++ b/assets/css/learning-mode-compat.scss
@@ -27,6 +27,13 @@
 	}
 }
 
+/* Header */
+.editor-styles-wrapper .wp-block .wp-block-sensei-lms-exit-course,
+.wp-block-sensei-lms-exit-course {
+	color: var(--sensei-primary-color);
+	font-size: 1rem;
+}
+
 .editor-styles-wrapper .sensei-course-theme__sidebar,
 .sensei-course-theme__sidebar {
 	a, [class*='sensei-'] a, a[class*='sensei-'] {
@@ -41,10 +48,22 @@
 .editor-styles-wrapper .wp-block-sensei-lms-course-title,
 .wp-block-sensei-lms-course-title {
 	color: var(--sensei-text-color);
+	font-size: clamp(0.875rem, 0.696rem + 0.476vw, 1.125rem);
+	font-weight: 600;
+	line-height: 1.167;
 	margin: 0;
 	padding: 1px 2px;
 }
 
+.editor-styles-wrapper .sensei-course-theme-course-progress-bar,
+.sensei-course-theme-course-progress-bar {
+	background-color: var(--sensei-course-progress-bar-color);
+}
+
+.sensei-course-theme-course-progress-bar-inner {
+	background-color: var(--sensei-course-progress-bar-inner-color);
+}
+
 .editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-theme-course-progress-counter,
 .wp-block-sensei-lms-course-theme-course-progress-counter {
 	color: var(--sensei-lesson-meta-color);
diff --git a/assets/css/sensei-course-theme/base.scss b/assets/css/sensei-course-theme/base.scss
index ce7028a1e8..13ae154149 100644
--- a/assets/css/sensei-course-theme/base.scss
+++ b/assets/css/sensei-course-theme/base.scss
@@ -7,6 +7,8 @@ body,
 	--sensei-button-fill-hover-color: #FFFFFF;
 	--sensei-button-outline-hover-color: #F0F0F0;
 	--sensei-button-text-color: #26212E;
+	--sensei-course-progress-bar-color: #DCDCDE;
+	--sensei-course-progress-bar-inner-color: #30968B;
 	--sensei-lesson-meta-color: #787C82;
 	--sensei-locked-lesson-color: #646970;
 	--sensei-module-lesson-color: #101517;
@@ -19,9 +21,6 @@ body,
 	--border-color: rgba(125, 125, 125, 0.3);
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
-
-	background-color: var(--sensei-background-color);
-	color: var(--sensei-text-color);
 }
 
 .sensei-course-theme__frame {
diff --git a/assets/css/sensei-course-theme/blocks/course-progress-bar.scss b/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
index 11acb2187b..ba5faf944a 100644
--- a/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
+++ b/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
@@ -1,15 +1,9 @@
 .sensei-course-theme-course-progress-bar {
 	height: var(--header-progress-bar-height, 4px);
-	background-color: var(--border-color);
 	margin: 0 !important;
 	width: 100%;
 
 	&-inner {
-		background-color: #30968B;
 		height: var(--header-progress-bar-height, 4px);
 	}
-
-	&.wp-block:not(.has-background) {
-		background-color: var(--border-color);
-	}
 }
diff --git a/assets/css/sensei-course-theme/blocks/course-title.scss b/assets/css/sensei-course-theme/blocks/course-title.scss
index 11331dbf53..7aa53265ce 100644
--- a/assets/css/sensei-course-theme/blocks/course-title.scss
+++ b/assets/css/sensei-course-theme/blocks/course-title.scss
@@ -1,8 +1,5 @@
 .editor-styles-wrapper .wp-block .wp-block-sensei-lms-course-title,
 .wp-block-sensei-lms-course-title {
-	font-size: clamp(0.875rem, 0.696rem + 0.476vw, 1.125rem);
-	font-weight: 600;
-	line-height: 1.167;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
diff --git a/assets/css/sensei-course-theme/blocks/exit-course.scss b/assets/css/sensei-course-theme/blocks/exit-course.scss
index e080dbd006..69e862a4ab 100644
--- a/assets/css/sensei-course-theme/blocks/exit-course.scss
+++ b/assets/css/sensei-course-theme/blocks/exit-course.scss
@@ -1,7 +1,5 @@
 .editor-styles-wrapper .wp-block .wp-block-sensei-lms-exit-course,
 .wp-block-sensei-lms-exit-course {
-	color: var(--sensei-primary-color);
-	font-size: 1rem;
 	line-height: 1.1875;
 	text-decoration: underline;
 }
diff --git a/assets/css/sensei-course-theme/theme-fixes.scss b/assets/css/sensei-course-theme/theme-fixes.scss
index 516d481c98..577b7da407 100644
--- a/assets/css/sensei-course-theme/theme-fixes.scss
+++ b/assets/css/sensei-course-theme/theme-fixes.scss
@@ -47,11 +47,6 @@
 	}
 }
 
-// Astra
-.wp-block:not(.has-background) {
-	background-color: unset;
-}
-
 // Twenty Fifteen
 .sensei-course-theme::before {
 	width: 0px;
diff --git a/assets/css/sensei-course-theme/ui-blocks.scss b/assets/css/sensei-course-theme/ui-blocks.scss
index 66e43b81b4..ebec869099 100644
--- a/assets/css/sensei-course-theme/ui-blocks.scss
+++ b/assets/css/sensei-course-theme/ui-blocks.scss
@@ -33,6 +33,7 @@ body.sensei-course-theme {
 		position: fixed;
 		left: 0;
 		right: 0;
+		background-color: var(--sensei-background-color);
 		height: var(--sensei-lm-header-height);
 		top: var(--top-offset);
 		z-index: 100;

From c5e4e58984855d871518c0e56359569e622bc867 Mon Sep 17 00:00:00 2001
From: Katja Paavola <katja.paavola@automattic.com>
Date: Wed, 26 Apr 2023 15:48:42 +0100
Subject: [PATCH 32/41] Update Sensei LMS readme.txt for WPorg repo

Updates the copy for the Sensei LMS plugin description on the WordPress.org plugin repository. Includes mentions of up-to-date functionality such as the Course Showcase, new screenshots using the Course Theme, and additional FAQs.
---
 readme.txt | 82 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 27 deletions(-)

diff --git a/readme.txt b/readme.txt
index 0ae6c19a5f..fcd6f8e6b6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -15,46 +15,52 @@ Create beautiful and engaging online courses, lessons, and quizzes.
 
 **Create beautiful and engaging online courses, lessons, and quizzes.**
 
-[Sensei LMS](https://senseilms.com) is a teaching and learning management plugin built by Automattic, the company behind WordPress.com, WooCommerce, and Jetpack. In fact, Sensei LMS is used to power all of Automattic’s employee training and courses too.
+[Sensei LMS](https://senseilms.com)  is a powerful learning management plugin from Automattic, the company behind WordPress.com, WooCommerce, and Jetpack. At Automattic, we use Sensei LMS to power all our employee training courses.
 
-Your knowledge is worth teaching - teach freely with Sensei LMS!
+Share your knowledge and teach freely with Sensei LMS!
 
 ### Powerful LMS Features ###
 
-- Integrates seamlessly with your WordPress site, and courses look great with any theme.
+- Seamlessly integrate Sensei LMS into your WordPress site. Sensei LMS looks great with any theme and can be customized to match your branding and style.
+- Create engaging courses with the [WordPress Block Editor](https://wordpress.org/documentation/article/wordpress-block-editor/), fully utilized by Sensei's free [Course Theme](https://senseilms.com/meet-course-a-new-free-block-theme-by-sensei/).
+- Enable [Learning Mode](https://senseilms.com/learning-mode/) for an immersive distraction-free learning experience.
 - Track student progress and performance with detailed reports.
-- Craft engaging lessons with no code required.
 - Embed videos from YouTube, Vimeo, and VideoPress for video-based courses.
 - Add the Course List block to any page or post to display available courses.
-- Customize the look and feel to match your branding and site style.
-- Enable the optional Learning Mode for a distraction free and immersive learning experience.
 
-### Quizzes That Reinforce ###
-Leverage the power of quizzes to strengthen your students’ understanding of key concepts and evaluate their progress.
+### Create effective quizzes ###
 
-Choose from many question types and quiz settings, including multiple-choice, fill-in-the-blank, true/false, free response, file uploads, and more.
+Quizzes are a powerful way to improve your students' understanding of key concepts and track their progress. Select from various quiz question types and settings, such as multiple-choice, fill-in-the-blank, true/false, free response, file uploads, and more.
 
-### Get More with Sensei Pro ###
+### Showcase your courses ###
 
-Do more and sell courses with Sensei Pro, which includes:
+Submit your course to Sensei LMS' public course showcase at https://senseilms.com/showcase/. Sensei LMS' course showcase allows you to reach new audiences to expand your course's visibility.
 
-**WooCommerce Integration:** Set a price and sell courses with just a few clicks. Sensei Pro integrates perfectly with WooCommerce Subscriptions, Payments, Memberships, and Affiliates extensions too.
+### Discover the power of Sensei Pro ###
 
-**Content Drip:** For each lesson in a course, you can specify when students will be able to access the lesson content, either at a fixed interval after the date they start the course or on a specific date.
+Realize the full potential of your courses with Sensei Pro.
 
-**Interactive Blocks:** Videos, flashcards, image hotspots, and tasklists can be added to any lesson, and any WordPress page or post.
+**WooCommerce Integration:** Effortlessly set a price and sell courses in just a few clicks. Sensei Pro seamlessly integrates with WooCommerce Subscriptions, Payments, Memberships, and Affiliates extensions.
+
+**Scheduled Content Drip:** Control the pacing of lessons in your courses by specifying when students can access lesson content at fixed intervals after starting the course or on a particular date.
+
+**Immersive Interactive Blocks:** Enrich your lessons, pages, or posts with engaging videos, flashcards, image hotspots, and task lists.
 
 https://videopress.com/v/tLYw7R27
 
-**Advanced Quiz Features:** Enable a quiz timer and add an ordering quiz question type. With Pro, you can add individual quiz questions to any WordPress content, not just in a quiz.
+**Enhanced Quiz Features:** Set a quiz timer and incorporate an ordering quiz question type. With Sensei LMS Pro, you can include individual quiz questions in any WordPress content, not just quizzes.
+
+**Easy Groups & Cohorts:** Organize students into groups and cohorts to manage access and customize learning experiences.
+
+**Course Access Periods:** Define a start date, end date, or a set amount of time that courses will remain accessible to students.
 
-**Groups & Cohorts:** Organize students into groups and cohorts to manage access and customize learning experiences.
+**Conditional Content:** Personalize the learning journey by hiding or showing lessons and content based on groups, enrollment status, and date.
 
-**Course Access Periods:** Select a start date, end date, or a specific amount of time that courses will remain accessible to students.
+**Dedicated Priority Support:** Our team of expert and friendly engineers is always available to provide assistance and ensure your success!
 
-**Conditional Content:** Hide and show lessons and content in lessons based on groups, enrollment status, and date.
+**Flashcards:** Add text, videos, images, embeds, and more to both sides of the flashcard block type.
 
-**Priority Support:** Our team of expert and friendly engineers are standing by and ready to help!
+**Co-Teachers:** Share course ownership with co-teachers who can edit course settings, lessons, and quizzes.
 
 [Learn more about Sensei Pro](https://senseilms.com/sensei-pro/).
 
@@ -62,15 +68,15 @@ https://videopress.com/v/tLYw7R27
 
 **Certificates:** Automatically generate beautiful downloadable PDF certificates for students when they complete a course.
 
-[Learn more about Sensei LMS Certificates](https://wordpress.org/plugins/sensei-certificates/).
+[Learn more about Sensei LMS Certificates.](https://wordpress.org/plugins/sensei-certificates/)
 
-**Media & Attachments:** Upload media and files like PDFs to a separate uploads area of your course or lesson.
+**Media and Attachments:** Upload media and files like PDFs to a separate uploads area of your course or lesson.
 
-[Learn more about Sensei LMS Media Attachments](https://wordpress.org/plugins/sensei-media-attachments/).
+[Learn more about Sensei LMS Media Attachments.](https://wordpress.org/plugins/sensei-media-attachments/)
 
 **Post To Course Creator:** Create courses quickly by converting existing blog posts into course lessons in just a few clicks.
 
-[Learn more about Sensei LMS Post To Course Creator](https://wordpress.org/plugins/sensei-post-to-course/).
+[Learn more about Sensei LMS Post To Course Creator.](https://wordpress.org/plugins/sensei-post-to-course/)
 
 == Installation ==
 
@@ -108,11 +114,33 @@ Sensei LMS can be used in conjunction with [Sensei Pro](https://senseilms.com/se
 
 Please visit the [Sensei Blog](https://senseilms.com/blog/) or sign up for our [mailing list](https://senseilms.com/mailing-list/).
 
+= How can I include my courses in the Sensei LMS showcase? =
+
+To find out how to submit a course to the Sensei LMS showcase, and the requirements, please see our [documentation on the Course Showcase](https://senseilms.com/documentation/showcase/).
+
+= Does Sensei support live courses, Zoom integration, or webinars? =
+
+Yes! You can add links to Zoom, Google Meet, or whatever platform you choose in a course lesson. In addition, Sensei includes a meeting lesson type you can select when creating a new lesson to help make this even easier.
+
+= Does Sensei work in WordPress Multisite? =
+
+Sensei LMS works great in WordPress Multisite. Although a Sensei Pro license covers only one site, the Sensei Agency plan permits the activation of Sensei Pro on up to 20 sites. If you use or plan to use Sensei Pro on a Multisite with more than 20 sites, please [get in touch](https://senseilms.com/contact/) for custom pricing.
+
+= How can I sell courses as part of a membership? =
+
+Sensei LMS is compatible with Sensei Pro and [WooCommerce Memberships](https://woocommerce.com/products/woocommerce-memberships/), enabling you to sell courses as part of a membership plan.
+
+See [Selling Courses as a Membership](https://senseilms.com/documentation/selling-courses-as-a-membership/) for more details.
+
+= Does Sensei work in my language =
+
+Community members have translated the free Sensei LMS plugin [into 18 languages](https://translate.wordpress.org/projects/wp-plugins/sensei-lms/), while Sensei Pro has been [professionally translated into 16 languages](https://translate.wordpress.com/projects/sensei/). We welcome contributions to improve even more.
+
 == Screenshots ==
-1. Lesson editor
-2. Lesson page with Learning Mode enabled
-3. Quiz editor
-4. Course editor
+1. Course Editor
+2. Lesson Editor
+3. Learning Mode
+4. Quiz Editor
 
 == Changelog ==
 

From 9b1aae7941970feff454a4c00214c94a50ac2b25 Mon Sep 17 00:00:00 2001
From: Donna Peplinskie <donnapep@gmail.com>
Date: Mon, 1 May 2023 12:07:54 -0400
Subject: [PATCH 33/41] Fix course progress bar height

---
 .../css/sensei-course-theme/blocks/course-progress-bar.scss   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/css/sensei-course-theme/blocks/course-progress-bar.scss b/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
index 30ee587dfa..a750d387cd 100644
--- a/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
+++ b/assets/css/sensei-course-theme/blocks/course-progress-bar.scss
@@ -3,11 +3,11 @@
 	margin: 0;
 	width: 100%;
 
-	&-inner {
+	:first-child {
 		height: var(--header-progress-bar-height, 4px);
 	}
 }
 
 body .is-layout-flow > * + .wp-block-sensei-lms-course-theme-course-progress-bar {
-  margin: 0;
+	margin: 0;
 }

From 9f8066d563a599357b9f0ad16547015c01d47b11 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 10:47:05 +0100
Subject: [PATCH 34/41] Fix site logo spacing

---
 themes/sensei-course-theme/templates/default/lesson.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/sensei-course-theme/templates/default/lesson.html b/themes/sensei-course-theme/templates/default/lesson.html
index 3a68034247..cc3e3a55c9 100644
--- a/themes/sensei-course-theme/templates/default/lesson.html
+++ b/themes/sensei-course-theme/templates/default/lesson.html
@@ -3,11 +3,12 @@
 	<!-- wp:group {"style":{"spacing":{"padding":{"right":"24px","left":"24px","top":"0px","bottom":"0px"}}},"className":"sensei-course-theme-header-content","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 	<div class="wp-block-group sensei-course-theme-header-content"
 		style="padding-top:0px;padding-right:24px;padding-bottom:0px;padding-left:24px">
-		<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-		<div class="wp-block-group"><!-- wp:site-logo {"width":50} /-->
+		<!-- wp:group {"style":{"spacing":{"blockGap":"8px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+		<div class="wp-block-group">
+			<!-- wp:site-logo {"width":24,"shouldSyncIcon":true,"style":{"layout":{"selfStretch":"fixed","flexSize":"24px"}}} /-->
 
 			<!-- wp:sensei-lms/course-title /-->
-			</div>
+		</div>
 		<!-- /wp:group -->
 
 		<!-- wp:group {"style":{"spacing":{"blockGap":"12px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->

From 40f5be80bd70dc56fd91aebb163c18ed4b6ce023 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 10:53:16 +0100
Subject: [PATCH 35/41] Remove duplicated lesson actions

---
 .../templates/default/lesson.html             | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/themes/sensei-course-theme/templates/default/lesson.html b/themes/sensei-course-theme/templates/default/lesson.html
index cc3e3a55c9..efbc9ad02f 100644
--- a/themes/sensei-course-theme/templates/default/lesson.html
+++ b/themes/sensei-course-theme/templates/default/lesson.html
@@ -22,13 +22,13 @@
 			<!-- /wp:group -->
 
 			<!-- wp:sensei-lms/sidebar-toggle-button /-->
-			</div>
-			<!-- /wp:group -->
-			</div>
+		</div>
+		<!-- /wp:group -->
+		</div>
 	<!-- /wp:group -->
 
 	<!-- wp:sensei-lms/course-theme-course-progress-bar /-->
-	</div>
+</div>
 <!-- /wp:sensei-lms/ui -->
 
 <!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__columns"} -->
@@ -54,14 +54,11 @@
 		<!-- /wp:sensei-lms/ui -->
 
 		<!-- wp:group {"className":"sensei-course-theme__actions-wrapper","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-		<div class="wp-block-group sensei-course-theme__actions-wrapper">
-			<!-- wp:sensei-lms/course-theme-lesson-actions /-->
+		<div class="wp-block-group sensei-course-theme__actions-wrapper"><!-- wp:sensei-lms/page-actions /-->
 
-			<!-- wp:sensei-lms/page-actions /-->
-
-		<!-- wp:group {"className":"sensei-lesson-footer","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-		<div class="wp-block-group sensei-lesson-footer">
-			<!-- wp:sensei-lms/course-theme-lesson-actions {"options":{"nextLesson":true}} /-->
+			<!-- wp:group {"className":"sensei-lesson-footer","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+			<div class="wp-block-group sensei-lesson-footer"><!-- wp:sensei-lms/course-theme-lesson-actions /--></div>
+			<!-- /wp:group -->
 		</div>
 		<!-- /wp:group -->
 	</div>

From 5e59edd2773756b4595e338d7388cae40d5cb8d7 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 10:58:53 +0100
Subject: [PATCH 36/41] Fix modules summary margin

---
 assets/css/sensei-course-theme/blocks/course-navigation.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/sensei-course-theme/blocks/course-navigation.scss b/assets/css/sensei-course-theme/blocks/course-navigation.scss
index e99a391eb6..b0341e82d5 100644
--- a/assets/css/sensei-course-theme/blocks/course-navigation.scss
+++ b/assets/css/sensei-course-theme/blocks/course-navigation.scss
@@ -68,12 +68,13 @@
 		overflow: hidden;
 		transition-delay: 150ms;
 		visibility: hidden;
-		margin-top: 4px;
+		margin-top: 0px;
 	}
 
 	&__lessons.sensei-collapsed ~ &__summary {
 		visibility: visible;
 		max-height: 50px;
+		margin-top: 4px;
 	}
 }
 

From 97226df7f6635db33506def9b896ca0e1019a4a9 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 18:05:13 +0100
Subject: [PATCH 37/41] Fix spacing when the course navigation module is open

---
 .../sensei-course-theme/blocks/course-navigation.scss  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/assets/css/sensei-course-theme/blocks/course-navigation.scss b/assets/css/sensei-course-theme/blocks/course-navigation.scss
index b0341e82d5..9b508e6e3a 100644
--- a/assets/css/sensei-course-theme/blocks/course-navigation.scss
+++ b/assets/css/sensei-course-theme/blocks/course-navigation.scss
@@ -5,7 +5,6 @@
 	&__modules, &__lessons, &-module__lessons {
 
 		margin: 0;
-
 		ol, li {
 			list-style: none;
 			padding: 0;
@@ -13,13 +12,18 @@
 	}
 	&__modules {
 		display: flex;
-		gap:  32px;
+		gap:  24px;
 		flex-direction: column;
 	}
 
 	&__modules + &__lessons {
-		margin-top: 32px;
+		margin-top: 24px;
+	}
+
+	&-module__lessons:not(.sensei-collapsed) {
+		margin-bottom: 12px;
 	}
+
 }
 
 .editor-styles-wrapper .sensei-lms-course-navigation-module,

From a5ea9d193f6329d0bcaf655e35fc1a4ab8577c2c Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 18:14:21 +0100
Subject: [PATCH 38/41] Fix distance between the post content and the title

---
 assets/css/sensei-course-theme/content.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/css/sensei-course-theme/content.scss b/assets/css/sensei-course-theme/content.scss
index a110d34f4f..99428f81cd 100644
--- a/assets/css/sensei-course-theme/content.scss
+++ b/assets/css/sensei-course-theme/content.scss
@@ -57,6 +57,8 @@ body {
 	}
 
 	.wp-block-post-content {
+		margin-top: 40px;
+
 		& > *, .wp-block-group__inner-container > * {
 			max-width: var(--content-size) !important;
 			margin-left: auto;

From 6641a6a0e5835e82ea2222648c764768b0240250 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 18:17:56 +0100
Subject: [PATCH 39/41] Fix sidebard bottom padding

---
 assets/css/sensei-course-theme/fixed-sidebar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/sensei-course-theme/fixed-sidebar.scss b/assets/css/sensei-course-theme/fixed-sidebar.scss
index f4e931d5ac..7c446b7cc1 100644
--- a/assets/css/sensei-course-theme/fixed-sidebar.scss
+++ b/assets/css/sensei-course-theme/fixed-sidebar.scss
@@ -22,7 +22,7 @@ $min_desktop_width: 783px;
 			overscroll-behavior: contain;
 			display: flex;
 			flex-direction: column;
-			padding: 32px 24px;
+			padding: 32px 24px 40px 24px;
 		}
 
 		&__header ~ &__columns &__sidebar {

From 9b04ca12a6b8f0c11b4ffd72887e6ce23ad6f86e Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 18:37:44 +0100
Subject: [PATCH 40/41] Fix spacing between theend of the module name and the
 start of the collapse / expand icon.

---
 assets/css/sensei-course-theme/blocks/course-navigation.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/css/sensei-course-theme/blocks/course-navigation.scss b/assets/css/sensei-course-theme/blocks/course-navigation.scss
index 9b508e6e3a..dd02715ebe 100644
--- a/assets/css/sensei-course-theme/blocks/course-navigation.scss
+++ b/assets/css/sensei-course-theme/blocks/course-navigation.scss
@@ -36,6 +36,7 @@
 		display: flex;
 		padding: 0;
 		width: 100%;
+		gap: 20px;
 
 		&:hover h3 {
 			text-decoration: underline;

From 6567b5adbc5d848f124cbd96ca7dccc50e1e4641 Mon Sep 17 00:00:00 2001
From: Gabriel Caires <gabriel.caires@automattic.com>
Date: Tue, 2 May 2023 18:41:18 +0100
Subject: [PATCH 41/41] Fix spacing between the Complete Lesson and Take Quiz
 buttons

---
 assets/css/sensei-course-theme/blocks/lesson-actions.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/sensei-course-theme/blocks/lesson-actions.scss b/assets/css/sensei-course-theme/blocks/lesson-actions.scss
index 9cff526562..e6fd9bd46b 100644
--- a/assets/css/sensei-course-theme/blocks/lesson-actions.scss
+++ b/assets/css/sensei-course-theme/blocks/lesson-actions.scss
@@ -1,6 +1,6 @@
 .sensei-course-theme-lesson-actions {
 	display: flex;
-	gap: 12px;
+	gap: 16px;
 	list-style: none;
 	width: 100%;